This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mojarra.
commit 9bcd996d15e1c619eab808b96b5663f742cdc9bb Author: Emmanuel Bourg <[email protected]> Date: Fri May 13 14:30:29 2016 +0200 Transition to the Servlet API 3.1 --- debian/changelog | 1 + debian/control | 4 ++-- debian/maven.rules | 6 +++--- debian/patches/02_add_maven_metadata.patch | 6 +++--- debian/rules | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index ba1ecd2..aa4322b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mojarra (2.2.8-3) UNRELEASED; urgency=medium * Team upload. * Removed the unused build dependencies + * Transition to the Servlet API 3.1 * Standards-Version updated to 3.9.8 (no changes) * Use secure Vcs-* URLs diff --git a/debian/control b/debian/control index 9a421f9..44d3f36 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends-Indep: glassfish-javaee, libcdi-api-java, libgeronimo-validation-1.0-spec-java, - libservlet3.0-java, + libservlet3.1-java, yui-compressor Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-java/mojarra.git @@ -29,7 +29,7 @@ Homepage: https://javaserverfaces.java.net/ Package: libjsf-api-java Architecture: all Depends: - libservlet3.0-java, + libservlet3.1-java, ${misc:Depends} Suggests: glassfish-javaee, diff --git a/debian/maven.rules b/debian/maven.rules index 5bce9bf..ba6675e 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,4 +1,4 @@ -javax.servlet servlet-api jar s/.*/3.0/ * * -javax.servlet.jsp jsp-api jar s/.*/2.2/ * * -javax.el el-api jar s/.*/2.2/ * * +javax.servlet javax.servlet-api jar s/.*/3.1/ * * +javax.servlet.jsp javax.servlet.jsp-api jar s/.*/3.0/ * * +javax.el javax.el-api jar s/.*/3.0/ * * s/javax\.validation/org.apache.geronimo.specs/ s/validation-api/geronimo-validation_1.0_spec/ jar s/.*/debian/ * * diff --git a/debian/patches/02_add_maven_metadata.patch b/debian/patches/02_add_maven_metadata.patch index d4748f6..682e768 100644 --- a/debian/patches/02_add_maven_metadata.patch +++ b/debian/patches/02_add_maven_metadata.patch @@ -240,19 +240,19 @@ Last-Update: 2014-09-30 + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> -+ <version>3.0.1</version> ++ <version>3.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>javax.servlet.jsp-api</artifactId> -+ <version>2.2.1</version> ++ <version>3.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>javax.el-api</artifactId> -+ <version>2.2.1</version> ++ <version>3.0</version> + <scope>provided</scope> + </dependency> + <dependency> diff --git a/debian/rules b/debian/rules index a80ccc3..d3b8637 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ include /usr/share/dpkg/default.mk export JAVA_HOME=/usr/lib/jvm/default-java -export CLASSPATH=/usr/share/java/servlet-api-3.0.jar:/usr/share/java/el-api-2.2.jar:/usr/share/java/jsp-api-2.2.jar:/usr/share/java/glassfish-javaee.jar:/usr/share/java/cdi-api.jar:/usr/share/java/atinject-jsr330-api.jar:/usr/share/java/geronimo-validation.jar +export CLASSPATH=/usr/share/java/servlet-api-3.1.jar:/usr/share/java/el-api-3.0.jar:/usr/share/java/jsp-api-3.1.jar:/usr/share/java/glassfish-javaee.jar:/usr/share/java/cdi-api.jar:/usr/share/java/atinject-jsr330-api.jar:/usr/share/java/geronimo-validation.jar %: dh $@ --with javahelper -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mojarra.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
