This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository resteasy.
commit e11ee04de5f6f046249dfbce36b9971077922626 Author: Emmanuel Bourg <[email protected]> Date: Mon Jul 18 00:03:59 2016 +0200 No longer build the unused tjws module (Closes: #830819) --- debian/changelog | 1 + debian/libresteasy-java.classpath | 1 - debian/libresteasy-java.poms | 2 +- debian/maven.ignoreRules | 1 + debian/patches/01-ignore-tjws.patch | 24 ++++++++++++++++++++++++ debian/patches/series | 1 + 6 files changed, 28 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ecfbb5..391242e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ resteasy (3.0.18-1) UNRELEASED; urgency=medium - Ignore the jboss-parent pom - Ignore the new resteasy-wadl module - Ignore the now enabled arquillian module + * No longer build the unused tjws module (Closes: #830819) * 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/libresteasy-java.classpath b/debian/libresteasy-java.classpath index 6632d12..2b826a7 100644 --- a/debian/libresteasy-java.classpath +++ b/debian/libresteasy-java.classpath @@ -1,4 +1,3 @@ -usr/share/java/tjws.jar /usr/share/java/servlet-api-2.5.jar usr/share/java/resteasy-jaxrs.jar /usr/share/java/servlet-api-2.5.jar /usr/share/java/log4j-1.2.jar /usr/share/java/slf4j-api.jar /usr/share/java/slf4j-simple.jar /usr/share/java/scannotation.jar /usr/share/java/httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/tomcat-annotations-api.jar /usr/share/java/el-api-2.1.jar usr/share/java/resteasy-jaxb-provider.jar /usr/share/java/jaxb-impl.jar /usr/share/java/servlet-api-2.5.jar usr/share/java/resteasy-jettison-provider.jar /usr/share/java/jettison.jar /usr/share/java/servlet-api-2.5.jar diff --git a/debian/libresteasy-java.poms b/debian/libresteasy-java.poms index 4b60bdf..3bc3635 100644 --- a/debian/libresteasy-java.poms +++ b/debian/libresteasy-java.poms @@ -64,5 +64,5 @@ jaxrs/resteasy-test-data/pom.xml --ignore jaxrs/resteasy-wadl/pom.xml --ignore jaxrs/security/pom.xml --ignore jaxrs/server-adapters/pom.xml --ignore -jaxrs/tjws/pom.xml --has-package-version +jaxrs/tjws/pom.xml --ignore jaxrs/war-tests/pom.xml --ignore diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 8f26b37..1a7a3e8 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -19,6 +19,7 @@ org.jboss.resteasy test-jackson-jaxb-coexistence jar * * * org.jboss.resteasy test-resteasy-html jar * * * org.jboss.resteasy testable-examples-pom pom * * * org.jboss.resteasy.test war-tests-pom pom * * * +org.jboss.resteasy tjws * * * * com.atlassian.maven.plugins maven-clover2-plugin * * * * javax.el javax.el-api * * * * net.jcip jcip-annotations * * * * diff --git a/debian/patches/01-ignore-tjws.patch b/debian/patches/01-ignore-tjws.patch new file mode 100644 index 0000000..4a262d0 --- /dev/null +++ b/debian/patches/01-ignore-tjws.patch @@ -0,0 +1,24 @@ +Description: Disables the TJWS module (deprecated upstream, limited to the Servlet API 2.5) +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/jaxrs/resteasy-jaxrs/pom.xml ++++ b/jaxrs/resteasy-jaxrs/pom.xml +@@ -142,6 +142,18 @@ + <artifactId>maven-clover2-plugin</artifactId> + <version>3.1.6</version> + </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-compiler-plugin</artifactId> ++ <configuration> ++ <excludes> ++ <exclude>**/tjws/*.java</exclude> ++ <exclude>**/TJWS*.java</exclude> ++ <exclude>**/test/BaseResourceTest.java</exclude> ++ <exclude>**/test/EmbeddedContainer.java</exclude> ++ </excludes> ++ </configuration> ++ </plugin> + </plugins> + </build> + <profiles> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..5b62eb9 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-ignore-tjws.patch -- 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
