[maven] 02/10: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Jul 9 06:58:01 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 7fbda07f947d9800735659df233770082768d52b
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jul 8 09:12:30 2015 +0200
Refreshed the patches
---
debian/changelog | 2 +-
debian/maven.ignoreRules | 3 +-
debian/patches/add_dependencies.diff | 2 +-
debian/patches/dep_versions.diff | 32 +++++++-------
debian/patches/force_java15_compiler.diff | 32 --------------
debian/patches/plugins_version.diff | 55 +++++++++----------------
debian/patches/secure-maven-central-access.diff | 33 ---------------
debian/patches/series | 3 --
8 files changed, 39 insertions(+), 123 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a9a7ff8..d61edfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-maven (3.1.1-1) UNRELEASED; urgency=medium
+maven (3.2.5-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 2d34700..4b0dae8 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,2 +1,3 @@
org.codehaus.mojo animal-sniffer-maven-plugin * * * *
-org.codehaus.mojo buildnumber-maven-plugin * * * *
\ No newline at end of file
+org.codehaus.mojo buildnumber-maven-plugin * * * *
+org.apache.maven maven-assembly-plugin * * * *
diff --git a/debian/patches/add_dependencies.diff b/debian/patches/add_dependencies.diff
index 184aab7..74cea7d 100644
--- a/debian/patches/add_dependencies.diff
+++ b/debian/patches/add_dependencies.diff
@@ -5,7 +5,7 @@ Last-Update: 2012-01-21
Forwarded: no
--- a/pom.xml
+++ b/pom.xml
-@@ -213,6 +213,11 @@
+@@ -237,6 +237,11 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/debian/patches/dep_versions.diff b/debian/patches/dep_versions.diff
index 94964e2..c050206 100644
--- a/debian/patches/dep_versions.diff
+++ b/debian/patches/dep_versions.diff
@@ -5,34 +5,32 @@ Last-Update: 2012-01-21
Forwarded: not-needed
--- a/pom.xml
+++ b/pom.xml
-@@ -42,24 +42,24 @@
- <inceptionYear>2001</inceptionYear>
-
+@@ -44,23 +44,23 @@
<properties>
-- <classWorldsVersion>2.5.1</classWorldsVersion>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
+- <classWorldsVersion>2.5.2</classWorldsVersion>
- <commonsCliVersion>1.2</commonsCliVersion>
-- <easyMockVersion>1.2_Java1.3</easyMockVersion>
-- <junitVersion>3.8.2</junitVersion>
+- <junitVersion>4.11</junitVersion>
+ <classWorldsVersion>2.x</classWorldsVersion>
+ <commonsCliVersion>debian</commonsCliVersion>
-+ <easyMockVersion>debian</easyMockVersion>
-+ <junitVersion>3.x</junitVersion>
++ <junitVersion>4.x</junitVersion>
<plexusVersion>1.5.5</plexusVersion>
-- <plexusInterpolationVersion>1.19</plexusInterpolationVersion>
-- <plexusUtilsVersion>3.0.15</plexusUtilsVersion>
+- <plexusInterpolationVersion>1.21</plexusInterpolationVersion>
+- <plexusUtilsVersion>3.0.20</plexusUtilsVersion>
+ <plexusInterpolationVersion>debian</plexusInterpolationVersion>
+ <plexusUtilsVersion>2.x</plexusUtilsVersion>
- <!-- last Java5 release of Guava -->
-- <guavaVersion>11.0.2</guavaVersion>
+ <!-- Latest version of Guava that works with Sisu -->
+- <guavaVersion>18.0</guavaVersion>
+ <guavaVersion>debian</guavaVersion>
- <guiceVersion>3.1.3</guiceVersion>
-- <sisuInjectVersion>0.0.0.M5</sisuInjectVersion>
-- <wagonVersion>2.4</wagonVersion>
+ <guiceVersion>3.2.3</guiceVersion>
+- <sisuInjectVersion>0.3.0.M1</sisuInjectVersion>
+- <wagonVersion>2.8</wagonVersion>
- <securityDispatcherVersion>1.3</securityDispatcherVersion>
- <cipherVersion>1.7</cipherVersion>
- <modelloVersion>1.8.1</modelloVersion>
- <jxpathVersion>1.3</jxpathVersion>
-- <aetherVersion>0.9.0.M2</aetherVersion>
+- <aetherVersion>1.0.0.v20140518</aetherVersion>
- <slf4jVersion>1.7.5</slf4jVersion>
+ <sisuInjectVersion>debian</sisuInjectVersion>
+ <wagonVersion>2.x</wagonVersion>
@@ -45,7 +43,7 @@ Forwarded: not-needed
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
<distributionId>apache-maven</distributionId>
-@@ -193,7 +193,6 @@
+@@ -218,7 +218,6 @@
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
<version>${guiceVersion}</version>
diff --git a/debian/patches/force_java15_compiler.diff b/debian/patches/force_java15_compiler.diff
deleted file mode 100644
index 2f262b1..0000000
--- a/debian/patches/force_java15_compiler.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Force modello and javac to use Java5 source.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2012-01-21
-Forwarded: no
---- a/pom.xml
-+++ b/pom.xml
-@@ -387,6 +387,9 @@
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <version>${modelloVersion}</version>
-+ <configuration>
-+<useJava5>true</useJava5>
-+ </configuration>
- <executions>
- <execution>
- <id>site-docs</id>
-@@ -449,6 +452,15 @@
- </excludes>
- </configuration>
- </plugin>
-+ <plugin>
-+ <groupId>org.apache.maven.plugins</groupId>
-+ <artifactId>maven-compiler-plugin</artifactId>
-+ <version>2.0.2</version>
-+ <configuration>
-+ <source>1.5</source>
-+ <target>1.5</target>
-+ </configuration>
-+ </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
diff --git a/debian/patches/plugins_version.diff b/debian/patches/plugins_version.diff
index 4cb3a6f..5101eed 100644
--- a/debian/patches/plugins_version.diff
+++ b/debian/patches/plugins_version.diff
@@ -23,7 +23,7 @@ Forwarded: not-needed
+ org.apache.maven.plugins:maven-resources-plugin:2.3:resources
</process-resources>
<compile>
-- org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
+- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+ org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
</compile>
<process-test-resources>
@@ -31,7 +31,7 @@ Forwarded: not-needed
+ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
</process-test-resources>
<test-compile>
-- org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
+- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
</test-compile>
<test>
@@ -55,7 +55,7 @@ Forwarded: not-needed
+ org.apache.maven.plugins:maven-resources-plugin:2.3:resources
</process-resources>
<compile>
-- org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
+- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+ org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
</compile>
<process-test-resources>
@@ -63,7 +63,7 @@ Forwarded: not-needed
+ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
</process-test-resources>
<test-compile>
-- org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
+- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
</test-compile>
<test>
@@ -88,7 +88,7 @@ Forwarded: not-needed
+ org.apache.maven.plugins:maven-resources-plugin:2.3:resources
</process-resources>
<compile>
-- org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
+- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+ org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
</compile>
<process-test-resources>
@@ -96,7 +96,7 @@ Forwarded: not-needed
+ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
</process-test-resources>
<test-compile>
-- org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
+- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
</test-compile>
<test>
@@ -112,23 +112,26 @@ Forwarded: not-needed
</install>
<deploy>
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
-@@ -198,26 +198,26 @@
- org.apache.maven.plugins:maven-plugin-plugin:3.2:descriptor
- </generate-resources>
+@@ -195,29 +195,29 @@
+ <!-- START SNIPPET: maven-plugin-lifecycle -->
+ <phases>
<process-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+ org.apache.maven.plugins:maven-resources-plugin:2.3:resources
</process-resources>
<compile>
-- org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
+- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+ org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
</compile>
+ <process-classes>
+ org.apache.maven.plugins:maven-plugin-plugin:3.2:descriptor
+ </process-classes>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
+ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
</process-test-resources>
<test-compile>
-- org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
+- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
</test-compile>
<test>
@@ -153,7 +156,7 @@ Forwarded: not-needed
+ org.apache.maven.plugins:maven-resources-plugin:2.3:resources
</process-resources>
<compile>
-- org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
+- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+ org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
</compile>
<process-test-resources>
@@ -161,7 +164,7 @@ Forwarded: not-needed
+ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
</process-test-resources>
<test-compile>
-- org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
+- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
</test-compile>
<test>
@@ -207,7 +210,7 @@ Forwarded: not-needed
+ org.apache.maven.plugins:maven-resources-plugin:2.3:resources
</process-resources>
<compile>
-- org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
+- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+ org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
</compile>
<process-test-resources>
@@ -215,7 +218,7 @@ Forwarded: not-needed
+ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
</process-test-resources>
<test-compile>
-- org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
+- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
</test-compile>
<test>
@@ -239,7 +242,7 @@ Forwarded: not-needed
+ org.apache.maven.plugins:maven-resources-plugin:2.3:resources
</process-resources>
<compile>
-- org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
+- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+ org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
</compile>
<process-test-resources>
@@ -247,7 +250,7 @@ Forwarded: not-needed
+ org.apache.maven.plugins:maven-resources-plugin:2.3:testResources
</process-test-resources>
<test-compile>
-- org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
+- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
</test-compile>
<test>
@@ -265,24 +268,6 @@ Forwarded: not-needed
org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
--- a/pom.xml
+++ b/pom.xml
-@@ -360,7 +360,7 @@
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
-- <version>2.5.1</version>
-+ <version>3.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
-@@ -373,7 +373,7 @@
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
-- <version>2.12</version>
-+ <version>2.17</version>
- <configuration>
- <argLine>-Xmx256m</argLine>
- </configuration>
@@ -611,6 +611,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/debian/patches/secure-maven-central-access.diff b/debian/patches/secure-maven-central-access.diff
deleted file mode 100644
index 303e9d8..0000000
--- a/debian/patches/secure-maven-central-access.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Download artifacts from Maven central using https by default
-Origin: backport, https://github.com/apache/maven/commit/9216191
---- a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
-+++ b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
-@@ -52,7 +52,7 @@
-
- String DEFAULT_REMOTE_REPO_ID = "central";
-
-- String DEFAULT_REMOTE_REPO_URL = "http://repo.maven.apache.org/maven2";
-+ String DEFAULT_REMOTE_REPO_URL = "https://repo.maven.apache.org/maven2";
-
- Artifact createArtifact( String groupId, String artifactId, String version, String packaging );
-
---- 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
-@@ -27,7 +27,7 @@
- <repository>
- <id>central</id>
- <name>Central Repository</name>
-- <url>http://repo.maven.apache.org/maven2</url>
-+ <url>https://repo.maven.apache.org/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
-@@ -39,7 +39,7 @@
- <pluginRepository>
- <id>central</id>
- <name>Central Repository</name>
-- <url>http://repo.maven.apache.org/maven2</url>
-+ <url>https://repo.maven.apache.org/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
diff --git a/debian/patches/series b/debian/patches/series
index b757b42..e6bcf93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,3 @@ modello.diff
plugins_version.diff
dep_versions.diff
add_dependencies.diff
-force_java15_compiler.diff
-no_maven_assembly.diff
-secure-maven-central-access.diff
--
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