This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jersey1.
commit e6f09c23fbb0884567a903867514607cac5b5785 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 3 00:19:24 2015 +0200 Added the libjersey1-servlet-java package with the jersey-servlet module --- debian/changelog | 6 +++++ debian/control | 14 ++++++++++ debian/libjersey1-core-java.poms | 2 +- debian/maven.ignoreRules | 1 - debian/maven.rules | 6 +++++ .../patches/03-add-enterprise-dependencies.patch | 30 ++++++++++++++++++++++ debian/patches/series | 1 + 7 files changed, 58 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index aef6a68..727daeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +jersey1 (1.19-2) UNRELEASED; urgency=medium + + * Added the libjersey1-servlet-java package with the jersey-servlet module. + + -- Emmanuel Bourg <[email protected]> Thu, 02 Jul 2015 23:58:00 +0200 + jersey1 (1.19-1) unstable; urgency=medium * Initial release (Closes: #790030) diff --git a/debian/control b/debian/control index e529a4d..80988d0 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,9 @@ Build-Depends: cdbs, debhelper (>= 9), default-jdk, libbuild-helper-maven-plugin-java, + libcdi-api-java, + libgeronimo-ejb-3.2-spec-java, + libgeronimo-interceptor-3.0-spec-java (>= 1.0.1-2~), libfastinfoset-java, libistack-commons-java, libjackson-json-java, @@ -58,6 +61,17 @@ Description: RESTful Web Services in Java (server module) . This package contains the jersey-server module. +Package: libjersey1-servlet-java +Architecture: all +Depends: ${misc:Depends}, libjersey1-server-java (= ${source:Version}) +Description: RESTful Web Services in Java (servlet module) + Jersey RESTful Web Services framework is the open source, production quality, + framework for developing RESTful Web Services in Java that provides support + for JAX-RS APIs and serves as a JAX-RS (JSR 311 & JSR 339) Reference + Implementation. + . + This package contains the jersey-servlet module. + Package: libjersey1-json-java Architecture: all Depends: ${misc:Depends}, libjersey1-core-java (= ${source:Version}), libjettison-java, libjackson-json-java, libjaxb-java diff --git a/debian/libjersey1-core-java.poms b/debian/libjersey1-core-java.poms index 526b66b..2457c51 100644 --- a/debian/libjersey1-core-java.poms +++ b/debian/libjersey1-core-java.poms @@ -46,7 +46,7 @@ jersey-grizzly2-servlet/pom.xml --ignore jersey-json/pom.xml --has-package-version --package=libjersey1-json-java --java-lib --usj-name=jersey1-json jersey-server-linking/pom.xml --ignore jersey-server/pom.xml --has-package-version --package=libjersey1-server-java --java-lib --usj-name=jersey1-server -jersey-servlet/pom.xml --ignore +jersey-servlet/pom.xml --has-package-version --package=libjersey1-servlet-java --java-lib --usj-name=jersey1-servlet --keep-elements=profiles jersey-test-framework/pom.xml --ignore jersey-tests/pom.xml --ignore samples/pom.xml --ignore diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index ec7180f..f09d0e2 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -9,7 +9,6 @@ com.sun.jersey jersey-grizzly2-servlet jar * * * com.sun.jersey jersey-grizzly2 jar * * * com.sun.jersey jersey-grizzly jar * * * com.sun.jersey jersey-server-linking jar * * * -com.sun.jersey jersey-servlet jar * * * com.sun.jersey jersey-test-framework pom * * * com.sun.jersey jersey-tests pom * * * com.sun.jersey.archetypes jersey-archetypes pom * * * diff --git a/debian/maven.rules b/debian/maven.rules index 33cb3fd..90f4a32 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -9,3 +9,9 @@ s/jdom/org.jdom/ jdom * s/.*/debian/ * * junit junit * s/.*/4.x/ * * s/org.apache.felix/org.osgi/ org.osgi.core * * * * org.osgi s/osgi_R4_core/org.osgi.core/ * s/.*/debian/ * * +s/org.glassfish/org.apache.geronimo.specs/ s/javax.ejb/geronimo-ejb_3.2_spec/ * s/.*/debian/ * * +s/javax.interceptor/org.apache.geronimo.specs/ s/javax.interceptor-api/geronimo-interceptor_3.0_spec/ * s/.*/debian/ * * +s/ant/org.apache.ant/ ant * s/.*/debian/ * * +javax.servlet javax.servlet-api * s/.*/3.1/ * * +s/javax.servlet/javax.servlet.jsp/ s/jsp-api/javax.servlet.jsp-api/ * s/.*/2.3/ * * +s/javax.annotation/org.apache.tomcat/ s/jsr250-api/tomcat-annotations-api/ * s/.*/8.x/ * * diff --git a/debian/patches/03-add-enterprise-dependencies.patch b/debian/patches/03-add-enterprise-dependencies.patch new file mode 100644 index 0000000..56a3699 --- /dev/null +++ b/debian/patches/03-add-enterprise-dependencies.patch @@ -0,0 +1,30 @@ +Description: Replace the Weld dependency with the required JEE APIs +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/jersey-servlet/pom.xml ++++ b/jersey-servlet/pom.xml +@@ -72,9 +72,21 @@ + <scope>provided</scope> + </dependency> + <dependency> +- <groupId>org.jboss.weld</groupId> +- <artifactId>weld-osgi-bundle</artifactId> +- <version>1.1.4.Final</version> ++ <groupId>javax.enterprise</groupId> ++ <artifactId>cdi-api</artifactId> ++ <version>1.0</version> ++ <scope>provided</scope> ++ </dependency> ++ <dependency> ++ <groupId>javax.annotation</groupId> ++ <artifactId>jsr250-api</artifactId> ++ <version>1.0</version> ++ <scope>provided</scope> ++ </dependency> ++ <dependency> ++ <groupId>javax.interceptor</groupId> ++ <artifactId>javax.interceptor-api</artifactId> ++ <version>1.1</version> + <scope>provided</scope> + </dependency> + <dependency> diff --git a/debian/patches/series b/debian/patches/series index f6aaf65..128eef4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 01-maven-istack-commons-plugin.patch 02-disable-moxy-support.patch +03-add-enterprise-dependencies.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jersey1.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
