[pkg-java] r17454 - in trunk/surefire/debian: . patches

Emmanuel Bourg ebourg-guest at alioth.debian.org
Fri Nov 8 14:46:08 UTC 2013 

Author: ebourg-guest
Date: 2013-11-08 14:46:08 +0000 (Fri, 08 Nov 2013)
New Revision: 17454

Added:
   trunk/surefire/debian/maven.properties
Modified:
   trunk/surefire/debian/build.properties
   trunk/surefire/debian/build.xml
   trunk/surefire/debian/changelog
   trunk/surefire/debian/control
   trunk/surefire/debian/maven.rules
   trunk/surefire/debian/patches/bypass-testng-version-check.patch
   trunk/surefire/debian/patches/fix-junit-provider-selection.patch
   trunk/surefire/debian/patches/pom.patch
Log:
New upstream release (2.12.4)
New dependency on libcommons-lang3-java



Modified: trunk/surefire/debian/build.properties
===================================================================
--- trunk/surefire/debian/build.properties	2013-11-08 14:15:27 UTC (rev 17453)
+++ trunk/surefire/debian/build.properties	2013-11-08 14:46:08 UTC (rev 17454)
@@ -3,6 +3,7 @@
 maven.test.skip=true
 classpath.compile = \
             /usr/share/java/commons-lang.jar:\
+            /usr/share/java/commons-lang3.jar:\
             /usr/share/java/plexus-utils.jar:\
             /usr/share/java/junit.jar:\
             /usr/share/java/junit4.jar:\
@@ -14,6 +15,7 @@
             /usr/share/java/maven-artifact.jar:\
             /usr/share/java/maven-artifact-manager.jar:\
             /usr/share/java/maven-core.jar:\
+            /usr/share/java/maven-plugin-annotations.jar:\
             /usr/share/java/maven-plugin-descriptor.jar:\
             /usr/share/java/maven-project.jar:\
             /usr/share/java/maven-reporting-api.jar:\

Modified: trunk/surefire/debian/build.xml
===================================================================
--- trunk/surefire/debian/build.xml	2013-11-08 14:15:27 UTC (rev 17453)
+++ trunk/surefire/debian/build.xml	2013-11-08 14:46:08 UTC (rev 17454)
@@ -35,6 +35,7 @@
           <property name="debian.dir" location="debian" />
           <property name="project.dir" value="@{dir}" />
           <property name="maven.generate.target" value="plugin:descriptor" />
+          <property name="maven.process-classes.target" value="plugin:descriptor" />
           <property name="keep-cleaned-pom" value="true" />
           <property name="use-local-repo" value="true" />
         </ant>

Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog	2013-11-08 14:15:27 UTC (rev 17453)
+++ trunk/surefire/debian/changelog	2013-11-08 14:46:08 UTC (rev 17454)
@@ -1,9 +1,10 @@
-surefire (2.12-1) UNRELEASED; urgency=low
+surefire (2.12.4-1) UNRELEASED; urgency=low
 
   * Team upload.
   * New upstream release
     - Refreshed the patches
     - Build the new common-junit48 and surefire-grouper modules
+    - New dependency on libcommons-lang3-java
   * debian/orig-tar.sh:
     - Use XZ compression for the upstream tarball
     - Reworked to pull the sources from the Apache Git repository

Modified: trunk/surefire/debian/control
===================================================================
--- trunk/surefire/debian/control	2013-11-08 14:15:27 UTC (rev 17453)
+++ trunk/surefire/debian/control	2013-11-08 14:46:08 UTC (rev 17454)
@@ -9,17 +9,18 @@
                      javacc,
                      junit,
                      junit4,
+                     libcommons-lang3-java,
                      libjmock-java,
                      libmaven-clean-plugin-java,
                      libmaven-common-artifact-filters-java,
                      libmaven-compiler-plugin-java,
                      libmaven-install-plugin-java,
                      libmaven-jar-plugin-java,
-                     libmaven-plugin-tools-java,
+                     libmaven-plugin-tools-java (>= 3.2),
                      libmaven-resources-plugin-java,
                      libmaven-shade-plugin-java,
                      libplexus-velocity-java,
-                     maven-ant-helper (>= 7.3),
+                     maven-ant-helper (>= 7.9),
                      maven-repo-helper,
                      testng,
                      velocity
@@ -30,7 +31,7 @@
 
 Package: libsurefire-java
 Architecture: all
-Depends: libmaven-common-artifact-filters-java, ${misc:Depends}
+Depends: libcommons-lang3-java, libmaven-common-artifact-filters-java, ${misc:Depends}
 Recommends: junit | junit4 | testng | libjmock-java
 Description: Surefire test framework for Java
  Maven is a software project management and comprehension tool. Based on the

Added: trunk/surefire/debian/maven.properties
===================================================================
--- trunk/surefire/debian/maven.properties	                        (rev 0)
+++ trunk/surefire/debian/maven.properties	2013-11-08 14:46:08 UTC (rev 17454)
@@ -0,0 +1,2 @@
+maven.compiler.source=1.6
+maven.compiler.target=1.6

Modified: trunk/surefire/debian/maven.rules
===================================================================
--- trunk/surefire/debian/maven.rules	2013-11-08 14:15:27 UTC (rev 17453)
+++ trunk/surefire/debian/maven.rules	2013-11-08 14:46:08 UTC (rev 17454)
@@ -3,6 +3,7 @@
 junit junit jar s/3\..*/3.x/
 junit junit jar s/4\..*/4.x/
 jmock jmock jar s/1\..*/1.x/
+org.apache.commons commons-lang3 * s/.*/3.x/
 # fix the version of maven-shade-plugin
 org.apache.maven.plugins maven-shade-plugin maven-plugin s/.*/1.2.1
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness

Modified: trunk/surefire/debian/patches/bypass-testng-version-check.patch
===================================================================
--- trunk/surefire/debian/patches/bypass-testng-version-check.patch	2013-11-08 14:15:27 UTC (rev 17453)
+++ trunk/surefire/debian/patches/bypass-testng-version-check.patch	2013-11-08 14:46:08 UTC (rev 17454)
@@ -5,16 +5,16 @@
 Forwarded: not-needed
 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
 +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
-@@ -618,16 +618,6 @@
-         // TODO: this is pretty manual, but I'd rather not require the plugin > dependencies section right now
+@@ -1184,16 +1184,6 @@
+     {
          Artifact artifact = getProjectArtifactMap().get( getTestNGArtifactName() );
  
 -        if ( artifact != null )
 -        {
--            VersionRange range = VersionRange.createFromVersionSpec( "[4.7,)" );
+-            VersionRange range = createVersionRange();
 -            if ( !range.containsVersion( new DefaultArtifactVersion( artifact.getVersion() ) ) )
 -            {
--                throw new MojoFailureException(
+-                throw new MojoExecutionException(
 -                    "TestNG support requires version 4.7 or above. You have declared version "
 -                        + artifact.getVersion() );
 -            }
@@ -24,8 +24,8 @@
      }
 --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
 +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
-@@ -198,7 +198,7 @@
-                 return new TestNGMapConfigurator();
+@@ -204,7 +204,7 @@
+                 return new TestNG652Configurator();
              }
  
 -            throw new TestSetFailedException( "Unknown TestNG version " + version );

Modified: trunk/surefire/debian/patches/fix-junit-provider-selection.patch
===================================================================
--- trunk/surefire/debian/patches/fix-junit-provider-selection.patch	2013-11-08 14:15:27 UTC (rev 17453)
+++ trunk/surefire/debian/patches/fix-junit-provider-selection.patch	2013-11-08 14:46:08 UTC (rev 17454)
@@ -9,7 +9,7 @@
 
 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
 +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
-@@ -326,12 +326,14 @@
+@@ -867,12 +867,14 @@
  
      private boolean isJunit47Compatible( Artifact artifact )
      {

Modified: trunk/surefire/debian/patches/pom.patch
===================================================================
--- trunk/surefire/debian/patches/pom.patch	2013-11-08 14:15:27 UTC (rev 17453)
+++ trunk/surefire/debian/patches/pom.patch	2013-11-08 14:46:08 UTC (rev 17454)
@@ -12,14 +12,14 @@
 -  <parent>
 -    <artifactId>maven-parent</artifactId>
 -    <groupId>org.apache.maven</groupId>
--    <version>21</version>
+-    <version>22</version>
 -    <relativePath>../pom/maven/pom.xml</relativePath>
 -  </parent>
 -
    <groupId>org.apache.maven.surefire</groupId>
    <artifactId>surefire</artifactId>
-   <version>2.12</version>
-@@ -232,14 +225,15 @@
+   <version>2.12.4</version>
+@@ -240,7 +233,7 @@
      </dependency>
    </dependencies>
  
@@ -28,6 +28,8 @@
      <pluginManagement>
        <plugins>
          <plugin>
+@@ -251,8 +244,9 @@
+         <plugin>
            <artifactId>maven-surefire-plugin</artifactId>
            <version>${shadedVersion}</version>
 -          <configuration>
@@ -37,8 +39,8 @@
              <useSystemClassLoader>false</useSystemClassLoader>
            </configuration>
          </plugin>
-@@ -261,7 +255,7 @@
-         </plugin>
+@@ -294,7 +288,7 @@
+           </configuration>        </plugin>
        </plugins>
      </pluginManagement>
 -  </build>

More information about the pkg-java-commits mailing list