This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-stapler-plugin.
commit 3535126b03bce0817ad9cc4c7150390ea1e60e27 Author: Emmanuel Bourg <[email protected]> Date: Tue May 27 16:36:04 2014 +0200 Refreshed the patches --- debian/changelog | 8 ++++++++ debian/patches/java7-compat.patch | 34 ---------------------------------- debian/patches/series | 1 - debian/patches/stapler-compat.patch | 26 +++++++++----------------- 4 files changed, 17 insertions(+), 52 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25e5e5e..f54c1be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +maven-stapler-plugin (1.17-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release + * Removed java7-compat.patch (fixed upstream) + + -- Emmanuel Bourg <[email protected]> Tue, 27 May 2014 16:33:48 +0200 + maven-stapler-plugin (1.16-5) unstable; urgency=low * Team upload. diff --git a/debian/patches/java7-compat.patch b/debian/patches/java7-compat.patch deleted file mode 100644 index beaddbe..0000000 --- a/debian/patches/java7-compat.patch +++ /dev/null @@ -1,34 +0,0 @@ -Description: Add profile to pickup tools.jar file when vendor - is Oracle Corporation - this ensure compatiblity with OpenJDK7 -Author: James Page <[email protected]> -Bug: https://github.com/stapler/maven-stapler-plugin/pull/1 - -Index: maven-stapler-plugin/pom.xml -=================================================================== ---- maven-stapler-plugin.orig/pom.xml 2012-06-19 18:11:12.786411092 +0100 -+++ maven-stapler-plugin/pom.xml 2012-06-20 19:34:21.778450559 +0100 -@@ -170,5 +170,24 @@ - </dependency> - </dependencies> - </profile> -+ <profile> -+ <!-- OpenJDK7 Compatibility --> -+ <id>default-tools7.jar</id> -+ <activation> -+ <property> -+ <name>java.vendor</name> -+ <value>Oracle Corporation</value> -+ </property> -+ </activation> -+ <dependencies> -+ <dependency> -+ <groupId>com.sun</groupId> -+ <artifactId>tools</artifactId> -+ <version>1.7.0</version> -+ <scope>system</scope> -+ <systemPath>${java.home}/../lib/tools.jar</systemPath> -+ </dependency> -+ </dependencies> -+ </profile> - </profiles> - </project> diff --git a/debian/patches/series b/debian/patches/series index 00b7b03..250fb7f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -java7-compat.patch disable-taglibdoc-mojo.patch stapler-compat.patch diff --git a/debian/patches/stapler-compat.patch b/debian/patches/stapler-compat.patch index b014596..4b5149b 100644 --- a/debian/patches/stapler-compat.patch +++ b/debian/patches/stapler-compat.patch @@ -3,11 +3,9 @@ Description: Remove Java 6 annotation processors from stapler plugin as these Author: James Page <[email protected]> Forwarded: no -Index: maven-stapler-plugin/pom.xml -=================================================================== ---- maven-stapler-plugin.orig/pom.xml 2012-01-10 23:43:48.350334158 +0100 -+++ maven-stapler-plugin/pom.xml 2012-01-11 00:02:17.087732693 +0100 -@@ -75,7 +75,7 @@ +--- a/pom.xml ++++ b/pom.xml +@@ -87,7 +87,7 @@ <dependency> <groupId>org.kohsuke.stapler</groupId> <artifactId>stapler</artifactId> @@ -16,10 +14,8 @@ Index: maven-stapler-plugin/pom.xml </dependency> <dependency> <groupId>org.apache.maven</groupId> -Index: maven-stapler-plugin/src/main/java/org/kohsuke/stapler/ConstructorProcessor6.java -=================================================================== ---- maven-stapler-plugin.orig/src/main/java/org/kohsuke/stapler/ConstructorProcessor6.java 2012-01-10 13:03:07.575215255 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- a/src/main/java/org/kohsuke/stapler/ConstructorProcessor6.java ++++ /dev/null @@ -1,70 +0,0 @@ -package org.kohsuke.stapler; - @@ -91,10 +87,8 @@ Index: maven-stapler-plugin/src/main/java/org/kohsuke/stapler/ConstructorProcess - } - } -} -Index: maven-stapler-plugin/src/main/java/org/kohsuke/stapler/ExportedBeanAnnotationProcessor6.java -=================================================================== ---- maven-stapler-plugin.orig/src/main/java/org/kohsuke/stapler/ExportedBeanAnnotationProcessor6.java 2012-01-10 13:03:07.575215255 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- a/src/main/java/org/kohsuke/stapler/ExportedBeanAnnotationProcessor6.java ++++ /dev/null @@ -1,143 +0,0 @@ -package org.kohsuke.stapler; - @@ -239,10 +233,8 @@ Index: maven-stapler-plugin/src/main/java/org/kohsuke/stapler/ExportedBeanAnnota - - private static final String STAPLER_BEAN_FILE = "META-INF/exposed.stapler-beans"; -} -Index: maven-stapler-plugin/src/main/java/org/kohsuke/stapler/QueryParameterAnnotationProcessor6.java -=================================================================== ---- maven-stapler-plugin.orig/src/main/java/org/kohsuke/stapler/QueryParameterAnnotationProcessor6.java 2012-01-10 13:03:07.575215255 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- a/src/main/java/org/kohsuke/stapler/QueryParameterAnnotationProcessor6.java ++++ /dev/null @@ -1,69 +0,0 @@ -package org.kohsuke.stapler; - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-stapler-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
