This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jetty9.
commit 2dd668921b88d170d850c4b5dffb3b5ee09204c9 Author: Emmanuel Bourg <[email protected]> Date: Fri Sep 12 00:49:58 2014 +0200 Better solution to fix the wrong versions in the poms --- debian/changelog | 3 +-- debian/maven.rules | 4 ++++ debian/rules | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3bb21c3..b2119b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,7 @@ jetty8 (8.1.16-1) unstable; urgency=medium * Added authbind support to run Jetty on privileged ports * Updated the init.d script to detect the recent JDKs and ignore the old ones (Closes: #756310) - * Don't apply the Maven rules twice on the poms. This fixes an issue in the - jetty-project pom which was linking to the Servlet API 2.5 instead of 3.0. + * Fixed the version of the Servlet API in the poms (3.0 instead of 'debian') * debian/control: - Removed java5-runtime-headless from the acceptable runtime dependencies (Jetty 8 requires Java 6) diff --git a/debian/maven.rules b/debian/maven.rules index ba1bfd3..c1d1686 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,6 +1,10 @@ +asm asm * 3.x * * asm asm-commons * 3.x * * javax.servlet jstl jar s/.*/1.1/ * * javax.servlet.jsp jsp-api jar s/.*/2.2/ * * +javax.servlet servlet-api jar s/.*/3.0/ * * +javax.el el-api jar s/.*/2.2/ * * + junit junit * s/4\..*/4.x/ * * org.apache.felix maven-bundle-plugin * s/.*/2.3.5/ * * s/org.eclipse.jetty.orbit/asm/ s/org.objectweb.asm/asm/ jar s/.*/3.x/ * * diff --git a/debian/rules b/debian/rules index 024835f..73e970b 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,7 @@ LIBJETTY_EXTRA_JARS := ajp annotations client jndi monitor plus export LC_ALL=C.UTF-8 install/libjetty8-java:: - mh_installpoms -plibjetty8-java --no-rules + mh_installpoms -plibjetty8-java version=$(shell grep 'debian.originalVersion' pom.xml | head -1 | sed -e 's/.*<debian.originalVersion>\(.*\)<\/debian.originalVersion>.*/\1/'); \ for lib in $(LIBJETTY_JARS); do \ mh_installjar -plibjetty8-java --java-lib --usj-name=jetty8-$$lib \ @@ -38,7 +38,7 @@ install/libjetty8-java:: dh_link -plibjetty8-java usr/share/java/jetty8-start-$$version.jar usr/share/jetty8/start.jar install/libjetty8-extra-java:: - mh_installpoms -plibjetty8-extra-java --no-rules + mh_installpoms -plibjetty8-extra-java version=$(shell grep 'debian.originalVersion' pom.xml | head -1 | sed -e 's/.*<debian.originalVersion>\(.*\)<\/debian.originalVersion>.*/\1/'); \ for lib in $(LIBJETTY_EXTRA_JARS); do \ mh_installjar -plibjetty8-extra-java --java-lib --usj-name=jetty8-$$lib \ -- 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
