[maven] 01/01: Updated maven-surefire-plugin version from 2.10 to 2.17

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Jun 22 11:05:35 UTC 2015


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

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

commit 567c359f194ea93d2fb69037810a62de8af23b79
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jun 22 12:54:26 2015 +0200

    Updated maven-surefire-plugin version from 2.10 to 2.17
---
 debian/changelog                    |  7 +++++
 debian/control                      |  2 +-
 debian/maven.buildRules             |  2 +-
 debian/maven.rules                  |  2 +-
 debian/patches/plugins_version.diff | 62 ++++++++++++++++++++++---------------
 5 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0c7dfd..308f4e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven (3.0.5-6) unstable; urgency=medium
+
+  * Team upload.
+  * Updated maven-surefire-plugin version from 2.10 to 2.17
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 22 Jun 2015 12:44:53 +0200
+
 maven (3.0.5-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 50f0c5f..1a826b9 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends-Indep: ant-optional,
                      libplexus-containers1.5-java (>= 1.5.5-2),
                      libplexus-utils2-java,
                      libsisu-ioc-java,
-                     libsurefire-java,
+                     libsurefire-java (>= 2.17),
                      libwagon2-java (>= 2.2-2),
                      libxmlunit-java,
                      maven-ant-helper,
diff --git a/debian/maven.buildRules b/debian/maven.buildRules
index bce2702..77231bd 100644
--- a/debian/maven.buildRules
+++ b/debian/maven.buildRules
@@ -16,7 +16,7 @@ org.codehaus.plexus plexus-component-annotations * s/.*/1.5.5/ * *
 
 org.apache.maven.plugins maven-clean-plugin * s/.*/2.3/ * *
 org.apache.maven.plugins maven-resources-plugin * s/.*/2.3/ * *
-org.apache.maven.plugins maven-surefire-plugin * s/.*/2.10/ * *
+org.apache.maven.plugins maven-surefire-plugin * s/.*/2.17/ * *
 org.apache.maven.plugins maven-jar-plugin * s/.*/2.4/ * *
 org.apache.maven.plugins maven-compiler-plugin * s/.*/3.2/ * *
 
diff --git a/debian/maven.rules b/debian/maven.rules
index a37158c..9ee5a9a 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,7 +16,7 @@ org.codehaus.plexus plexus-component-annotations * s/.*/1.5.5/ * *
 
 org.apache.maven.plugins maven-clean-plugin * s/.*/2.3/ * *
 org.apache.maven.plugins maven-resources-plugin * s/.*/2.3/ * *
-org.apache.maven.plugins maven-surefire-plugin * s/.*/2.10/ * *
+org.apache.maven.plugins maven-surefire-plugin * s/.*/2.17/ * *
 org.apache.maven.plugins maven-jar-plugin * s/.*/2.4/ * *
 org.apache.maven.plugins maven-compiler-plugin * s/.*/3.2/ * *
 
diff --git a/debian/patches/plugins_version.diff b/debian/patches/plugins_version.diff
index 2fed786..2b10d08 100644
--- a/debian/patches/plugins_version.diff
+++ b/debian/patches/plugins_version.diff
@@ -6,7 +6,7 @@ Last-Update: 2012-01-21
 Forwarded: not-needed
 --- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
 +++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
-@@ -55,7 +55,7 @@ problem.
+@@ -55,7 +55,7 @@
              <!-- START SNIPPET: pom-lifecycle -->
              <phases>
                <install>
@@ -15,7 +15,7 @@ Forwarded: not-needed
                </install>
                <deploy>
                  org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -91,25 +91,25 @@ problem.
+@@ -91,25 +91,25 @@
              <!-- START SNIPPET: jar-lifecycle -->
              <phases>
                <process-resources>
@@ -35,7 +35,8 @@ Forwarded: not-needed
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
                </test-compile>
                <test>
-                 org.apache.maven.plugins:maven-surefire-plugin:2.10:test
+-                org.apache.maven.plugins:maven-surefire-plugin:2.10:test
++                org.apache.maven.plugins:maven-surefire-plugin:2.17:test
                </test>
                <package>
 -                org.apache.maven.plugins:maven-jar-plugin:2.3.2:jar
@@ -47,7 +48,7 @@ Forwarded: not-needed
                </install>
                <deploy>
                  org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -146,16 +146,16 @@ problem.
+@@ -146,25 +146,25 @@
              <!-- START SNIPPET: ejb-lifecycle -->
              <phases>
                <process-resources>
@@ -67,8 +68,10 @@ Forwarded: not-needed
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
                </test-compile>
                <test>
-                 org.apache.maven.plugins:maven-surefire-plugin:2.10:test
-@@ -164,7 +164,7 @@ problem.
+-                org.apache.maven.plugins:maven-surefire-plugin:2.10:test
++                org.apache.maven.plugins:maven-surefire-plugin:2.17:test
+               </test>
+               <package>
                  org.apache.maven.plugins:maven-ejb-plugin:2.3:ejb
                </package>
                <install>
@@ -77,7 +80,7 @@ Forwarded: not-needed
                </install>
                <deploy>
                  org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -210,16 +210,16 @@ problem.
+@@ -210,25 +210,25 @@
              <!-- START SNIPPET: ejb3-lifecycle -->
              <phases>
                <process-resources>
@@ -97,8 +100,10 @@ Forwarded: not-needed
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
                </test-compile>
                <test>
-                 org.apache.maven.plugins:maven-surefire-plugin:2.10:test
-@@ -228,7 +228,7 @@ problem.
+-                org.apache.maven.plugins:maven-surefire-plugin:2.10:test
++                org.apache.maven.plugins:maven-surefire-plugin:2.17:test
+               </test>
+               <package>
                  org.apache.maven.plugins:maven-ejb3-plugin:ejb3
                </package>
                <install>
@@ -107,7 +112,7 @@ Forwarded: not-needed
                </install>
                <deploy>
                  org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -285,26 +285,26 @@ problem.
+@@ -285,26 +285,26 @@
                  org.apache.maven.plugins:maven-plugin-plugin:2.9:descriptor
                </generate-resources>
                <process-resources>
@@ -127,7 +132,8 @@ Forwarded: not-needed
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
                </test-compile>
                <test>
-                 org.apache.maven.plugins:maven-surefire-plugin:2.10:test
+-                org.apache.maven.plugins:maven-surefire-plugin:2.10:test
++                org.apache.maven.plugins:maven-surefire-plugin:2.17:test
                </test>
                <package>
 -                org.apache.maven.plugins:maven-jar-plugin:2.3.1:jar,
@@ -140,7 +146,7 @@ Forwarded: not-needed
                </install>
                <deploy>
                  org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -373,16 +373,16 @@ problem.
+@@ -373,25 +373,25 @@
              <!-- START SNIPPET: war-lifecycle -->
              <phases>
                <process-resources>
@@ -160,8 +166,10 @@ Forwarded: not-needed
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
                </test-compile>
                <test>
-                 org.apache.maven.plugins:maven-surefire-plugin:2.10:test
-@@ -391,7 +391,7 @@ problem.
+-                org.apache.maven.plugins:maven-surefire-plugin:2.10:test
++                org.apache.maven.plugins:maven-surefire-plugin:2.17:test
+               </test>
+               <package>
                  org.apache.maven.plugins:maven-war-plugin:2.1.1:war
                </package>
                <install>
@@ -170,7 +178,7 @@ Forwarded: not-needed
                </install>
                <deploy>
                  org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -431,13 +431,13 @@ problem.
+@@ -431,13 +431,13 @@
                  org.apache.maven.plugins:maven-ear-plugin:2.5:generate-application-xml
                </generate-resources>
                <process-resources>
@@ -186,7 +194,7 @@ Forwarded: not-needed
                </install>
                <deploy>
                  org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -474,16 +474,16 @@ problem.
+@@ -474,25 +474,25 @@
              <!-- START SNIPPET: rar-lifecycle -->
              <phases>
                <process-resources>
@@ -206,8 +214,10 @@ Forwarded: not-needed
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
                </test-compile>
                <test>
-                 org.apache.maven.plugins:maven-surefire-plugin:2.10:test
-@@ -492,7 +492,7 @@ problem.
+-                org.apache.maven.plugins:maven-surefire-plugin:2.10:test
++                org.apache.maven.plugins:maven-surefire-plugin:2.17:test
+               </test>
+               <package>
                  org.apache.maven.plugins:maven-rar-plugin:2.2:rar
                </package>
                <install>
@@ -216,7 +226,7 @@ Forwarded: not-needed
                </install>
                <deploy>
                  org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -529,16 +529,16 @@ problem.
+@@ -529,25 +529,25 @@
              <!-- START SNIPPET: par-lifecycle -->
              <phases>
                <process-resources>
@@ -236,8 +246,10 @@ Forwarded: not-needed
 +                org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
                </test-compile>
                <test>
-                 org.apache.maven.plugins:maven-surefire-plugin:2.10:test
-@@ -547,7 +547,7 @@ problem.
+-                org.apache.maven.plugins:maven-surefire-plugin:2.10:test
++                org.apache.maven.plugins:maven-surefire-plugin:2.17:test
+               </test>
+               <package>
                  org.apache.maven.plugins:maven-par-plugin:par
                </package>
                <install>
@@ -248,7 +260,7 @@ Forwarded: not-needed
                  org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
 --- a/maven-core/src/main/resources/META-INF/plexus/components.xml
 +++ b/maven-core/src/main/resources/META-INF/plexus/components.xml
-@@ -106,7 +106,7 @@ under the License.
+@@ -106,7 +106,7 @@
          </phases>
          <default-phases>
            <clean>
@@ -263,13 +275,13 @@ Forwarded: not-needed
            <plugin>
              <groupId>org.apache.maven.plugins</groupId>
              <artifactId>maven-surefire-plugin</artifactId>
-+            <version>2.10</version>
++            <version>2.17</version>
              <configuration>
                <systemProperties combine.children="append">
                  <property>
 --- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
 +++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
-@@ -74,7 +74,7 @@ under the License.
+@@ -74,7 +74,7 @@
        <plugins>
          <plugin>
            <artifactId>maven-antrun-plugin</artifactId>
@@ -278,7 +290,7 @@ Forwarded: not-needed
          </plugin>
          <plugin>
            <artifactId>maven-assembly-plugin</artifactId>
-@@ -82,7 +82,7 @@ under the License.
+@@ -82,7 +82,7 @@
          </plugin>
          <plugin>
            <artifactId>maven-dependency-plugin</artifactId>

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



More information about the pkg-java-commits mailing list