This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository uima-as.
commit f6c02e5e02b3aa9a030c9b51c91f5cd765b270d6 Author: Emmanuel Bourg <[email protected]> Date: Tue Dec 15 11:56:01 2015 +0100 Depend on the Servlet API 3.1 (Closes: #801022) --- debian/changelog | 1 + debian/control | 2 +- debian/maven.rules | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0b4f805..f9de245 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ uima-as (2.3.1-4) UNRELEASED; urgency=medium * Team upload. * Ignore apache-rat-plugin to fix a build failure with Maven 3 + * Depend on the Servlet API 3.1 (Closes: #801022) * Updated debian/watch * Standards-Version updated to 3.9.6 (no changes) * Switch to debhelper level 9 diff --git a/debian/control b/debian/control index 1982a0e..60aacd3 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Build-Depends-Indep: ant, libmaven-dependency-plugin-java, libmaven-install-plugin-java, libmaven-javadoc-plugin-java, - libservlet2.5-java, + libservlet3.1-java, libspring-beans-java, libspring-context-java, libspring-core-java, diff --git a/debian/maven.rules b/debian/maven.rules index 8511b08..798b7f6 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -25,7 +25,7 @@ org.apache.activemq s/activemq-all/activemq-core/ jar s/.*/debian/ * * commons-httpclient commons-httpclient jar s/.*/3.x/ * * log4j log4j jar s/.*/1.2.x/ * * commons-collections commons-collections jar s/.*/3.x/ * * -s/org.apache.geronimo.specs/javax.servlet/ s/geronimo-servlet_2.5_spec/servlet-api/ jar s/.*/2.5/ * * +s/org.apache.geronimo.specs/javax.servlet/ s/geronimo-servlet_2.5_spec/javax.servlet-api/ jar s/.*/3.1/ * * s/org.apache.geronimo.specs/javax.jms/ s/geronimo-jms_1.1_spec/jms/ jar s/.*/debian/ * * s/org.apache.geronimo.specs/javax/ s/geronimo-j2ee-management_1.1_spec/javaee-api/ jar s/.*/debian/ * * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/uima-as.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
