This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jetty9.
commit 70a448d866b8e3e237b6d7be08a4aa72d975ea37 Author: Jakub Adam <[email protected]> Date: Fri Apr 5 08:46:13 2013 +0200 Add test-jetty-servlet jar into libjetty8-extra-java --- debian/changelog | 6 ++++++ debian/libjetty8-extra-java.poms | 1 + debian/patches/disable-modules.patch | 12 ++++++------ debian/rules | 7 ++++++- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1c76111..dcbc95a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +jetty8 (8.1.3-5) UNRELEASED; urgency=low + + * Add test-jetty-servlet jar into libjetty8-extra-java. + + -- Jakub Adam <[email protected]> Fri, 05 Apr 2013 09:38:08 +0200 + jetty8 (8.1.3-4) unstable; urgency=low * Team upload diff --git a/debian/libjetty8-extra-java.poms b/debian/libjetty8-extra-java.poms index 95e4f20..9abae3a 100644 --- a/debian/libjetty8-extra-java.poms +++ b/debian/libjetty8-extra-java.poms @@ -4,3 +4,4 @@ jetty-client/pom.xml --java-lib --usj-name=jetty8-client jetty-jndi/pom.xml --java-lib --usj-name=jetty8-jndi jetty-monitor/pom.xml --java-lib --usj-name=jetty8-monitor jetty-plus/pom.xml --java-lib --usj-name=jetty8-plus +test-jetty-servlet/pom.xml --java-lib --usj-name=jetty8-test-servlet diff --git a/debian/patches/disable-modules.patch b/debian/patches/disable-modules.patch index 6420101..764f7dd 100644 --- a/debian/patches/disable-modules.patch +++ b/debian/patches/disable-modules.patch @@ -4,13 +4,13 @@ Subject: disable-modules --- pom.xml | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) + 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml -index 86d79e5..9933028 100644 +index bb07f25..8c37297 100644 --- a/pom.xml +++ b/pom.xml -@@ -378,19 +378,19 @@ +@@ -379,19 +379,19 @@ <module>jetty-start</module> <module>jetty-nested</module> <module>jetty-overlay-deployer</module> @@ -25,9 +25,9 @@ index 86d79e5..9933028 100644 + <!--module>jetty-distribution</module> + <module>test-continuation</module--> <!--module>test-continuation-jetty6</module--> -- <module>test-jetty-servlet</module> -+ <!--module>test-jetty-servlet</module> - <module>test-jetty-webapp</module> + <module>test-jetty-servlet</module> +- <module>test-jetty-webapp</module> ++ <!--module>test-jetty-webapp</module> <module>test-jetty-nested</module> <module>example-jetty-embedded</module> <module>example-async-rest</module> diff --git a/debian/rules b/debian/rules index ec2b4a8..6407a12 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,12 @@ install/libjetty8-extra-java:: libjetty8-extra-java-mh-install jar8=jetty8-$$lib-$$version.jar; \ dh_link -plibjetty8-extra-java usr/share/java/$$jar8 usr/share/jetty8/lib/$$jar; \ done; \ - dh_link -plibjetty8-extra-java usr/share/java/jetty8-monitor-$$version.jar usr/share/jetty8/lib/monitor/jetty-monitor.jar + dh_link -plibjetty8-extra-java usr/share/java/jetty8-monitor-$$version.jar usr/share/jetty8/lib/monitor/jetty-monitor.jar; \ + # Add also test-jetty-servlet \ + mh_installjar -plibjetty8-extra-java --java-lib --usj-name=jetty8-test-servlet \ + test-jetty-servlet/pom.xml test-jetty-servlet/target/test-jetty-servlet-*.jar; \ + dh_link -plibjetty8-extra-java usr/share/java/jetty8-test-servlet-$$version.jar \ + usr/share/jetty8/lib/test-jetty-servlet-$$version.jar; install/libjetty8-java-doc:: mv target/site/apidocs target/site/api -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
