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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-12-18 13:13:53 +0000 (Wed, 18 Dec 2013)
New Revision: 17599

Added:
   trunk/maven-archiver/debian/patches/
   trunk/maven-archiver/debian/patches/01-maven-artifact-compatibility.patch
   trunk/maven-archiver/debian/patches/series
Modified:
   trunk/maven-archiver/debian/changelog
   trunk/maven-archiver/debian/maven.properties
Log:
Enabled the unit tests



Modified: trunk/maven-archiver/debian/changelog
===================================================================
--- trunk/maven-archiver/debian/changelog	2013-12-18 10:43:39 UTC (rev 17598)
+++ trunk/maven-archiver/debian/changelog	2013-12-18 13:13:53 UTC (rev 17599)
@@ -1,6 +1,7 @@
 maven-archiver (2.4-5) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Enabled the unit tests (patch added)
   * debian/control:
     - Use canonical URLs for the Vcs-* fields
     - Standards-Version updated to 3.9.5 (no changes) 

Modified: trunk/maven-archiver/debian/maven.properties
===================================================================
--- trunk/maven-archiver/debian/maven.properties	2013-12-18 10:43:39 UTC (rev 17598)
+++ trunk/maven-archiver/debian/maven.properties	2013-12-18 13:13:53 UTC (rev 17599)
@@ -1,4 +1,6 @@
 # Include here properties to pass to Maven during the build.
 # For example:
-maven.test.skip=true
+# maven.test.skip=true
 
+maven.compiler.source=1.3
+maven.compiler.target=1.3

Added: trunk/maven-archiver/debian/patches/01-maven-artifact-compatibility.patch
===================================================================
--- trunk/maven-archiver/debian/patches/01-maven-artifact-compatibility.patch	                        (rev 0)
+++ trunk/maven-archiver/debian/patches/01-maven-artifact-compatibility.patch	2013-12-18 13:13:53 UTC (rev 17599)
@@ -0,0 +1,45 @@
+Description: Ensures the compatibility of the tests with the version of maven-artifact in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/test/java/org/apache/maven/archiver/MockArtifact.java
++++ b/src/test/java/org/apache/maven/archiver/MockArtifact.java
+@@ -54,7 +54,7 @@
+ 
+     private String baseVersion;
+     
+-    private ArtifactHandler artifactHandler;
++    private ArtifactHandler artifactHandler = new org.apache.maven.artifact.handler.DefaultArtifactHandler();
+ 
+     private boolean snapshot;
+ 
+@@ -117,7 +117,7 @@
+ 
+     public String getBaseVersion()
+     {
+-        return baseVersion;
++        return baseVersion != null ? baseVersion : version;
+     }
+ 
+     public void setBaseVersion( String string )
+@@ -142,6 +142,11 @@
+         // TODO
+     }
+ 
++    public ArtifactMetadata getMetadata( Class metadataClass )
++    {
++        return null;
++    }
++
+     public Collection getMetadataList()
+     {
+         // TODO
+@@ -209,8 +214,7 @@
+ 
+     public VersionRange getVersionRange()
+     {
+-        // TODO
+-        return null;  //To change body of implemented methods use File | Settings | File Templates.
++        return VersionRange.createFromVersion("1.0");
+     }
+ 
+     public void setVersionRange( VersionRange versionRange )

Added: trunk/maven-archiver/debian/patches/series
===================================================================
--- trunk/maven-archiver/debian/patches/series	                        (rev 0)
+++ trunk/maven-archiver/debian/patches/series	2013-12-18 13:13:53 UTC (rev 17599)
@@ -0,0 +1 @@
+01-maven-artifact-compatibility.patch