[maven2] 74/87: Removed the dependency on backport-util-concurrent Updated Standards-Version to 3.9.4 (no changes) debian/control: Use canonical URLs for the Vcs-* fields debian/maven.rules: Removed the unused rule for maven-clean-plugin

Fri Feb 27 13:59:12 UTC 2015

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven2.

commit 432de800cbaa395e79c203972abc78ed832b7fdb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jun 12 08:11:46 2013 +0000

    Removed the dependency on backport-util-concurrent
    Updated Standards-Version to 3.9.4 (no changes)
    debian/control: Use canonical URLs for the Vcs-* fields
    debian/maven.rules: Removed the unused rule for maven-clean-plugin
---
 debian/changelog                                     | 10 ++++++++--
 debian/control                                       | 10 +++++-----
 debian/maven.rules                                   |  2 --
 debian/patches/build.patch                           |  7 +++----
 debian/patches/remove-backport-util-concurrent.patch | 17 +++++++++++++++++
 debian/patches/series                                |  1 +
 6 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68eeb12..656705a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-maven2 (2.2.1-13) UNRELEASED; urgency=low
+maven2 (2.2.1-13) unstable; urgency=low
 
   [ Miguel Landaeta ]
   * Team upload.
@@ -13,7 +13,13 @@ maven2 (2.2.1-13) UNRELEASED; urgency=low
   [ Ludovic Claude ]
   * Add resolution for the exec plugin in the bash completion.  
 
- -- tony mancill <tmancill at debian.org>  Fri, 28 Sep 2012 17:24:47 -0700
+  [ Emmanuel Bourg ]
+  * Updated Standards-Version to 3.9.4 (no changes)
+  * Removed the dependency on backport-util-concurrent
+  * debian/control: Use canonical URLs for the Vcs-* fields
+  * debian/maven.rules: Removed the unused rule for maven-clean-plugin
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 12 Jun 2013 10:06:15 +0200
 
 maven2 (2.2.1-12) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 991664f..aebc7c8 100644
--- a/debian/control
+++ b/debian/control
@@ -9,15 +9,15 @@ Build-Depends-Indep: maven-repo-helper, ant-optional, junit, libmaven-clean-plug
   libmaven-resources-plugin-java, libmaven-shade-plugin-java,
   libmaven2-core-java (>= 2.2.1-4~), maven-ant-helper
 Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk, ant
-Standards-Version: 3.9.3
-Homepage: http://maven.apache.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven2
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven2
+Standards-Version: 3.9.4
+Homepage: http://maven.apache.org
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven2
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/maven2
 
 Package: maven2
 Architecture: all
 Depends: ${misc:Depends}, libmaven2-core-java,
-  default-jre (>= 1.4) | default-jre-headless (>= 1.4) | java2-runtime | java2-runtime-headless
+  default-jre (>= 1.5) | default-jre-headless (>= 1.5) | java2-runtime | java2-runtime-headless
 Recommends: libmaven-clean-plugin-java,
   libmaven-compiler-plugin-java, libmaven-install-plugin-java, libmaven-jar-plugin-java,  
   libmaven-resources-plugin-java, libmaven-shade-plugin-java
diff --git a/debian/maven.rules b/debian/maven.rules
index 70fd14b..c87926a 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,6 +1,4 @@
 org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/
-# force version 2.3 of Maven Clean plugin
-org.apache.maven.plugins maven-clean-plugin maven-plugin s/(.*)/2.3/
 # keep the version for all Maven plugins as versionless plugins don't work
 * * maven-plugin *
 junit junit jar s/3\..*/3.x/
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 48bbaeb..4f204da 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -120,7 +120,7 @@
      <path id="sources">
        <dirset dir=".">
          <include name="bootstrap/target/generated-sources"/>
-@@ -170,16 +122,49 @@
+@@ -170,16 +122,48 @@
        <src refid="sources"/>
        <classpath refid="pom.pathid"/>
      </javac>
@@ -139,7 +139,6 @@
 -      <path refid="pom.pathid"/>
 +      <pathelement location="debian/tmp/bootstrap"/>
 +      <fileset dir="/usr/share/maven-repo">
-+        <include name="backport-util-concurrent/backport-util-concurrent/debian/backport-util-concurrent-debian.jar"/>
 +        <include name="classworlds/classworlds/debian/classworlds-debian.jar"/>
 +        <include name="com/jcraft/jsch/debian/jsch-debian.jar"/>
 +        <include name="commons-cli/commons-cli/debian/commons-cli-debian.jar"/>
@@ -175,7 +174,7 @@
      </path>
    </target>
  
-@@ -193,6 +178,7 @@
+@@ -193,6 +177,7 @@
        <jvmarg value="-Djava.compiler=NONE"/> -->
  
        <classpath refid="maven.classpath"/>
@@ -183,7 +182,7 @@
        <arg value="-e"/>
        <arg value="-B"/>
        <arg value="clean"/>
-@@ -314,9 +300,4 @@
+@@ -314,9 +299,4 @@
  
    <target name="with-its" depends="all,run-its"/>
  
diff --git a/debian/patches/remove-backport-util-concurrent.patch b/debian/patches/remove-backport-util-concurrent.patch
new file mode 100644
index 0000000..f3bc744
--- /dev/null
+++ b/debian/patches/remove-backport-util-concurrent.patch
@@ -0,0 +1,17 @@
+Description: Remove the dependency on backport-util-concurrent
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -464,11 +464,6 @@
+         <version>1.5.6</version>
+       </dependency>
+       <dependency>
+-        <groupId>backport-util-concurrent</groupId>
+-        <artifactId>backport-util-concurrent</artifactId>
+-        <version>3.1</version>
+-      </dependency>
+-      <dependency>
+         <groupId>easymock</groupId>
+         <artifactId>easymock</artifactId>
+         <version>1.2_Java1.3</version>
diff --git a/debian/patches/series b/debian/patches/series
index e3eaad1..d6367d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ mvn-cmd.patch
 mvnDebug-cmd.patch
 build.patch
 pom.patch
+remove-backport-util-concurrent.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven2.git

