[maven] 02/06: New upstream release (3.0.5)

Emmanuel Bourg ebourg-guest at alioth.debian.org
Mon Oct 21 20:51:25 UTC 2013 

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

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

commit 12ad030fbdf0578491a8dcdfd9dfd8c9952f37a9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 21 17:13:31 2013 +0200

    New upstream release (3.0.5)
---
 debian/changelog                          |    4 +++-
 debian/maven.poms                         |   22 +++++++++++-----------
 debian/maven.rules                        |   26 +++++++++++++-------------
 debian/mvn.1                              |    4 ++--
 debian/mvnDebug.1                         |    2 +-
 debian/patches/add_dependencies.diff      |    2 +-
 debian/patches/dep_versions.diff          |    2 +-
 debian/patches/force_java15_compiler.diff |    8 ++++----
 debian/patches/no_maven_assembly.diff     |    4 ++--
 debian/patches/plugins_version.diff       |    2 +-
 10 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69e2124..64a259e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-maven (3.0.4-7) UNRELEASED; urgency=low
+maven (3.0.5-1) UNRELEASED; urgency=low
 
   * Team upload.
+  * New upstream release (Closes: #704261)
+    - Refreshed the patches
   * Updated modello.diff to use Guava instead of Google Collections
     (Closes: #725588)
   * Updated maven-clean-plugin version from 2.3 to 2.5
diff --git a/debian/maven.poms b/debian/maven.poms
index 73c0468..b6f367b 100644
--- a/debian/maven.poms
+++ b/debian/maven.poms
@@ -1,15 +1,15 @@
 pom.xml
 apache-maven/pom.xml
 
-maven-aether-provider/pom.xml --artifact=maven-aether-provider/target/maven-aether-provider-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-artifact/pom.xml --artifact=maven-artifact/target/maven-artifact-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-compat/pom.xml --artifact=maven-compat/target/maven-compat-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-core/pom.xml --artifact=maven-core/target/maven-core-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-embedder/pom.xml --artifact=maven-embedder/target/maven-embedder-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-model/pom.xml --artifact=maven-model/target/maven-model-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-model-builder/pom.xml --artifact=maven-model-builder/target/maven-model-builder-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-plugin-api/pom.xml --artifact=maven-plugin-api/target/maven-plugin-api-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-repository-metadata/pom.xml --artifact=maven-repository-metadata/target/maven-repository-metadata-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-settings/pom.xml --artifact=maven-settings/target/maven-settings-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x
-maven-settings-builder/pom.xml --artifact=maven-settings-builder/target/maven-settings-builder-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x
+maven-aether-provider/pom.xml --artifact=maven-aether-provider/target/maven-aether-provider-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
+maven-artifact/pom.xml --artifact=maven-artifact/target/maven-artifact-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
+maven-compat/pom.xml --artifact=maven-compat/target/maven-compat-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
+maven-core/pom.xml --artifact=maven-core/target/maven-core-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
+maven-embedder/pom.xml --artifact=maven-embedder/target/maven-embedder-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
+maven-model/pom.xml --artifact=maven-model/target/maven-model-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
+maven-model-builder/pom.xml --artifact=maven-model-builder/target/maven-model-builder-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
+maven-plugin-api/pom.xml --artifact=maven-plugin-api/target/maven-plugin-api-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
+maven-repository-metadata/pom.xml --artifact=maven-repository-metadata/target/maven-repository-metadata-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
+maven-settings/pom.xml --artifact=maven-settings/target/maven-settings-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
+maven-settings-builder/pom.xml --artifact=maven-settings-builder/target/maven-settings-builder-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x
 
diff --git a/debian/maven.rules b/debian/maven.rules
index c174037..0f42dae 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -20,16 +20,16 @@ org.apache.maven.plugins maven-surefire-plugin * s/.*/2.10/ * *
 org.apache.maven.plugins maven-jar-plugin * s/.*/2.2/ * *
 org.apache.maven.plugins maven-compiler-plugin * s/.*/2.0.2/ * *
 
-org.apache.maven apache-maven pom s/.*/3.0.4/ * *
-org.apache.maven maven-aether-provider jar s/.*/3.0.4/ * *
-org.apache.maven maven-artifact jar s/.*/3.0.4/ * *
-org.apache.maven maven-compat jar s/.*/3.0.4/ * *
-org.apache.maven maven-core jar s/.*/3.0.4/ * *
-org.apache.maven maven-embedder jar s/.*/3.0.4/ * *
-org.apache.maven maven-model-builder jar s/.*/3.0.4/ * *
-org.apache.maven maven-model jar s/.*/3.0.4/ * *
-org.apache.maven maven-plugin-api jar s/.*/3.0.4/ * *
-org.apache.maven maven-repository-metadata jar s/.*/3.0.4/ * *
-org.apache.maven maven-settings-builder jar s/.*/3.0.4/ * *
-org.apache.maven maven-settings jar s/.*/3.0.4/ * *
-org.apache.maven maven pom s/.*/3.0.4/ * *
+org.apache.maven apache-maven pom s/.*/3.0.5/ * *
+org.apache.maven maven-aether-provider jar s/.*/3.0.5/ * *
+org.apache.maven maven-artifact jar s/.*/3.0.5/ * *
+org.apache.maven maven-compat jar s/.*/3.0.5/ * *
+org.apache.maven maven-core jar s/.*/3.0.5/ * *
+org.apache.maven maven-embedder jar s/.*/3.0.5/ * *
+org.apache.maven maven-model-builder jar s/.*/3.0.5/ * *
+org.apache.maven maven-model jar s/.*/3.0.5/ * *
+org.apache.maven maven-plugin-api jar s/.*/3.0.5/ * *
+org.apache.maven maven-repository-metadata jar s/.*/3.0.5/ * *
+org.apache.maven maven-settings-builder jar s/.*/3.0.5/ * *
+org.apache.maven maven-settings jar s/.*/3.0.5/ * *
+org.apache.maven maven pom s/.*/3.0.5/ * *
diff --git a/debian/mvn.1 b/debian/mvn.1
index 8e0ed3c..54001e1 100644
--- a/debian/mvn.1
+++ b/debian/mvn.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
-.TH APACHE "1" "December 2011" "Apache Maven 3.0.4" "User Commands"
+.TH APACHE "1" "December 2011" "Apache Maven 3.0.5" "User Commands"
 .SH NAME
 mvn \- Command to start the Maven system
 .SH DESCRIPTION
@@ -135,4 +135,4 @@ WITHOUT stopping build
 Display version information
 .TP
 \fB\-X\fR,\-\-debug
-Produce execution debug output
\ No newline at end of file
+Produce execution debug output
diff --git a/debian/mvnDebug.1 b/debian/mvnDebug.1
index ddc4fd8..35365b3 100644
--- a/debian/mvnDebug.1
+++ b/debian/mvnDebug.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
-.TH APACHE "1" "December 2011" "Apache Maven 3.0.4" "User Commands"
+.TH APACHE "1" "December 2011" "Apache Maven 3.0.5" "User Commands"
 .SH NAME
 mvnDebug \- Command to start the Maven system in Debug mode
 .SH DESCRIPTION
diff --git a/debian/patches/add_dependencies.diff b/debian/patches/add_dependencies.diff
index 016185f..1522bd0 100644
--- a/debian/patches/add_dependencies.diff
+++ b/debian/patches/add_dependencies.diff
@@ -32,7 +32,7 @@ Forwarded: no
      </dependency>
 --- a/pom.xml
 +++ b/pom.xml
-@@ -271,6 +271,11 @@
+@@ -274,6 +274,11 @@
        </dependency>
        <dependency>
          <groupId>org.codehaus.plexus</groupId>
diff --git a/debian/patches/dep_versions.diff b/debian/patches/dep_versions.diff
index a51de3f..93303e1 100644
--- a/debian/patches/dep_versions.diff
+++ b/debian/patches/dep_versions.diff
@@ -21,7 +21,7 @@ Forwarded: not-needed
 -    <plexusInterpolationVersion>1.14</plexusInterpolationVersion>
 -    <plexusUtilsVersion>2.0.6</plexusUtilsVersion>
 -    <sisuInjectVersion>2.3.0</sisuInjectVersion>
--    <wagonVersion>2.2</wagonVersion>
+-    <wagonVersion>2.4</wagonVersion>
 -    <securityDispatcherVersion>1.3</securityDispatcherVersion>
 -    <cipherVersion>1.7</cipherVersion>
 +    <plexusInterpolationVersion>debian</plexusInterpolationVersion>
diff --git a/debian/patches/force_java15_compiler.diff b/debian/patches/force_java15_compiler.diff
index d2dd03f..a9a583c 100644
--- a/debian/patches/force_java15_compiler.diff
+++ b/debian/patches/force_java15_compiler.diff
@@ -4,7 +4,7 @@ Last-Update: 2012-01-21
 Forwarded: no
 --- a/pom.xml
 +++ b/pom.xml
-@@ -428,6 +428,9 @@
+@@ -431,6 +431,9 @@
            <groupId>org.codehaus.modello</groupId>
            <artifactId>modello-maven-plugin</artifactId>
            <version>${modelloVersion}</version>
@@ -14,9 +14,9 @@ Forwarded: no
            <executions>
              <execution>
                <id>site-docs</id>
-@@ -462,6 +465,15 @@
-           <artifactId>buildnumber-maven-plugin</artifactId>
-           <version>1.0</version>
+@@ -475,6 +478,15 @@
+             <tryUpdate>true</tryUpdate>
+           </configuration>
          </plugin>
 +      <plugin>
 +        <groupId>org.apache.maven.plugins</groupId>
diff --git a/debian/patches/no_maven_assembly.diff b/debian/patches/no_maven_assembly.diff
index e98a5b8..fe2cff0 100644
--- a/debian/patches/no_maven_assembly.diff
+++ b/debian/patches/no_maven_assembly.diff
@@ -18,7 +18,7 @@
  
 --- a/pom.xml
 +++ b/pom.xml
-@@ -455,11 +455,13 @@
+@@ -458,11 +458,13 @@
            <artifactId>maven-bundle-plugin</artifactId>
            <version>1.0.0</version>
          </plugin>
@@ -26,7 +26,7 @@
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-assembly-plugin</artifactId>
-           <version>2.2-beta-5</version>
+           <version>2.4</version>
          </plugin>
 +-->
          <plugin>
diff --git a/debian/patches/plugins_version.diff b/debian/patches/plugins_version.diff
index a8daff0..e7cf9e0 100644
--- a/debian/patches/plugins_version.diff
+++ b/debian/patches/plugins_version.diff
@@ -259,7 +259,7 @@ Forwarded: not-needed
          <!-- END SNIPPET: clean -->
 --- a/pom.xml
 +++ b/pom.xml
-@@ -580,6 +580,7 @@
+@@ -593,6 +593,7 @@
            <plugin>
              <groupId>org.apache.maven.plugins</groupId>
              <artifactId>maven-surefire-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