[resteasy] 03/06: revert-to-jsr250-api.diff: Revert a commit to fix build.

[Timo Aaltonen]

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

tjaalton pushed a commit to branch master
in repository resteasy.

commit 47dfa3ef274cafd28e5cd10e1b10c23e8c1064d5
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Oct 17 18:18:34 2014 +0300

    revert-to-jsr250-api.diff: Revert a commit to fix build.
---
 debian/changelog                         |  1 +
 debian/patches/revert-to-jsr250-api.diff | 59 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 61 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 624cb6f..e308276 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 resteasy (3.0.6-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * revert-to-jsr250-api.diff: Revert a commit to fix build.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Fri, 17 Oct 2014 18:00:20 +0300
 
diff --git a/debian/patches/revert-to-jsr250-api.diff b/debian/patches/revert-to-jsr250-api.diff
new file mode 100644
index 0000000..fe02f58
--- /dev/null
+++ b/debian/patches/revert-to-jsr250-api.diff
@@ -0,0 +1,59 @@
+commit e3c386bd9c42b5c5005a988261f1cc8b3e61e5ce
+Author: Timo Aaltonen <tjaalton at debian.org>
+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.
+
+diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
+index 1ecc417..53aa0d2 100755
+--- a/jaxrs/pom.xml
++++ b/jaxrs/pom.xml
+@@ -160,9 +160,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>
+diff --git a/jaxrs/resteasy-jaxrs/pom.xml b/jaxrs/resteasy-jaxrs/pom.xml
+index 216b8fc..544a4f5 100755
+--- a/jaxrs/resteasy-jaxrs/pom.xml
++++ b/jaxrs/resteasy-jaxrs/pom.xml
+@@ -60,9 +60,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/jaxrs/resteasy-spring/pom.xml b/jaxrs/resteasy-spring/pom.xml
+index b433b60..a47f90c 100755
+--- a/jaxrs/resteasy-spring/pom.xml
++++ b/jaxrs/resteasy-spring/pom.xml
+@@ -117,9 +117,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
new file mode 100644
index 0000000..194197c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+revert-to-jsr250-api.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/resteasy.git