[resteasy] 03/10: No longer build the removed jaxrs-api module and depend on libjaxrs-api-java instead

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository resteasy.

commit e2d11236ac236e95a3cdec0d929511a825cfe17a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Jul 17 23:48:39 2016 +0200

    No longer build the removed jaxrs-api module and depend on libjaxrs-api-java instead
---
 debian/changelog             | 2 ++
 debian/control               | 1 +
 debian/libresteasy-java.poms | 1 -
 debian/maven.rules           | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1d34f12..76bba5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ resteasy (3.0.18-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Replaced revert-to-jsr250-api.diff with a Maven rule
+    - No longer build the removed jaxrs-api module and depend
+      on libjaxrs-api-java instead
   * Updated debian/watch to track the releases >= 3.0.18
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 17 Jul 2016 23:16:22 +0200
diff --git a/debian/control b/debian/control
index fc6a7ec..a6bc45a 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends-Indep:
  libhttpclient-java,
  libjackson-json-java,
  libjaxb-java,
+ libjaxrs-api-java,
  libjettison-java,
  liblog4j1.2-java (>= 1.2.17),
  libmaven-install-plugin-java,
diff --git a/debian/libresteasy-java.poms b/debian/libresteasy-java.poms
index cd32a8f..a752ecd 100644
--- a/debian/libresteasy-java.poms
+++ b/debian/libresteasy-java.poms
@@ -30,7 +30,6 @@ jaxrs/pom.xml --has-package-version
 jaxrs/async-http-servlet-3.0/pom.xml --ignore
 jaxrs/eagledns/pom.xml --ignore
 jaxrs/examples/pom.xml --ignore
-jaxrs/jaxrs-api/pom.xml --has-package-version
 jaxrs/jboss-modules/pom.xml --ignore
 jaxrs/profiling-tests/pom.xml --ignore
 jaxrs/providers/pom.xml --has-package-version
diff --git a/debian/maven.rules b/debian/maven.rules
index 1458b10..f867e25 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -12,3 +12,4 @@ log4j log4j * s/1\.2\..*/1.2.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/ * *
+s/org.jboss.spec.javax.ws.rs/javax.ws.rs/ s/jboss-jaxrs-api_2.0_spec/javax.ws.rs-api/ * s/.*/debian/ * *

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