[libspring-java] 05/08: Updated the dependencies
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sat Apr 2 22:47:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libspring-java.
commit 9bed4cb377cbdedd7e96afcc5e74a8bc6d821f2b
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sun Apr 3 00:35:06 2016 +0200
Updated the dependencies
---
debian/changelog | 1 +
debian/control | 21 +++++++++++++--------
debian/maven.ignoreRules | 4 ++--
debian/maven.rules | 27 ++++++++++++++++-----------
4 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8168422..18bace2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libspring-java (4.0.9-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
+ - Updated the dependencies
- Refreshed the patches
- Removed 0007_remove_backport_util_concurrent.patch (fixed upstream)
- Removed 0010_velocity_17.diff (fixed upstream)
diff --git a/debian/control b/debian/control
index c18a224..f37e617 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ Build-Depends-Indep: bsh,
libcommons-beanutils-java,
libcommons-collections3-java,
libcommons-fileupload-java,
- libcommons-httpclient-java,
libcommons-logging-java,
libcommons-pool-java,
libderbyclient-java,
@@ -34,44 +33,50 @@ Build-Depends-Indep: bsh,
libehcache-java,
libfreemarker-java,
libgeronimo-commonj-spec-java (>= 1.1.1-3),
+ libgeronimo-concurrent-1.0-spec-java,
libgeronimo-ejb-3.0-spec-java,
libgeronimo-interceptor-3.0-spec-java,
libgeronimo-j2ee-connector-1.5-spec-java (>= 2.0.0-1.1),
libgeronimo-jms-1.1-spec-java,
- libgeronimo-jpa-2.0-spec-java,
+ libgeronimo-jta-1.2-spec-java,
libgeronimo-validation-1.0-spec-java,
libhessian-java,
- libhibernate-validator-java (>= 4.2),
+ libhibernate-validator-java (>= 4.3.2),
libhibernate3-java (>= 3.5),
libhsqldb-java,
+ libhttpasyncclient-java,
libibatis-java,
libitext-java (>= 2.1.7-9),
libjackson-json-java,
libjackson2-databind-java,
libjakarta-taglibs-standard-java,
libjamon-java,
- libjasperreports-java,
+ libjasperreports-java (>= 6.1.1+dfsg-4~),
libjavassist-java,
libjboss-vfs-java,
- libjdo-api-java (>= 2.2),
+ libjdo-api-java (>= 3.1),
libjetty8-java,
libjexcelapi-java,
libjibx1.2-java,
libjoda-time-java,
libjoptsimple-java,
+ libjpa-2.1-spec-java,
libjsf-api-java,
+ libjsonpath-java,
libjstl1.1-java,
libmail-java,
libopenjpa-java,
libportlet-api-2.0-spec-java,
- libquartz-java,
+ libquartz-java (>= 1.8),
librome-java,
- libservlet2.5-java,
+ libservlet3.0-java,
+ libservlet3.1-java,
libspring-build-java,
- libtiles-java,
+ libtiles-java (>= 2.2.2-7~),
libtomcat8-java,
libvelocity-tools-java (>= 2.0-3),
libxmlbeans-java,
+ libxmlunit-java,
libxstream-java,
maven-repo-helper (>= 1.1),
spring-build-scripts,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 30e2dc8..c86b10c 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -2,7 +2,7 @@ javax.activation activation * * * *
com.ibm.websphere uow * * * *
com.h2database h2 * * * *
javax.cache cache-api * * * *
-jfree jfreechart * * * *
-org.codehaus.castor castor * * * *
org.hibernate hibernate-annotations * * * *
org.springframework.build.gradle docbook-reference-plugin * * * *
+org.asciidoctor asciidoctor-gradle-plugin * * * *
+org.mvel mvel2 * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index ac1f29e..65fc82e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -2,29 +2,34 @@ org.springframework * * s/3\..*/3.x/
cglib cglib * s/.*/3.x/ * *
com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * *
-commons-httpclient commons-httpclient * * * *
+s/com.mchange/c3p0/ c3p0 * s/.*/debian/ * *
s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * *
-javax.el el-api * s/.*/2.2/ * *
-s/javax.faces/com.sun.faces/ jsf-api * s/.*/debian/ * *
-s/javax.mail/com.sun.mail/ s/mail/javax.mail/ * s/.*/debian/ * *
-javax.jdo s/jdo-api/jdo2-api/ * s/.*/debian/ * *
+javax.el javax.el-api * s/.*/3.0/ * *
+s/javax.enterprise.concurrent/org.apache.geronimo.specs/ s/javax.enterprise.concurrent-api/geronimo-concurrent_1.0_spec/ * s/.*/debian/ * *
+s/javax.faces/com.sun.faces/ s/javax.faces-api/jsf-api/ * s/.*/debian/ * *
+s/javax.jms/org.apache.geronimo.specs/ s/jms-api/geronimo-jms_1.1_spec/ * s/.*/debian/ * *
javax.portlet portlet-api * * * *
s/javax.resource/org.apache.geronimo.specs/ s/connector-api/geronimo-j2ee-connector_1.5_spec/ * s/.*/debian/ * *
-javax.servlet jstl * s/.*/1.1/ * *
-javax.servlet servlet-api * 2.5 * *
-javax.servlet s/javax.servlet-api/servlet-api/ * s/3.0.1/3.0/ * *
-javax.servlet.jsp jsp-api * * * *
+s/javax.servlet.jsp.jstl/javax.servlet/ s/javax.servlet.jsp.jstl-api/jstl/ * s/.*/1.1/ * *
+javax.servlet s/javax.servlet-api/servlet-api/ * s/3.0.*/3.0/ * *
+javax.servlet javax.servlet-api * s/3.1.*/3.1/ * *
+javax.servlet.jsp s/javax.servlet.jsp-api/jsp-api/ * s/2.2.*/2.2/ * * *
+javax.servlet.jsp javax.servlet.jsp-api * s/2.3.*/2.3/ * * *
+s/javax.transaction/org.apache.geronimo.specs/ s/javax.transaction-api/geronimo-jta_1.2_spec/ * s/.*/debian/ * *
s/javax.validation/org.apache.geronimo.specs/ s/validation-api/geronimo-validation_1.0_spec/ * s/.*/debian/ * *
-s/javax.xml/axis/ s/jaxrpc-api/axis-jaxrpc/ * s/.*/debian/ * *
-s/javax.xml.soap/axis/ s/saaj-api/axis-saaj/ * s/.*/debian/ * *
junit junit * s/.*/4.x/ * *
log4j log4j * s/.*/1.2.x/ * *
org.apache.tomcat s/catalina/tomcat-catalina/ * s/.*/8.x/ * *
+org.codehaus.castor s/castor/castor-xml/ * s/.*/debian/ * *
s/org.codehaus.fabric3.api/org.apache.geronimo.specs/ s/commonj/geronimo-commonj_1.1_spec/ * s/.*/debian/ * *
org.codehaus.groovy groovy-all * s/.*/2.x/ * *
+org.eclipse.persistence javax.persistence * s/.*/2.x/ * *
org.eclipse.persistence s/org.eclipse.persistence.*/eclipselink/ * s/.*/debian/ * *
org.jruby s/jruby/jruby-core/ jar s/.*/debian/ * *
org.ow2.asm asm* * s/.*/4.x/ * *
org.testng testng * s/.*/6.x/ * *
taglibs standard * * * *
s/velocity/org.apache.velocity/ velocity * s/.*/debian/ * *
+
+s/org.apache.taglibs/taglibs/ s/taglibs-standard-jstlel/standard/ * s/.*/debian/ * *
+org.apache.jdo parent-pom * * * *
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git
More information about the pkg-java-commits
mailing list