[pkg-java] r17602 - in trunk/maven-archiver/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-12-18 17:01:11 +0000 (Wed, 18 Dec 2013)
New Revision: 17602

Modified:
   trunk/maven-archiver/debian/changelog
   trunk/maven-archiver/debian/copyright
   trunk/maven-archiver/debian/libmaven-archiver-java.poms
   trunk/maven-archiver/debian/maven.properties
   trunk/maven-archiver/debian/patches/01-maven-artifact-compatibility.patch
Log:
New upstream release (2.5)



Modified: trunk/maven-archiver/debian/changelog
===================================================================
--- trunk/maven-archiver/debian/changelog	2013-12-18 14:07:57 UTC (rev 17601)
+++ trunk/maven-archiver/debian/changelog	2013-12-18 17:01:11 UTC (rev 17602)
@@ -1,7 +1,9 @@
-maven-archiver (2.4-5) UNRELEASED; urgency=medium
+maven-archiver (2.5-1) unstable; urgency=medium
 
   * Team upload.
-  * Enabled the unit tests (patch added)
+  * New upstream release
+  * Added a patch to run the tests with maven-artifact 2.2. The tests are still
+    disabled until plexus-archiver is upgraded to 2.2 or later.
   * debian/control:
     - Use canonical URLs for the Vcs-* fields
     - Standards-Version updated to 3.9.5 (no changes) 

Modified: trunk/maven-archiver/debian/copyright
===================================================================
--- trunk/maven-archiver/debian/copyright	2013-12-18 14:07:57 UTC (rev 17601)
+++ trunk/maven-archiver/debian/copyright	2013-12-18 17:01:11 UTC (rev 17602)
@@ -3,7 +3,7 @@
 Source: http://maven.apache.org/shared/maven-archiver/
 
 Files: *
-Copyright: 2007-2011, The Apache Software Foundation.
+Copyright: 2007-2012, The Apache Software Foundation.
 License: Apache-2.0
 
 Files: debian/*

Modified: trunk/maven-archiver/debian/libmaven-archiver-java.poms
===================================================================
--- trunk/maven-archiver/debian/libmaven-archiver-java.poms	2013-12-18 14:07:57 UTC (rev 17601)
+++ trunk/maven-archiver/debian/libmaven-archiver-java.poms	2013-12-18 17:01:11 UTC (rev 17602)
@@ -2,7 +2,9 @@
 # Format of this file is:
 # <path to pom file> [option]*
 # where option can be:
-#   --ignore: ignore this POM or
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
 #   --no-parent: remove the <parent> tag from the POM
 #   --package=<package>: an alternative package to use when installing this POM
 #      and its artifact
@@ -11,16 +13,16 @@
 #   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
 #      during a clean operation with mh_cleanpom or mh_installpom
 #   --artifact=<path>: path to the build artifact associated with this POM,
-#      it will be installed when using the command mh_install
+#      it will be installed when using the command mh_install. [mh_install]
 #   --java-lib: install the jar into /usr/share/java to comply with Debian
 #      packaging guidelines
 #   --usj-name=<name>: name to use when installing the library in /usr/share/java
 #   --usj-version=<version>: version to use when installing the library in /usr/share/java
 #   --no-usj-versionless: don't install the versionless link in /usr/share/java
-#   --dest-jar=<path>: the destination for the real jar
-#   it will be installed with mh_install.
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
 #   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-#   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
-#     temporarily for certain artifacts such as Javadoc jars.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
 #
 pom.xml --no-parent --has-package-version

Modified: trunk/maven-archiver/debian/maven.properties
===================================================================
--- trunk/maven-archiver/debian/maven.properties	2013-12-18 14:07:57 UTC (rev 17601)
+++ trunk/maven-archiver/debian/maven.properties	2013-12-18 17:01:11 UTC (rev 17602)
@@ -2,5 +2,8 @@
 # For example:
 # maven.test.skip=true
 
+# Tests can be enabled after upgrading plexus-archiver to 2.2 or later
+maven.test.skip=true
+
 maven.compiler.source=1.3
 maven.compiler.target=1.3

Modified: trunk/maven-archiver/debian/patches/01-maven-artifact-compatibility.patch
===================================================================
--- trunk/maven-archiver/debian/patches/01-maven-artifact-compatibility.patch	2013-12-18 14:07:57 UTC (rev 17601)
+++ trunk/maven-archiver/debian/patches/01-maven-artifact-compatibility.patch	2013-12-18 17:01:11 UTC (rev 17602)
@@ -33,13 +33,13 @@
      public Collection getMetadataList()
      {
          // TODO
-@@ -209,8 +214,7 @@
+@@ -197,8 +202,7 @@
  
-     public VersionRange getVersionRange()
+     public List getDependencyTrail()
      {
 -        // TODO
 -        return null;  //To change body of implemented methods use File | Settings | File Templates.
 +        return VersionRange.createFromVersion("1.0");
      }
  
-     public void setVersionRange( VersionRange versionRange )
+     public void setDependencyTrail( List list )