[maven2-core] 25/38: Updated maven-clean-plugin version from 2.3 to 2.5 Removed the dependency on backport-util-concurrent debian/control: - Updated Standards-Version to 3.9.4 (no changes) - Use canonical URLs for the Vcs-* fields debian/rules: Improved the clean target to allow rebuilds debian/copyright: Updated the Format URI to 1.0

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Feb 27 13:24:20 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-core.

commit 26ed1f41b705dae22c27753b177c6d5fe9fb632b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jun 12 07:45:24 2013 +0000

    Updated maven-clean-plugin version from 2.3 to 2.5
    Removed the dependency on backport-util-concurrent
    debian/control:
    - Updated Standards-Version to 3.9.4 (no changes)
    - Use canonical URLs for the Vcs-* fields
    debian/rules: Improved the clean target to allow rebuilds
    debian/copyright: Updated the Format URI to 1.0
---
 debian/build.properties                              |  1 -
 debian/changelog                                     | 13 +++++++++++++
 debian/control                                       | 12 ++++++------
 debian/copyright                                     |  2 +-
 debian/patches/0002-update-plugin-versions.patch     |  4 +---
 .../0004-remove-backport-util-concurrent.patch       | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 debian/rules                                         |  2 ++
 8 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
index 8adc1e2..440dd16 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -20,7 +20,6 @@ classpath.compile = \
             ${basedir}/maven-monitor/build/maven-monitor-${version}.jar:\
             ${basedir}/maven-core/build/maven-core-${version}.jar:\
             ${basedir}/maven-script/build/maven-script-${version}.jar:\
-		    /usr/share/java/backport-util-concurrent.jar:\
 		    /usr/share/java/doxia-sink-api.jar:\
 		    /usr/share/java/bsh.jar:\
 		    /usr/share/java/classworlds.jar:\
diff --git a/debian/changelog b/debian/changelog
index b4493e1..03c5183 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+maven2-core (2.2.1-9) unstable; urgency=low
+
+  * Team upload
+  * Updated maven-clean-plugin version from 2.3 to 2.5
+  * Removed the dependency on backport-util-concurrent
+  * debian/control:
+    - Updated Standards-Version to 3.9.4 (no changes)
+    - Use canonical URLs for the Vcs-* fields
+  * debian/rules: Improved the clean target to allow rebuilds
+  * debian/copyright: Updated the Format URI to 1.0
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 11 Jun 2013 19:30:10 +0200
+
 maven2-core (2.2.1-8) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 6888c54..bc0795b 100644
--- a/debian/control
+++ b/debian/control
@@ -12,11 +12,11 @@ Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-option
   libplexus-ant-factory-java, libplexus-bsh-factory-java,
   libplexus-archiver-java, libplexus-sec-dispatcher-java (>= 1.3),
   libplexus-interactivity-api-java (>=1.0-alpha-6), libplexus-interpolation-java (>= 1.11), 
-  libplexus-utils-java (>=1:1.5.15), libwagon-java, libbackport-util-concurrent-java (>= 3.1)
-Standards-Version: 3.9.2
-Homepage: http://maven.apache.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven2-core
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven2-core
+  libplexus-utils-java (>=1:1.5.15), libwagon-java
+Standards-Version: 3.9.4
+Homepage: http://maven.apache.org
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven2-core
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/maven2-core
 
 Package: libmaven2-core-java
 Architecture: all
@@ -25,7 +25,7 @@ Depends: ${misc:Depends}, libcommons-cli-java (>= 1.1), libslf4j-java (>= 1.5.6)
   libplexus-archiver-java, libplexus-sec-dispatcher-java (>= 1.3),
   libplexus-ant-factory-java, libplexus-bsh-factory-java, libclassworlds-java (>= 1.1),
   libplexus-interactivity-api-java (>=1.0-alpha-6), libplexus-interpolation-java (>= 1.11), 
-  libplexus-utils-java (>=1:1.5.15), libwagon-java, libbackport-util-concurrent-java (>= 3.1)
+  libplexus-utils-java (>=1:1.5.15), libwagon-java
 Description: Core libraries for Maven2
  Maven is a software project management and comprehension tool. Based on the
  concept of a project object model (POM), Maven can manage a project's build,
diff --git a/debian/copyright b/debian/copyright
index d69118c..ba3a017 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Maven Compiler Plugin
 Upstream-Contact: Apache Maven team
 Source: http://maven.apache.org/
diff --git a/debian/patches/0002-update-plugin-versions.patch b/debian/patches/0002-update-plugin-versions.patch
index f930349..2108afe 100644
--- a/debian/patches/0002-update-plugin-versions.patch
+++ b/debian/patches/0002-update-plugin-versions.patch
@@ -6,8 +6,6 @@ Subject: [PATCH] update plugin versions
  .../org/apache/maven/project/pom-4.0.0.xml         |   20 ++++++++++----------
  1 files changed, 10 insertions(+), 10 deletions(-)
 
-Index: b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
-===================================================================
 --- a/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
 +++ b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
 @@ -72,15 +72,15 @@
@@ -25,7 +23,7 @@ Index: b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
           <plugin>
             <artifactId>maven-clean-plugin</artifactId>
 -           <version>2.2</version>
-+           <version>2.3</version>
++           <version>2.5</version>
           </plugin>
           <plugin>
             <artifactId>maven-compiler-plugin</artifactId>
diff --git a/debian/patches/0004-remove-backport-util-concurrent.patch b/debian/patches/0004-remove-backport-util-concurrent.patch
new file mode 100644
index 0000000..1d6f3e2
--- /dev/null
+++ b/debian/patches/0004-remove-backport-util-concurrent.patch
@@ -0,0 +1,20 @@
+Description: Remove the dependency on backport-util-concurrent
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
++++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+@@ -48,10 +48,10 @@
+ import org.codehaus.plexus.logging.AbstractLogEnabled;
+ import org.codehaus.plexus.util.FileUtils;
+ 
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
+-import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.LinkedBlockingQueue;
++import java.util.concurrent.ThreadPoolExecutor;
++import java.util.concurrent.TimeUnit;
+ 
+ public class DefaultArtifactResolver
+     extends AbstractLogEnabled
diff --git a/debian/patches/series b/debian/patches/series
index b8a6a90..54e4fca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-remove-webdav-support.patch
 0002-update-plugin-versions.patch
 0003-update-plexus-utils.patch
+0004-remove-backport-util-concurrent.patch
diff --git a/debian/rules b/debian/rules
index fac7b80..de29a4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,8 @@ binary-post-install/lib$(PACKAGE)-java-doc::
 	dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) /usr/share/doc/libmaven2-core-java/
 
 clean::
+	mh_clean
+	mh_unpatchpoms -plib$(PACKAGE)-java
 	-rm -rf debian/tmp
 
 # No documentation released yet.

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

More information about the pkg-java-commits mailing list