This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository resteasy.
commit 2c2aea13ceb8cbcbf49268f6f13c8634a0491dac Author: Emmanuel Bourg <[email protected]> Date: Sun Jul 17 23:40:54 2016 +0200 Replaced revert-to-jsr250-api.diff with a Maven rule --- debian/changelog | 4 ++- debian/maven.rules | 2 +- debian/patches/revert-to-jsr250-api.diff | 53 -------------------------------- debian/patches/series | 1 - 4 files changed, 4 insertions(+), 56 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4d1716a..1d34f12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -resteasy (3.0.12-2) UNRELEASED; urgency=medium +resteasy (3.0.18-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Replaced revert-to-jsr250-api.diff with a Maven rule * Updated debian/watch to track the releases >= 3.0.18 -- Emmanuel Bourg <[email protected]> Sun, 17 Jul 2016 23:16:22 +0200 diff --git a/debian/maven.rules b/debian/maven.rules index 984de12..1458b10 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -9,6 +9,6 @@ org.yaml snakeyaml * s/.*/1.x/ * * com.sun.istack istack-commons-runtime * s/debian/2.17/ * * s/jboss/javassist/ javassist * s/.*/debian/ * * log4j log4j * s/1\.2\..*/1.2.x/ * * -s/javax.annotation/org.apache.tomcat/ s/jsr250-api/tomcat-annotations-api/ * s/.*/8.x/ * * +s/org.jboss.spec.javax.annotation/org.apache.tomcat/ s/jboss-annotations-api_1.2_spec/tomcat-annotations-api/ * s/.*/8.x/ * * s/org.jboss.spec.javax.servlet/javax.servlet/ s/jboss-servlet-api_3.1_spec/javax.servlet-api/ * s/.*/3.1/ * * s/org.jboss.spec.javax.el/javax.el/ s/jboss-el-api_3.0_spec/javax.el-api/ * s/.*/3.0/ * * diff --git a/debian/patches/revert-to-jsr250-api.diff b/debian/patches/revert-to-jsr250-api.diff deleted file mode 100644 index 303ba6c..0000000 --- a/debian/patches/revert-to-jsr250-api.diff +++ /dev/null @@ -1,53 +0,0 @@ -commit e3c386bd9c42b5c5005a988261f1cc8b3e61e5ce -Author: Timo Aaltonen <[email protected]> -Date: Fri Oct 17 17:58:52 2014 +0300 - - Revert "using jboss-annotations-api_1.1_spec instead of jsr250-api" - - This reverts commit 24194c6f9f7ac9d358e80cad8d363ebad59d2080. - ---- a/jaxrs/pom.xml -+++ b/jaxrs/pom.xml -@@ -218,9 +218,9 @@ - </dependency> - - <dependency> -- <groupId>org.jboss.spec.javax.annotation</groupId> -- <artifactId>jboss-annotations-api_1.1_spec</artifactId> -- <version>1.0.1.Final</version> -+ <groupId>javax.annotation</groupId> -+ <artifactId>jsr250-api</artifactId> -+ <version>1.0</version> - </dependency> - - <dependency> ---- a/jaxrs/resteasy-jaxrs/pom.xml -+++ b/jaxrs/resteasy-jaxrs/pom.xml -@@ -61,9 +61,9 @@ - detected runtime? - --> - <dependency> -- <groupId>org.jboss.spec.javax.annotation</groupId> -- <artifactId>jboss-annotations-api_1.1_spec</artifactId> -- </dependency> -+ <groupId>javax.annotation</groupId> -+ <artifactId>jsr250-api</artifactId> -+ </dependency> - - <!-- javax.activation.DataSource provider is required by spec --> - <dependency> ---- a/jaxrs/resteasy-spring/pom.xml -+++ b/jaxrs/resteasy-spring/pom.xml -@@ -116,9 +116,9 @@ - detected runtime? - --> - <dependency> -- <groupId>org.jboss.spec.javax.annotation</groupId> -- <artifactId>jboss-annotations-api_1.1_spec</artifactId> -- </dependency> -+ <groupId>javax.annotation</groupId> -+ <artifactId>jsr250-api</artifactId> -+ </dependency> - - <!-- javax.activation.DataSource provider is required by spec --> - <dependency> diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 194197c..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -revert-to-jsr250-api.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/resteasy.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
