[maven] 01/01: Prepare 3.0.5-4 upload
Miguel Landaeta
nomadium at moszumanska.debian.org
Mon Mar 9 00:09:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
nomadium pushed a commit to branch master
in repository maven.
commit 9a3dfd5b97ef9f205a633148316afb065edcad70
Author: Miguel Landaeta <nomadium at debian.org>
Date: Sun Mar 8 21:11:53 2015 -0300
Prepare 3.0.5-4 upload
---
debian/changelog | 11 +++++++++
debian/control | 2 +-
debian/maven.buildRules | 2 +-
debian/maven.rules | 2 +-
debian/patches/plugins_version.diff | 48 ++++++++++++++++++++++++++-----------
5 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4423ce6..b42db9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+maven (3.0.5-4) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Refresh patch plugins_version.diff:
+ - Bump maven-compiler-plugin version to be used with Maven 3, from
+ 2.5.1 to 3.2.
+ - Update maven-antrun-plugin and maven-dependency-plugin versions to
+ match current Debian versions.
+
+ -- Miguel Landaeta <nomadium at debian.org> Sun, 08 Mar 2015 19:25:12 -0300
+
maven (3.0.5-3) unstable; urgency=high
* Team upload.
diff --git a/debian/control b/debian/control
index 7586d78..50f0c5f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends-Indep: ant-optional,
libeasymock-java,
libmaven-ant-tasks-java (>= 2.1.3-2),
libmaven-clean-plugin-java (>= 2.5),
- libmaven-compiler-plugin-java,
+ libmaven-compiler-plugin-java (>= 3.2),
libmaven-install-plugin-java,
libmaven-jar-plugin-java,
libmaven-parent-java,
diff --git a/debian/maven.buildRules b/debian/maven.buildRules
index c57477f..bce2702 100644
--- a/debian/maven.buildRules
+++ b/debian/maven.buildRules
@@ -18,7 +18,7 @@ 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-jar-plugin * s/.*/2.4/ * *
-org.apache.maven.plugins maven-compiler-plugin * s/.*/2.5.1/ * *
+org.apache.maven.plugins maven-compiler-plugin * s/.*/3.2/ * *
org.apache.maven apache-maven pom s/.*/3.0.5/ * *
org.apache.maven maven-aether-provider jar s/.*/3.0.5/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 24eac4c..a37158c 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -18,7 +18,7 @@ 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-jar-plugin * s/.*/2.4/ * *
-org.apache.maven.plugins maven-compiler-plugin * s/.*/2.5.1/ * *
+org.apache.maven.plugins maven-compiler-plugin * s/.*/3.2/ * *
org.apache.maven apache-maven pom s/.*/3.x/ * *
org.apache.maven maven-aether-provider jar s/.*/3.x/ * *
diff --git a/debian/patches/plugins_version.diff b/debian/patches/plugins_version.diff
index 2a356f1..2fed786 100644
--- a/debian/patches/plugins_version.diff
+++ b/debian/patches/plugins_version.diff
@@ -24,7 +24,7 @@ Forwarded: not-needed
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
++ org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.5:testResources
@@ -32,7 +32,7 @@ Forwarded: not-needed
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.10:test
@@ -56,7 +56,7 @@ Forwarded: not-needed
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
++ org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.5:testResources
@@ -64,7 +64,7 @@ Forwarded: not-needed
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.10:test
@@ -86,7 +86,7 @@ Forwarded: not-needed
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
++ org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.5:testResources
@@ -94,7 +94,7 @@ Forwarded: not-needed
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.10:test
@@ -116,7 +116,7 @@ Forwarded: not-needed
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
++ org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.5:testResources
@@ -124,7 +124,7 @@ Forwarded: not-needed
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.10:test
@@ -149,7 +149,7 @@ Forwarded: not-needed
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
++ org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.5:testResources
@@ -157,7 +157,7 @@ Forwarded: not-needed
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.10:test
@@ -195,7 +195,7 @@ Forwarded: not-needed
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
++ org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.5:testResources
@@ -203,7 +203,7 @@ Forwarded: not-needed
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.10:test
@@ -225,7 +225,7 @@ Forwarded: not-needed
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
++ org.apache.maven.plugins:maven-compiler-plugin:3.2:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.5:testResources
@@ -233,7 +233,7 @@ Forwarded: not-needed
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
-+ org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile
++ org.apache.maven.plugins:maven-compiler-plugin:3.2:testCompile
</test-compile>
<test>
org.apache.maven.plugins:maven-surefire-plugin:2.10:test
@@ -267,3 +267,23 @@ Forwarded: not-needed
<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.
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+- <version>1.3</version>
++ <version>1.7</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+@@ -82,7 +82,7 @@ under the License.
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+- <version>2.1</version>
++ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-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