[libspring-java] 18/19: Adapted the packaging to the new Gradle build
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Dec 3 15:39:46 UTC 2014
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 dff3c3aa283e9c3c0cb065baf69672c6bb4c8eec
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Dec 3 16:21:56 2014 +0100
Adapted the packaging to the new Gradle build
---
debian/ant.properties | 8 -
debian/build-classpath | 83 ----
debian/changelog | 12 +-
debian/control | 16 +-
debian/maven.rules | 35 +-
debian/patches/0020-disable-modules.patch | 86 ++++
debian/patches/0021-use-system-dependencies.patch | 480 +++++++++++++++++++++
.../0022-ignore-docbook-reference-plugin.patch | 52 +++
debian/patches/0023-disable-testng-reports.patch | 15 +
debian/patches/0024-gradle-1.5-compatibility.patch | 15 +
debian/patches/0025-compiler-dependencies.patch | 14 +
debian/patches/0026-derby-compatibility.patch | 21 +
debian/patches/0027-disable-jcache-support.patch | 30 ++
debian/patches/0028-disable-jdiff-report.patch | 14 +
debian/patches/series | 9 +
debian/poms/spring-aop.pom.xml | 69 +++
debian/poms/spring-aspects.pom.xml | 82 ++++
debian/poms/spring-beans.pom.xml | 53 +++
debian/poms/spring-context-support.pom.xml | 121 ++++++
debian/poms/spring-context.pom.xml | 142 ++++++
debian/poms/spring-core.pom.xml | 59 +++
debian/poms/spring-expression.pom.xml | 41 ++
debian/poms/spring-framework-bom.pom.xml | 128 ++++++
debian/poms/spring-instrument-tomcat.pom.xml | 42 ++
debian/poms/spring-instrument.pom.xml | 34 ++
debian/poms/spring-jdbc.pom.xml | 87 ++++
debian/poms/spring-jms.pom.xml | 103 +++++
debian/poms/spring-orm.pom.xml | 134 ++++++
debian/poms/spring-oxm.pom.xml | 96 +++++
debian/poms/spring-test.pom.xml | 149 +++++++
debian/poms/spring-tx.pom.xml | 82 ++++
debian/poms/spring-web.pom.xml | 194 +++++++++
debian/poms/spring-webmvc-portlet.pom.xml | 79 ++++
debian/poms/spring-webmvc.pom.xml | 195 +++++++++
debian/rules | 64 +--
35 files changed, 2695 insertions(+), 149 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index 1d6980d..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-disable.bundlor=true
-release.type=release
-
-# Ivy version resolution
-aspectj.version=debian
-org.junit.version=4.x
-slf4j.version=debian
-commons.pool.version=debian
diff --git a/debian/build-classpath b/debian/build-classpath
deleted file mode 100644
index ff39588..0000000
--- a/debian/build-classpath
+++ /dev/null
@@ -1,83 +0,0 @@
-# Ensure servlet 2.5 is used
-/usr/share/java/servlet-api-2.5.jar
-# Build system
-/usr/share/java/ivy.jar
-/usr/share/java/org.springframework.build.ant.jar
-/usr/share/java/ecj.jar
-
-# Global Classpath
-/usr/share/java/aopalliance.jar
-/usr/share/java/asm4-commons.jar
-/usr/share/java/asm4.jar
-/usr/share/java/aspectjrt.jar
-/usr/share/java/aspectjtools.jar
-/usr/share/java/aspectjweaver.jar
-/usr/share/java/atinject-jsr330-api.jar
-/usr/share/java/axis-jaxrpc.jar
-/usr/share/java/bsh.jar
-/usr/share/java/c3p0.jar
-/usr/share/java/castor-core.jar
-/usr/share/java/castor-xml.jar
-/usr/share/java/cglib3.jar
-/usr/share/java/commons-beanutils.jar
-/usr/share/java/commons-collections3.jar
-/usr/share/java/commons-fileupload.jar
-/usr/share/java/commons-httpclient.jar
-/usr/share/java/commons-logging.jar
-/usr/share/java/commons-pool.jar
-/usr/share/java/dom4j.jar
-/usr/share/java/eclipselink.jar
-/usr/share/java/ehcache.jar
-/usr/share/java/el-api-2.1.jar
-/usr/share/java/freemarker.jar
-/usr/share/java/geronimo-commonj_1.1_spec.jar
-/usr/share/java/geronimo-ejb-3.0-spec.jar
-/usr/share/java/geronimo-interceptor-3.0-spec.jar
-/usr/share/java/geronimo-j2ee-connector-1.5-spec.jar
-/usr/share/java/geronimo-jms-1.1-spec.jar
-/usr/share/java/geronimo-jpa-2.0-spec.jar
-/usr/share/java/geronimo-validation.jar
-/usr/share/java/glassfish-appserv-jstl.jar
-# Just for javax.servlet.jsp.jstl.*
-/usr/share/java/glassfish-javaee.jar
-/usr/share/java/glassfish-jta.jar
-/usr/share/java/glassfish-toplink-essentials.jar
-/usr/share/java/groovy.jar
-/usr/share/java/hessian.jar
-/usr/share/java/hibernate-annotations.jar
-/usr/share/java/hibernate-core.jar
-/usr/share/java/hibernate-entitymanager.jar
-#/usr/share/java/hibernate-validator.jar
-/usr/share/java/ibatis.jar
-/usr/share/java/itext.jar
-/usr/share/java/jackson-core-asl.jar
-/usr/share/java/jackson-mapper-asl.jar
-/usr/share/java/javax.mail.jar
-/usr/share/java/poi.jar
-/usr/share/java/jamon.jar
-/usr/share/java/jasperreports.jar
-/usr/share/java/jboss-vfs.jar
-/usr/share/java/jdo2-api.jar
-/usr/share/java/jibx-run-1.2.jar
-/usr/share/java/joda-time.jar
-/usr/share/java/jsf-api.jar
-/usr/share/java/jsp-api-2.1.jar
-/usr/share/java/junit4.jar
-/usr/share/java/jruby.jar
-/usr/share/java/jxl.jar
-/usr/share/java/openjpa.jar
-/usr/share/java/portlet-api.jar
-/usr/share/java/quartz.jar
-/usr/share/java/rome.jar
-/usr/share/java/testng.jar
-/usr/share/java/tiles-api.jar
-/usr/share/java/tiles-core.jar
-/usr/share/java/tiles-el.jar
-/usr/share/java/tiles-jsp.jar
-/usr/share/java/tiles-servlet.jar
-/usr/share/java/tomcat8-api.jar
-/usr/share/java/tomcat8-catalina.jar
-/usr/share/java/velocity.jar
-/usr/share/java/velocity-tools-view.jar
-/usr/share/java/xmlbeans.jar
-/usr/share/java/xstream.jar
diff --git a/debian/changelog b/debian/changelog
index 496c924..bf89bd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
libspring-java (3.2.12-1) UNRELEASED; urgency=medium
* Team upload.
- * New upstream release
+ * New upstream release (Closes: #732215)
+ - Fix CVE-2014-3578: Directory Traversal (Closes: #760733)
+ - Fix CVE-2014-3625: Directory Traversal (Closes: #769698)
- Removed the patches applied upstream
+ - New build dependencies on libjoptsimple-java, libderbyclient-java,
+ libhsqldb-java, libjetty8-java, libhibernate-validator-java,
+ gradle-propdeps-plugin, libjackson2-databind-java, libjstl1.1-java,
+ libjakarta-taglibs-standard-java
+ - Depend on libgeronimo-j2ee-connector-1.5-spec-java (>= 2.0.0-2)
+ - Depend on libgeronimo-commonj-spec-java (>= 1.1.1-3)
+ - Depend on libitext-java (>= 2.1.7-9)
+ - Depend on libvelocity-tools-java (>= 2.0-3)
* Use XZ compression for the upstream tarball
* Remove more jar files from the upstream tarball
* debian/rules: Changed the get-orig-source target to call uscan
diff --git a/debian/control b/debian/control
index 3aa9705..4c88cd1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,22 +3,24 @@ Section: java
Priority: extra
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Miguel Landaeta <nomadium at debian.org>
-Build-Depends: debhelper (>= 9), ant, default-jdk (>= 1:1.6)
+Build-Depends: debhelper (>= 9), gradle, default-jdk (>= 1:1.6)
Build-Depends-Indep: maven-repo-helper (>= 1.1), ivy, spring-build-scripts,
libaspectj-java, bsh, glassfish-javaee, libmail-java, glassfish-toplink-essentials,
groovy, junit4 (>= 4.5), libaopalliance-java, libasm4-java, libatinject-jsr330-api-java,
libaxis-java, libc3p0-java, libcastor-core-java, libcastor-xml-java,
libcglib3-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-fileupload-java,
libcommons-httpclient-java, libcommons-logging-java, libcommons-pool-java, libdom4j-java, libecj-java,
- libeclipselink-java, libehcache-java, libfreemarker-java, libgeronimo-commonj-spec-java,
- libgeronimo-ejb-3.0-spec-java, libgeronimo-interceptor-3.0-spec-java, libgeronimo-j2ee-connector-1.5-spec-java,
+ libeclipselink-java, libehcache-java, libfreemarker-java, libgeronimo-commonj-spec-java (>= 1.1.1-3),
+ 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-validation-1.0-spec-java, libhessian-java,
- libhibernate3-java (>= 3.5), libibatis-java, libitext-java, libjackson-json-java, libapache-poi-java,
+ libhibernate3-java (>= 3.5), libibatis-java, libitext-java (>= 2.1.7-9), libjackson-json-java, libapache-poi-java,
libjamon-java, libjasperreports-java, libjboss-vfs-java, libjdo-api-java (>= 2.2), libjexcelapi-java,
libjibx1.2-java, libjoda-time-java, libjsf-api-java, libopenjpa-java, libportlet-api-2.0-spec-java,
- libquartz-java, librome-java, libservlet2.5-java, libspring-build-java,
- libtiles-java, libtomcat8-java, libvelocity-tools-java, libxmlbeans-java, libxstream-java,
- testng, velocity, jruby
+ libquartz-java, librome-java, libservlet2.5-java, libspring-build-java, gradle-propdeps-plugin,
+ libtiles-java, libtomcat8-java, libvelocity-tools-java (>= 2.0-3), libxmlbeans-java, libxstream-java,
+ testng, velocity, jruby, libjoptsimple-java, libderbyclient-java, libhsqldb-java, libjetty8-java,
+ libhibernate-validator-java (>= 4.2), libjackson2-databind-java, libjakarta-taglibs-standard-java,
+ libjavassist-java, libjstl1.1-java
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-java/libspring-java.git
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libspring-java.git
diff --git a/debian/maven.rules b/debian/maven.rules
index c34a422..7835054 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,20 +1,17 @@
org.springframework * * s/3\..*/3.x/
-log4j log4j jar s/1\.2\..*/1.2.x/
-commons-collections commons-collections jar s/3\..*/3.x/
-s/velocity/org.apache.velocity/ velocity jar s/.*/debian/
-s/velocity-tools/org.apache.velocity/ velocity-tools jar s/.*/debian/
-s/asm/org.ow2.asm/ * jar s/.*/4.x/
-junit junit jar s/.*/4.x/
-commons-httpclient commons-httpclient jar s/.*/3.x/
-javax.servlet servlet-api jar s/.*/2.5/
-javax.el el-api jar s/.*/2.1/
-javax.portlet portlet-api jar s/.*/2.0/
-javax.servlet.jsp jsp-api jar s/.*/2.1/
-s/javax.servlet/jstl/ jstl jar s/.*/debian/
-s/javax.servlet/javax.servlet.jsp/ jsp-api jar s/.*/2.1/
-s/javax.validation/org.apache.geronimo.specs/ s/validation-api/geronimo-validation_1.0_spec/ jar s/.*/debian/
-s/jexcelapi/net.sourceforge.jexcelapi/ jxl jar s/.*/debian/
-s/hsqldb/org.hsqldb/ hsqldb jar s/.*/debian/
-s/jasperreports/net.sf.jasperreports/ jasperreports jar s/.*/debian/
-org.hibernate s/com.springsource.org.hibernate.validator/hibernate-validator/ jar s/.*/debian/
-cglib * * s/.*/3.x/ * *
+
+# Preserve the versions for the following artifacts
+# (they already point to the right debianized version in build.gradle)
+com.fasterxml.jackson.core jackson-databind * * * *
+commons-httpclient commons-httpclient * * * *
+javax.el el-api * * * *
+javax.portlet portlet-api * * * *
+javax.servlet jstl * * * *
+javax.servlet servlet-api * * * *
+javax.servlet.jsp jsp-api * * * *
+junit junit * * * *
+log4j log4j * * * *
+org.apache.tomcat tomcat-catalina * * * *
+org.codehaus.groovy groovy-all
+org.testng testng * * * *
+taglibs standard * * * *
diff --git a/debian/patches/0020-disable-modules.patch b/debian/patches/0020-disable-modules.patch
new file mode 100644
index 0000000..8dd105f
--- /dev/null
+++ b/debian/patches/0020-disable-modules.patch
@@ -0,0 +1,86 @@
+Description: Disable the modules we don't build yet.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/settings.gradle
++++ b/settings.gradle
+@@ -12,16 +12,16 @@
+ include "spring-jdbc"
+ include "spring-jms"
+ include "spring-orm"
+-include "spring-orm-hibernate4"
++//include "spring-orm-hibernate4"
+ include "spring-oxm"
+-include "spring-struts"
++//include "spring-struts"
+ include "spring-test"
+-include "spring-test-mvc"
++//include "spring-test-mvc"
+ include "spring-tx"
+ include "spring-web"
+ include "spring-webmvc"
+ include "spring-webmvc-portlet"
+-include "spring-webmvc-tiles3"
++//include "spring-webmvc-tiles3"
+ include "spring-framework-bom"
+
+ // Exposes gradle buildSrc for IDE support
+--- a/build.gradle
++++ b/build.gradle
+@@ -563,6 +563,7 @@
+ }
+ }
+
++/*
+ project("spring-orm-hibernate4") {
+ description = "Spring Object/Relational Mapping - Hibernate 4 support"
+ merge.into = project(":spring-orm")
+@@ -576,6 +577,7 @@
+ optional("javax.servlet:servlet-api:2.5")
+ }
+ }
++*/
+
+ project("spring-webmvc") {
+ description = "Spring Web MVC"
+@@ -636,6 +638,7 @@
+ sourceSets.main.resources.srcDirs += "src/main/java"
+ }
+
++/*
+ project("spring-webmvc-tiles3") {
+ description = "Spring Framework Tiles3 Integration"
+ merge.into = project(":spring-webmvc")
+@@ -667,6 +670,7 @@
+ testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
+ }
+ }
++*/
+
+ project("spring-webmvc-portlet") {
+ description = "Spring Web Portlet"
+@@ -738,6 +742,7 @@
+ }
+ }
+
++/*
+ project("spring-test-mvc") {
+ description = "Spring Test MVC Framework"
+ merge.into = project(":spring-test")
+@@ -768,7 +773,9 @@
+ testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
+ }
+ }
++*/
+
++/*
+ project("spring-struts") {
+ description = "Spring Struts"
+ dependencies {
+@@ -784,6 +791,7 @@
+ testCompile(project(":spring-test"))
+ }
+ }
++*/
+
+ project("spring-aspects") {
+ description = "Spring Aspects"
diff --git a/debian/patches/0021-use-system-dependencies.patch b/debian/patches/0021-use-system-dependencies.patch
new file mode 100644
index 0000000..c0db704
--- /dev/null
+++ b/debian/patches/0021-use-system-dependencies.patch
@@ -0,0 +1,480 @@
+Description: Adjust the dependencies to match the versions available in Debian.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,6 +1,7 @@
+ buildscript {
+ repositories {
+ maven { url "http://repo.springsource.org/plugins-release" }
++ maven { url "file://usr/share/maven-repo" }
+ }
+ dependencies {
+ classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
+@@ -18,10 +19,10 @@
+ group = "org.springframework"
+ version = qualifyVersionIfNecessary(version)
+
+- ext.aspectjVersion = "1.7.4"
+- ext.hsqldbVersion = "1.8.0.10"
+- ext.junitVersion = "4.11"
+- ext.slf4jVersion = "1.6.6"
++ ext.aspectjVersion = "debian"
++ ext.hsqldbVersion = "debian"
++ ext.junitVersion = "4.x"
++ ext.slf4jVersion = "debian"
+ ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
+
+ apply plugin: "propdeps"
+@@ -75,6 +76,7 @@
+
+ repositories {
+ maven { url "http://repo.spring.io/libs-release" }
++ maven { url "file://usr/share/maven-repo" }
+ }
+
+ dependencies {
+@@ -182,8 +184,8 @@
+ // avoids including two different copies of asm unnecessarily. If however future cglib
+ // versions drift from the version of asm used by Spring internally, this duplication
+ // will become necessary.
+- def asmVersion = "5.0.3"
+- def cglibVersion = "3.1"
++ def asmVersion = "4.x"
++ def cglibVersion = "3.x"
+
+ configurations {
+ jarjar
+@@ -236,15 +238,15 @@
+ asm("org.ow2.asm:asm:${asmVersion}@jar")
+ asm("org.ow2.asm:asm-commons:${asmVersion}@jar")
+ cglib("cglib:cglib:${cglibVersion}@jar")
+- jarjar("com.googlecode.jarjar:jarjar:1.3")
++ jarjar("com.googlecode.jarjar:jarjar:debian")
+
+ compile(files(cglibRepackJar))
+ compile(files(asmRepackJar))
+- compile("commons-logging:commons-logging:1.1.3")
++ compile("commons-logging:commons-logging:debian")
+ optional("org.aspectj:aspectjweaver:${aspectjVersion}")
+- optional("net.sf.jopt-simple:jopt-simple:3.3")
+- optional("log4j:log4j:1.2.17")
+- testCompile("xmlunit:xmlunit:1.3")
++ optional("net.sf.jopt-simple:jopt-simple:debian")
++ optional("log4j:log4j:1.2.x")
++ testCompile("xmlunit:xmlunit:debian")
+ testCompile("org.codehaus.woodstox:wstx-asl:3.2.7") {
+ exclude group: "stax", module: "stax-api"
+ }
+@@ -269,9 +271,9 @@
+ dependencies {
+ compile(project(":spring-core"))
+ compile(files(project(":spring-core").cglibRepackJar))
+- optional("javax.el:el-api:1.0")
++ optional("javax.el:el-api:2.2")
+ optional("javax.inject:javax.inject:1")
+- testCompile("log4j:log4j:1.2.17")
++ testCompile("log4j:log4j:1.2.x")
+ }
+ }
+
+@@ -284,8 +286,8 @@
+ compile(files(project(":spring-core").cglibRepackJar))
+ compile("aopalliance:aopalliance:1.0")
+ optional("org.aspectj:aspectjweaver:${aspectjVersion}")
+- optional("commons-pool:commons-pool:1.5.7")
+- optional("com.jamonapi:jamon:2.4")
++ optional("commons-pool:commons-pool:debian")
++ optional("com.jamonapi:jamon:debian")
+ }
+ }
+
+@@ -313,7 +315,7 @@
+ description = "Spring Instrument Tomcat"
+
+ dependencies {
+- provided("org.apache.tomcat:catalina:6.0.16")
++ provided("org.apache.tomcat:tomcat-catalina:8.x")
+ }
+ }
+
+@@ -331,16 +333,20 @@
+ optional("javax.ejb:ejb-api:3.0")
+ optional("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1")
+ //optional("backport-util-concurrent:backport-util-concurrent:3.0")
+- optional("javax.persistence:persistence-api:1.0")
+- optional("javax.validation:validation-api:1.0.0.GA")
+- optional("org.hibernate:hibernate-validator:4.3.1.Final")
+- optional("joda-time:joda-time:2.2")
++ optional("javax.persistence:persistence-api:debian")
++ optional("org.apache.geronimo.specs:geronimo-validation_1.0_spec:debian")
++ optional("org.hibernate:hibernate-validator:debian")
++ optional("joda-time:joda-time:debian")
+ optional("org.aspectj:aspectjweaver:${aspectjVersion}")
+- optional("org.codehaus.groovy:groovy-all:1.8.9")
+- optional("org.beanshell:bsh:2.0b4")
+- optional("org.jruby:jruby:1.7.12")
++ optional("org.codehaus.groovy:groovy-all:1.x")
++ optional("org.beanshell:bsh:debian")
++ optional("org.jruby:jruby:debian") {
++ exclude group: 'org.jruby.joni', module: 'joni'
++ exclude group: 'org.jruby.extras', module: 'jnr-netdb'
++ exclude group: 'org.jruby.extras', module: 'bytelist'
++ }
+ testCompile("javax.inject:javax.inject-tck:1")
+- testCompile("commons-dbcp:commons-dbcp:1.3")
++ testCompile("commons-dbcp:commons-dbcp:debian")
+ testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
+ }
+
+@@ -361,12 +367,12 @@
+ optional(project(":spring-aop"))
+ optional(project(":spring-context")) // for JCA, @EnableTransactionManagement
+ optional("aopalliance:aopalliance:1.0")
+- optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
+- optional("javax.resource:connector-api:1.5")
++ optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:debian")
++ optional("org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:debian")
+ optional("javax.ejb:ejb-api:3.0")
+ //optional("com.ibm.websphere:uow:6.0.2.17")
+ testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
+- testCompile("javax.persistence:persistence-api:1.0")
++ testCompile("javax.persistence:persistence-api:debian")
+ }
+
+ sourceSets {
+@@ -393,22 +399,22 @@
+ dependencies {
+ compile(project(":spring-beans"))
+ compile(project(":spring-core"))
+- optional("org.codehaus.castor:castor-xml:1.3.3") {
++ optional("org.codehaus.castor:castor-xml:debian") {
+ exclude group: 'stax', module: 'stax-api'
+ exclude group: "org.springframework", module: "spring-context"
+ }
+- optional("org.apache.xmlbeans:xmlbeans:2.6.0") {
++ optional("org.apache.xmlbeans:xmlbeans:debian") {
+ exclude group: 'stax', module: 'stax-api'
+ }
+- optional("com.thoughtworks.xstream:xstream:1.4.7") {
++ optional("com.thoughtworks.xstream:xstream:debian") {
+ exclude group: 'xpp3', module: 'xpp3_min'
+ exclude group: 'xmlpull', module: 'xmlpull'
+ }
+- optional("org.jibx:jibx-run:1.2.5")
++ optional("org.jibx:jibx-run:debian")
+ testCompile(project(":spring-context"))
+- testCompile("xmlunit:xmlunit:1.3")
+- testCompile("xmlpull:xmlpull:1.1.3.4a")
+- testCompile("org.codehaus.jettison:jettison:1.0.1") {
++ testCompile("xmlunit:xmlunit:debian")
++ testCompile("xmlpull:xmlpull:debian")
++ testCompile("org.codehaus.jettison:jettison:debian") {
+ exclude group: 'stax', module: 'stax-api'
+ }
+ testCompile(files(genCastor.classesDir).builtBy(genCastor))
+@@ -429,10 +435,10 @@
+ provided("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1")
+ optional(project(":spring-oxm"))
+ optional("aopalliance:aopalliance:1.0")
+- optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
+- optional("javax.resource:connector-api:1.5")
+- optional("org.codehaus.jackson:jackson-mapper-asl:1.7.9")
+- optional("com.fasterxml.jackson.core:jackson-databind:2.0.6")
++ optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:debian")
++ optional("org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:debian")
++ optional("org.codehaus.jackson:jackson-mapper-asl:debian")
++ optional("com.fasterxml.jackson.core:jackson-databind:2.x")
+ }
+ }
+
+@@ -444,12 +450,12 @@
+ compile(project(":spring-core"))
+ compile(project(":spring-tx"))
+ optional(project(":spring-context")) // for JndiDataSourceLookup
+- optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
+- optional("c3p0:c3p0:0.9.1.2")
+- optional("hsqldb:hsqldb:${hsqldbVersion}")
+- optional("com.h2database:h2:1.0.79")
+- optional("org.apache.derby:derby:10.5.3.0_1")
+- optional("org.apache.derby:derbyclient:10.5.3.0_1")
++ optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:debian")
++ optional("c3p0:c3p0:debian")
++ optional("org.hsqldb:hsqldb:${hsqldbVersion}")
++ //optional("com.h2database:h2:1.0.79")
++ optional("org.apache.derby:derby:debian")
++ optional("org.apache.derby:derbyclient:debian")
+ }
+ }
+
+@@ -460,22 +466,25 @@
+ compile(project(":spring-core"))
+ compile(project(":spring-beans"))
+ compile(project(":spring-context"))
+- provided("javax.activation:activation:1.1")
++ //provided("javax.activation:activation:1.1")
+ optional(project(":spring-jdbc")) // for Quartz support
+ optional(project(":spring-tx")) // for Quartz support
+- optional("javax.mail:mail:1.4.7")
++ optional("com.sun.mail:javax.mail:debian")
+ optional("javax.cache:cache-api:0.5")
+- optional("net.sf.ehcache:ehcache-core:2.0.1")
++ optional("net.sf.ehcache:ehcache-core:debian")
+ optional("org.quartz-scheduler:quartz:1.7.3")
+- optional("org.codehaus.fabric3.api:commonj:1.1.0")
+- optional("velocity:velocity:1.5")
+- optional("org.freemarker:freemarker:2.3.20")
++ optional("org.apache.geronimo.specs:geronimo-commonj_1.1_spec:debian")
++ optional("org.apache.velocity:velocity:debian")
++ optional("org.freemarker:freemarker:debian")
+ optional("com.lowagie:itext:2.1.7")
+- optional("net.sf.jasperreports:jasperreports:3.7.6")
+- testCompile("org.apache.poi:poi:3.6")
+- testCompile("commons-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports
+- testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports
+- testCompile("hsqldb:hsqldb:${hsqldbVersion}")
++ optional("net.sf.jasperreports:jasperreports:debian") {
++ exclude group: 'org.codehaus.castor', module: 'castor'
++ exclude group: 'jfree', module: 'jfreechart'
++ }
++ testCompile("org.apache.poi:poi:debian")
++ testCompile("commons-beanutils:commons-beanutils:debian") // for Velocity/JasperReports
++ testCompile("commons-digester:commons-digester:debian") // for Velocity/JasperReports
++ testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
+ testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
+ }
+
+@@ -491,34 +500,34 @@
+ compile(project(":spring-beans")) // for MultiPartFilter
+ compile(project(":spring-context"))
+ compile(project(":spring-core"))
+- provided("javax.servlet:javax.servlet-api:3.0.1")
+- provided("javax.activation:activation:1.1")
++ provided("javax.servlet:servlet-api:3.0")
++ //provided("javax.activation:activation:1.1")
+ optional(project(":spring-oxm")) // for MarshallingHttpMessageConverter
+ optional("javax.servlet.jsp:jsp-api:2.1")
+ optional("javax.portlet:portlet-api:2.0")
+- optional("javax.el:el-api:1.0")
+- optional("javax.faces:jsf-api:1.2_08")
+- optional("javax.xml:jaxrpc-api:1.1")
+- optional("javax.xml.soap:saaj-api:1.3")
++ optional("javax.el:el-api:2.2")
++ optional("com.sun.faces:jsf-api:debian")
++ optional("axis:axis-jaxrpc:debian")
++ optional("axis:axis-saaj:debian")
+ optional("aopalliance:aopalliance:1.0")
+- optional("com.caucho:hessian:3.2.1")
+- optional("commons-fileupload:commons-fileupload:1.3.1")
+- optional("commons-io:commons-io:1.3")
+- optional("commons-httpclient:commons-httpclient:3.1")
+- optional("org.apache.httpcomponents:httpclient:4.2.6")
+- optional("org.codehaus.jackson:jackson-mapper-asl:1.7.9")
+- optional("com.fasterxml.jackson.core:jackson-databind:2.0.6")
+- optional("rome:rome:1.0")
++ optional("com.caucho:hessian:debian")
++ optional("commons-fileupload:commons-fileupload:debian")
++ optional("commons-io:commons-io:debian")
++ optional("commons-httpclient:commons-httpclient:3.x")
++ optional("org.apache.httpcomponents:httpclient:debian")
++ optional("org.codehaus.jackson:jackson-mapper-asl:debian")
++ optional("com.fasterxml.jackson.core:jackson-databind:2.x")
++ optional("rome:rome:debian")
+ optional("taglibs:standard:1.1.2")
+- optional("org.eclipse.jetty:jetty-servlet:8.1.5.v20120716") {
++ optional("org.eclipse.jetty:jetty-servlet:debian") {
+ exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet"
+ }
+- optional("org.eclipse.jetty:jetty-server:8.1.5.v20120716") {
++ optional("org.eclipse.jetty:jetty-server:debian") {
+ exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet"
+ }
+- optional("log4j:log4j:1.2.17")
++ optional("log4j:log4j:1.2.x")
+ testCompile(project(":spring-context-support")) // for JafMediaTypeFactory
+- testCompile("xmlunit:xmlunit:1.3")
++ testCompile("xmlunit:xmlunit:debian")
+ }
+
+ // pick up ContextLoader.properties in src/main
+@@ -543,22 +552,21 @@
+ optional(project(":spring-context"))
+ optional(project(":spring-web"))
+ optional("aopalliance:aopalliance:1.0")
+- optional("javax.persistence:persistence-api:1.0")
+- optional("org.eclipse.persistence:org.eclipse.persistence.core:1.0.1")
+- optional("org.eclipse.persistence:org.eclipse.persistence.jpa:1.0.1")
+- optional("org.hibernate:hibernate-core:3.3.2.GA")
+- optional("org.hibernate:hibernate-annotations:3.4.0.GA")
+- optional("org.hibernate:hibernate-entitymanager:3.4.0.GA")
+- optional("org.apache.openjpa:openjpa:1.1.0")
+- optional("toplink.essentials:toplink-essentials:2.0-41b")
+- optional("javax.jdo:jdo-api:3.0")
++ optional("javax.persistence:persistence-api:debian")
++ optional("org.eclipse.persistence:eclipselink:debian")
++ optional("org.hibernate:hibernate-core:debian")
++ //optional("org.hibernate:hibernate-annotations:debian")
++ optional("org.hibernate:hibernate-entitymanager:debian")
++ optional("org.apache.openjpa:openjpa:debian")
++ optional("toplink.essentials:toplink-essentials:debian")
++ optional("javax.jdo:jdo2-api:debian")
+ optional("org.apache.ibatis:ibatis-sqlmap:2.3.4.726")
+ optional("javax.servlet:servlet-api:2.5")
+- testCompile("javax.servlet:javax.servlet-api:3.0.1")
++ testCompile("javax.servlet:servlet-api:3.0")
+ testCompile("org.eclipse.persistence:org.eclipse.persistence.asm:1.0.1")
+ testCompile("org.eclipse.persistence:org.eclipse.persistence.antlr:1.0.1")
+- testCompile("commons-dbcp:commons-dbcp:1.3")
+- testCompile("hsqldb:hsqldb:${hsqldbVersion}")
++ testCompile("commons-dbcp:commons-dbcp:debian")
++ testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
+ testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
+ }
+ }
+@@ -588,30 +596,33 @@
+ compile(project(":spring-core"))
+ compile(project(":spring-expression"))
+ compile(project(":spring-web"))
+- provided("javax.servlet:javax.servlet-api:3.0.1")
++ provided("javax.servlet:servlet-api:3.0")
+ optional(project(":spring-context-support")) // for Velocity support
+ optional(project(":spring-oxm")) // for MarshallingView
+ optional("javax.servlet.jsp:jsp-api:2.1")
+- optional("javax.servlet:jstl:1.2")
+- optional("net.sourceforge.jexcelapi:jxl:2.6.12")
+- optional("org.apache.poi:poi:3.6")
+- optional("velocity:velocity:1.5")
+- optional("velocity-tools:velocity-tools-view:1.4")
+- optional("org.freemarker:freemarker:2.3.20")
++ optional("javax.servlet:jstl:1.1")
++ optional("net.sourceforge.jexcelapi:jxl:debian")
++ optional("org.apache.poi:poi:debian")
++ optional("org.apache.velocity:velocity:debian")
++ optional("velocity-tools:velocity-tools-view:debian")
++ optional("org.freemarker:freemarker:debian")
+ optional("com.lowagie:itext:2.1.7")
+- optional("net.sf.jasperreports:jasperreports:3.7.6") {
++ optional("net.sf.jasperreports:jasperreports:debian") {
+ exclude group: "xml-apis", module: "xml-apis"
++ exclude group: "org.codehaus.castor", module: "castor"
++ exclude group: "jfree", module: "jfreechart"
+ }
+- optional("org.codehaus.jackson:jackson-mapper-asl:1.7.9")
+- optional("com.fasterxml.jackson.core:jackson-databind:2.0.6")
+- optional("rome:rome:1.0")
+- optional("org.apache.tiles:tiles-api:2.1.2")
+- optional("org.apache.tiles:tiles-core:2.1.2")
+- optional("org.apache.tiles:tiles-jsp:2.1.2")
+- optional("org.apache.tiles:tiles-servlet:2.1.2")
++ optional("org.codehaus.jackson:jackson-mapper-asl:debian")
++ optional("com.fasterxml.jackson.core:jackson-databind:2.x")
++ optional("rome:rome:debian")
++ optional("org.apache.tiles:tiles-api:debian")
++ optional("org.apache.tiles:tiles-core:debian")
++ optional("org.apache.tiles:tiles-el:debian")
++ optional("org.apache.tiles:tiles-jsp:debian")
++ optional("org.apache.tiles:tiles-servlet:debian")
+ testCompile(project(":spring-aop"))
+ testCompile("rhino:js:1.7R1")
+- testCompile("xmlunit:xmlunit:1.3")
++ testCompile("xmlunit:xmlunit:debian")
+ testCompile("dom4j:dom4j:1.6.1") {
+ exclude group: "xml-apis", module: "xml-apis"
+ }
+@@ -620,17 +631,17 @@
+ exclude group: "xom", module: "xom"
+ exclude group: "xerces", module: "xercesImpl"
+ }
+- testCompile("org.eclipse.jetty:jetty-servlet:8.1.5.v20120716") {
++ testCompile("org.eclipse.jetty:jetty-servlet:debian") {
+ exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet"
+ }
+- testCompile("org.eclipse.jetty:jetty-server:8.1.5.v20120716") {
++ testCompile("org.eclipse.jetty:jetty-server:debian") {
+ exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet"
+ }
+- testCompile("javax.validation:validation-api:1.0.0.GA")
+- testCompile("org.hibernate:hibernate-validator:4.3.1.Final")
+- testCompile("org.apache.httpcomponents:httpclient:4.2.6")
+- testCompile("commons-fileupload:commons-fileupload:1.3.1")
+- testCompile("commons-io:commons-io:1.3")
++ testCompile("org.apache.geronimo.specs:geronimo-validation_1.0_spec:debian")
++ testCompile("org.hibernate:hibernate-validator:debian")
++ testCompile("org.apache.httpcomponents:httpclient:debian")
++ testCompile("commons-fileupload:commons-fileupload:debian")
++ testCompile("commons-io:commons-io:debian")
+ testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
+ }
+
+@@ -649,7 +660,7 @@
+ provided("javax.servlet:javax.servlet-api:3.0.1")
+ optional("javax.servlet.jsp:jsp-api:2.1")
+ optional("javax.servlet:jstl:1.2")
+- optional("javax.el:el-api:1.0")
++ optional("javax.el:el-api:2.2")
+ optional("org.apache.tiles:tiles-api:3.0.4")
+ optional("org.apache.tiles:tiles-core:3.0.4") {
+ exclude group: "org.slf4j", module: "jcl-over-slf4j"
+@@ -683,7 +694,7 @@
+ compile(project(":spring-webmvc"))
+ provided("javax.servlet:servlet-api:2.5")
+ provided("javax.portlet:portlet-api:2.0")
+- optional("commons-fileupload:commons-fileupload:1.3.1")
++ optional("commons-fileupload:commons-fileupload:debian")
+ }
+
+ // pick up DispatcherPortlet.properties in src/main
+@@ -695,7 +706,7 @@
+
+ dependencies {
+ compile(project(":spring-core"))
+- provided("javax.activation:activation:1.1")
++ //provided("javax.activation:activation:1.1")
+ optional(project(":spring-beans"))
+ optional(project(":spring-context"))
+ optional(project(":spring-jdbc"))
+@@ -705,16 +716,17 @@
+ optional(project(":spring-webmvc"))
+ optional(project(":spring-webmvc-portlet"))
+ optional("junit:junit:${junitVersion}")
+- optional("org.testng:testng:6.8.8")
++ optional("org.testng:testng:6.x")
+ optional("javax.inject:javax.inject:1")
+ optional("javax.servlet:servlet-api:2.5")
+ optional("javax.servlet.jsp:jsp-api:2.1")
+- optional("javax.servlet:jstl:1.2")
++ optional("javax.servlet:jstl:1.1")
+ optional("javax.portlet:portlet-api:2.0")
+- optional("javax.persistence:persistence-api:1.0")
++ optional("javax.persistence:persistence-api:debian")
+ optional("org.aspectj:aspectjweaver:${aspectjVersion}")
+- testCompile("org.hibernate:hibernate-core:3.3.2.GA")
+- testCompile("hsqldb:hsqldb:${hsqldbVersion}")
++ optional("taglibs:standard:1.1.2")
++ testCompile("org.hibernate:hibernate-core:debian")
++ testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
+ testCompile "org.slf4j:slf4j-jcl:${slf4jVersion}"
+ }
+
+@@ -802,7 +814,7 @@
+ ajc("org.aspectj:aspectjtools:${aspectjVersion}")
+ rt("org.aspectj:aspectjrt:${aspectjVersion}")
+ compile("org.aspectj:aspectjweaver:${aspectjVersion}")
+- provided("javax.persistence:persistence-api:1.0")
++ provided("javax.persistence:persistence-api:debian")
+ optional(project(":spring-aop")) // for @Async support
+ optional(project(":spring-beans")) // for @Configurable support
+ optional(project(":spring-context")) // for @Enable* support
+@@ -894,10 +906,10 @@
+ testCompile("javax.servlet:servlet-api:2.5")
+ testCompile("javax.portlet:portlet-api:2.0")
+ testCompile("javax.inject:javax.inject:1")
+- testCompile("javax.resource:connector-api:1.5")
++ testCompile("org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:debian")
+ testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
+ testCompile("org.hibernate:hibernate-core:4.2.15.Final")
+- testCompile("hsqldb:hsqldb:${hsqldbVersion}")
++ testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
+ }
+
+ task api(type: Javadoc) {
diff --git a/debian/patches/0022-ignore-docbook-reference-plugin.patch b/debian/patches/0022-ignore-docbook-reference-plugin.patch
new file mode 100644
index 0000000..6c3f832
--- /dev/null
+++ b/debian/patches/0022-ignore-docbook-reference-plugin.patch
@@ -0,0 +1,52 @@
+Description: Disable the generation of the docbook documentation.
+ It requires the docbook-reference-plugin which isn't in Debian.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -5,7 +5,6 @@
+ }
+ dependencies {
+ classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
+- classpath("org.springframework.build.gradle:docbook-reference-plugin:0.2.8")
+ }
+ }
+
+@@ -871,17 +870,11 @@
+ configure(rootProject) {
+ description = "Spring Framework"
+
+- apply plugin: "docbook-reference"
+ apply plugin: "groovy"
+
+ // apply plugin: "detect-split-packages"
+ apply from: "${gradleScriptDir}/jdiff.gradle"
+
+- reference {
+- sourceDir = file("src/reference/docbook")
+- pdfFilename = "spring-framework-reference.pdf"
+- }
+-
+ // TODO: DetectSplitPackagesPlugin fails in line 154 due to method not found on java.io.File.
+ // TODO: Possibly related to user rights or OS differences on OpenJDK 8; works fine on JDK 7.
+ // detectSplitPackages {
+@@ -953,7 +946,7 @@
+ }
+ }
+
+- task docsZip(type: Zip, dependsOn: 'reference') {
++ task docsZip(type: Zip) {
+ group = "Distribution"
+ baseName = "spring-framework"
+ classifier = "docs"
+@@ -967,10 +960,6 @@
+ from (api) {
+ into "javadoc-api"
+ }
+-
+- from (reference) {
+- into "spring-framework-reference"
+- }
+ }
+
+ task schemaZip(type: Zip) {
diff --git a/debian/patches/0023-disable-testng-reports.patch b/debian/patches/0023-disable-testng-reports.patch
new file mode 100644
index 0000000..4320870
--- /dev/null
+++ b/debian/patches/0023-disable-testng-reports.patch
@@ -0,0 +1,15 @@
+Description: Disable a property of the testng task not supported by the current version of Gradle in Debian.
+ This patch can be removed after upgrading to Gradle 1.7.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -738,7 +738,7 @@
+ // "TestCase" classes are run by other test classes, not the build.
+ exclude "**/*TestCase.class"
+ // Generate TestNG reports alongside JUnit reports.
+- getReports().getHtml().setEnabled(true)
++ //getReports().getHtml().setEnabled(true)
+ // show standard out and standard error of the test JVM(s) on the console
+ // testLogging.showStandardStreams = true
+ }
diff --git a/debian/patches/0024-gradle-1.5-compatibility.patch b/debian/patches/0024-gradle-1.5-compatibility.patch
new file mode 100644
index 0000000..e74aed3
--- /dev/null
+++ b/debian/patches/0024-gradle-1.5-compatibility.patch
@@ -0,0 +1,15 @@
+Description: Disable a property not supported by the current version of Gradle in Debian.
+ This patch can be removed after upgrading to Gradle 1.7
+Author: Emmanuel Bourg <ebourg at pache.or>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -968,7 +968,7 @@
+ classifier = "schema"
+ description = "Builds -${classifier} archive containing all " +
+ "XSDs for deployment at http://springframework.org/schema."
+- duplicatesStrategy 'exclude'
++ //duplicatesStrategy 'exclude'
+ moduleProjects.each { subproject ->
+ def Properties schemas = new Properties();
+
diff --git a/debian/patches/0025-compiler-dependencies.patch b/debian/patches/0025-compiler-dependencies.patch
new file mode 100644
index 0000000..01fe911
--- /dev/null
+++ b/debian/patches/0025-compiler-dependencies.patch
@@ -0,0 +1,14 @@
+Description: Add Groovy to the classpath to compile the .groovy files.
+ This patch may probably be removed after upgrading to a more recent version of Gradle.
+Author: Emmanuel Bourg <ebourg at pache.or>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -167,6 +167,7 @@
+ apply plugin: "groovy"
+
+ dependencies {
++ compile("org.codehaus.groovy:groovy-all:1.x")
+ compile gradleApi()
+ compile localGroovy()
+ }
diff --git a/debian/patches/0026-derby-compatibility.patch b/debian/patches/0026-derby-compatibility.patch
new file mode 100644
index 0000000..51dd56d
--- /dev/null
+++ b/debian/patches/0026-derby-compatibility.patch
@@ -0,0 +1,21 @@
+Description: Compile with the version of Derby in Debian
+Origin: backport, https://github.com/spring-projects/spring-framework/commit/b4d6e27
+--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
++++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
+@@ -86,16 +86,6 @@
+ logger.warn("Could not shutdown in-memory Derby database", ex);
+ return;
+ }
+- if (!IS_AT_LEAST_DOT_SIX) {
+- // Explicitly purge the in-memory database, to prevent it
+- // from hanging around after being shut down.
+- try {
+- VFMemoryStorageFactory.purgeDatabase(new File(databaseName).getCanonicalPath());
+- }
+- catch (IOException ex2) {
+- logger.warn("Could not purge in-memory Derby database", ex2);
+- }
+- }
+ }
+ }
+
diff --git a/debian/patches/0027-disable-jcache-support.patch b/debian/patches/0027-disable-jcache-support.patch
new file mode 100644
index 0000000..6261d50
--- /dev/null
+++ b/debian/patches/0027-disable-jcache-support.patch
@@ -0,0 +1,30 @@
+Description: Disable the javax.cache support since the API is not in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -470,7 +470,7 @@
+ optional(project(":spring-jdbc")) // for Quartz support
+ optional(project(":spring-tx")) // for Quartz support
+ optional("com.sun.mail:javax.mail:debian")
+- optional("javax.cache:cache-api:0.5")
++ //optional("javax.cache:cache-api:0.5")
+ optional("net.sf.ehcache:ehcache-core:debian")
+ optional("org.quartz-scheduler:quartz:1.7.3")
+ optional("org.apache.geronimo.specs:geronimo-commonj_1.1_spec:debian")
+@@ -490,6 +490,15 @@
+
+ // pick up **/*.types files in src/main
+ sourceSets.main.resources.srcDirs += "src/main/java"
++
++ sourceSets {
++ main {
++ java {
++ srcDir 'src/main/java'
++ exclude '**/jcache/**'
++ }
++ }
++ }
+ }
+
+ project("spring-web") {
diff --git a/debian/patches/0028-disable-jdiff-report.patch b/debian/patches/0028-disable-jdiff-report.patch
new file mode 100644
index 0000000..2e31e86
--- /dev/null
+++ b/debian/patches/0028-disable-jdiff-report.patch
@@ -0,0 +1,14 @@
+Description: Disable the JDiff report (not in Debian and not necessary)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -883,7 +883,7 @@
+ apply plugin: "groovy"
+
+ // apply plugin: "detect-split-packages"
+- apply from: "${gradleScriptDir}/jdiff.gradle"
++ //apply from: "${gradleScriptDir}/jdiff.gradle"
+
+ // TODO: DetectSplitPackagesPlugin fails in line 154 due to method not found on java.io.File.
+ // TODO: Possibly related to user rights or OS differences on OpenJDK 8; works fine on JDK 7.
diff --git a/debian/patches/series b/debian/patches/series
index 8746737..f73937e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,12 @@
0005_commonj.diff
0007_remove_backport_util_concurrent.patch
0010_velocity_17.diff
+0020-disable-modules.patch
+0021-use-system-dependencies.patch
+0022-ignore-docbook-reference-plugin.patch
+0023-disable-testng-reports.patch
+0024-gradle-1.5-compatibility.patch
+0025-compiler-dependencies.patch
+0026-derby-compatibility.patch
+0027-disable-jcache-support.patch
+0028-disable-jdiff-report.patch
diff --git a/debian/poms/spring-aop.pom.xml b/debian/poms/spring-aop.pom.xml
new file mode 100644
index 0000000..111befa
--- /dev/null
+++ b/debian/poms/spring-aop.pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring AOP</name>
+ <description>Spring AOP</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jamonapi</groupId>
+ <artifactId>jamon</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-aspects.pom.xml b/debian/poms/spring-aspects.pom.xml
new file mode 100644
index 0000000..f666ba1
--- /dev/null
+++ b/debian/poms/spring-aspects.pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aspects</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring Aspects</name>
+ <description>Spring Aspects</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-beans.pom.xml b/debian/poms/spring-beans.pom.xml
new file mode 100644
index 0000000..16ce2b5
--- /dev/null
+++ b/debian/poms/spring-beans.pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring Beans</name>
+ <description>Spring Beans</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-context-support.pom.xml b/debian/poms/spring-context-support.pom.xml
new file mode 100644
index 0000000..951a2a9
--- /dev/null
+++ b/debian/poms/spring-context-support.pom.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring Context Support</name>
+ <description>Spring Context Support</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>com.lowagie</groupId>
+ <artifactId>itext</artifactId>
+ <version>2.1.7</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jasperreports</groupId>
+ <artifactId>jasperreports</artifactId>
+ <version>debian</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>castor</artifactId>
+ <groupId>org.codehaus.castor</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jfreechart</artifactId>
+ <groupId>jfree</groupId>
+ </exclusion>
+ </exclusions>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-commonj_1.1_spec</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>1.7.3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-context.pom.xml b/debian/poms/spring-context.pom.xml
new file mode 100644
index 0000000..503ee11
--- /dev/null
+++ b/debian/poms/spring-context.pom.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring Context</name>
+ <description>Spring Context</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>1.x</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby</artifactId>
+ <version>debian</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jnr-netdb</artifactId>
+ <groupId>org.jruby.extras</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>bytelist</artifactId>
+ <groupId>org.jruby.extras</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>joni</artifactId>
+ <groupId>org.jruby.joni</groupId>
+ </exclusion>
+ </exclusions>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-instrument</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-core.pom.xml b/debian/poms/spring-core.pom.xml
new file mode 100644
index 0000000..f72c67a
--- /dev/null
+++ b/debian/poms/spring-core.pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring Core</name>
+ <description>Spring Core</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.x</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jopt-simple</groupId>
+ <artifactId>jopt-simple</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-expression.pom.xml b/debian/poms/spring-expression.pom.xml
new file mode 100644
index 0000000..b9e0ea9
--- /dev/null
+++ b/debian/poms/spring-expression.pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring Expression Language (SpEL)</name>
+ <description>Spring Expression Language (SpEL)</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-framework-bom.pom.xml b/debian/poms/spring-framework-bom.pom.xml
new file mode 100644
index 0000000..e1d7643
--- /dev/null
+++ b/debian/poms/spring-framework-bom.pom.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-framework-bom</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <packaging>pom</packaging>
+ <name>Spring Framework (Bill of Materials)</name>
+ <description>Spring Framework (Bill of Materials)</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aspects</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-instrument</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-instrument-tomcat</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-oxm</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc-portlet</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
diff --git a/debian/poms/spring-instrument-tomcat.pom.xml b/debian/poms/spring-instrument-tomcat.pom.xml
new file mode 100644
index 0000000..809628d
--- /dev/null
+++ b/debian/poms/spring-instrument-tomcat.pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-instrument-tomcat</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring Instrument Tomcat</name>
+ <description>Spring Instrument Tomcat</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>8.x</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-instrument.pom.xml b/debian/poms/spring-instrument.pom.xml
new file mode 100644
index 0000000..1965bf7
--- /dev/null
+++ b/debian/poms/spring-instrument.pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-instrument</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring Instrument</name>
+ <description>Spring Instrument</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+</project>
diff --git a/debian/poms/spring-jdbc.pom.xml b/debian/poms/spring-jdbc.pom.xml
new file mode 100644
index 0000000..448733d
--- /dev/null
+++ b/debian/poms/spring-jdbc.pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring JDBC</name>
+ <description>Spring JDBC</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyclient</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-jms.pom.xml b/debian/poms/spring-jms.pom.xml
new file mode 100644
index 0000000..f5cac58
--- /dev/null
+++ b/debian/poms/spring-jms.pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring JMS</name>
+ <description>Spring JMS</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.x</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-oxm</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-orm.pom.xml b/debian/poms/spring-orm.pom.xml
new file mode 100644
index 0000000..1056a00
--- /dev/null
+++ b/debian/poms/spring-orm.pom.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring Object/Relational Mapping</name>
+ <description>Spring Object/Relational Mapping</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo2-api</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ibatis</groupId>
+ <artifactId>ibatis-sqlmap</artifactId>
+ <version>2.3.4.726</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>eclipselink</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>toplink.essentials</groupId>
+ <artifactId>toplink-essentials</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-oxm.pom.xml b/debian/poms/spring-oxm.pom.xml
new file mode 100644
index 0000000..15a9ce9
--- /dev/null
+++ b/debian/poms/spring-oxm.pom.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-oxm</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring Object/XML Marshalling</name>
+ <description>Spring Object/XML Marshalling</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>debian</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xmlpull</artifactId>
+ <groupId>xmlpull</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xpp3_min</artifactId>
+ <groupId>xpp3</groupId>
+ </exclusion>
+ </exclusions>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>debian</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>stax-api</artifactId>
+ <groupId>stax</groupId>
+ </exclusion>
+ </exclusions>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.castor</groupId>
+ <artifactId>castor-xml</artifactId>
+ <version>debian</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>stax-api</artifactId>
+ <groupId>stax</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>spring-context</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ </exclusions>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-test.pom.xml b/debian/poms/spring-test.pom.xml
new file mode 100644
index 0000000..c02353d
--- /dev/null
+++ b/debian/poms/spring-test.pom.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring TestContext Framework</name>
+ <description>Spring TestContext Framework</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>2.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.x</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc-portlet</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.x</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-tx.pom.xml b/debian/poms/spring-tx.pom.xml
new file mode 100644
index 0000000..f468297
--- /dev/null
+++ b/debian/poms/spring-tx.pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring Transaction</name>
+ <description>Spring Transaction</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-web.pom.xml b/debian/poms/spring-web.pom.xml
new file mode 100644
index 0000000..8069c7f
--- /dev/null
+++ b/debian/poms/spring-web.pom.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring Web</name>
+ <description>Spring Web</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-jaxrpc</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-saaj</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.caucho</groupId>
+ <artifactId>hessian</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.x</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.x</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>2.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.x</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>debian</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>javax.servlet</artifactId>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ </exclusion>
+ </exclusions>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>debian</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>javax.servlet</artifactId>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ </exclusion>
+ </exclusions>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-oxm</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>rome</groupId>
+ <artifactId>rome</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-webmvc-portlet.pom.xml b/debian/poms/spring-webmvc-portlet.pom.xml
new file mode 100644
index 0000000..52f2713
--- /dev/null
+++ b/debian/poms/spring-webmvc-portlet.pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc-portlet</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring Web Portlet</name>
+ <description>Spring Web Portlet</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/poms/spring-webmvc.pom.xml b/debian/poms/spring-webmvc.pom.xml
new file mode 100644
index 0000000..165c55e
--- /dev/null
+++ b/debian/poms/spring-webmvc.pom.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <name>Spring Web MVC</name>
+ <description>Spring Web MVC</description>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ <organization>
+ <name>SpringSource</name>
+ <url>http://springsource.org/spring-framework</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jhoeller</id>
+ <name>Juergen Hoeller</name>
+ <email>jhoeller at gopivotal.com</email>
+ </developer>
+ </developers>
+ <scm>
+ <connection>scm:git:git://github.com/SpringSource/spring-framework</connection>
+ <developerConnection>scm:git:git://github.com/SpringSource/spring-framework</developerConnection>
+ <url>https://github.com/SpringSource/spring-framework</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.x</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.lowagie</groupId>
+ <artifactId>itext</artifactId>
+ <version>2.1.7</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jasperreports</groupId>
+ <artifactId>jasperreports</artifactId>
+ <version>debian</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>castor</artifactId>
+ <groupId>org.codehaus.castor</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jfreechart</artifactId>
+ <groupId>jfree</groupId>
+ </exclusion>
+ </exclusions>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jexcelapi</groupId>
+ <artifactId>jxl</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-api</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-core</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-el</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-jsp</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-servlet</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-oxm</artifactId>
+ <version>3.2.12.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>3.2.12.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>rome</groupId>
+ <artifactId>rome</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>velocity-tools</groupId>
+ <artifactId>velocity-tools-view</artifactId>
+ <version>debian</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/debian/rules b/debian/rules
index 2182d23..818c6d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,48 +1,50 @@
#!/usr/bin/make -f
-PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
-
JAVA_HOME := /usr/lib/jvm/default-java
-ANT_ARGS := -propertyfile debian/ant.properties
-BUILD_FILE := projects/build-spring-framework/build.xml
-CLASSPATH := $(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done)
-ANT := CLASSPATH=$(CLASSPATH) JAVA_HOME=$(JAVA_HOME) ANT_OPTS=$(JAVA_OPTS) ant -f $(BUILD_FILE) $(ANT_ARGS)
-MODULES = aop beans context context.support core expression instrument jdbc jms orm oxm test transaction web web.portlet web.servlet
-PRJ_ROOT = projects/org.springframework
-ARTIFACT_ROOT = target/artifacts/org.springframework
+MODULES = aop beans context context-support core expression instrument jdbc jms orm oxm test tx web webmvc webmvc-portlet
%:
- dh $@ --buildsystem=ant
+ dh $@
-override_dh_auto_clean:
- $(ANT) clean
- $(ANT) clean-integration
- -unlink projects/spring-build
- rm -rf projects/ivy-cache
- mh_clean
+override_dh_auto_build:
+ dh_auto_build
+ gradle --offline --stacktrace --refresh-dependencies --gradle-user-home .gradle jar -x test -x check
-override_dh_auto_configure:
- rm -rf projects/spring-build
- ln -s /usr/share/spring-build projects/spring-build
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -Rf build .gradle buildSrc/.gradle/ buildSrc/build/
+ for MYMOD in $(MODULES); do \
+ rm -Rf spring-$$MYMOD/build ; \
+ done
-override_dh_auto_build:
- $(ANT) jar
+ rm -Rf spring-aspects/build
+ rm -Rf spring-instrument-tomcat/build
+ rm -Rf spring-framework-bom/build
+ mh_clean
override_dh_auto_install:
- mh_installpom -plibspring-core-java $(PRJ_ROOT).spring-parent/pom.xml
+ # Install the Bill Of Materials in the core package
+ mh_installpom -plibspring-core-java debian/poms/spring-framework-bom.pom.xml
+
+ # Install the artifacts in their respective packages
for MYMOD in $(MODULES); do \
- BASENAME=`echo spring-$$MYMOD | sed "s/\\./\\-/"`; \
- JAR=`echo $(PRJ_ROOT).$$MYMOD/$(ARTIFACT_ROOT).$$MYMOD.jar`; \
- POM=`echo $(PRJ_ROOT).$$MYMOD/pom.xml`; \
- PACKAGE=`echo lib$$BASENAME-java`; \
+ BASENAME=`echo $$MYMOD | sed "s/tx/transaction/" | sed "s/webmvc-portlet/web-portlet/" | sed "s/webmvc/web-servlet/"`; \
+ USJNAME=`echo $$BASENAME | sed "s/-/./" ` ; \
+ JAR=`echo spring-$$MYMOD/build/libs/spring-$$MYMOD*.jar`; \
+ POM=`echo debian/poms/spring-$$MYMOD.pom.xml`; \
+ PACKAGE=`echo libspring-$$BASENAME-java`; \
mh_installpom -p$$PACKAGE $$POM ; \
- mh_installjar -p$$PACKAGE -nspring3-$$MYMOD -i3.x -l $$POM $$JAR ; \
+ mh_installjar -p$$PACKAGE -nspring3-$$USJNAME --usj-version=3.x --java-lib $$POM $$JAR ; \
done
- mh_installpom -plibspring-aop-java $(PRJ_ROOT).aspects/pom.xml
- mh_installjar -plibspring-aop-java -nspring3-aspects -i3.x -l $(PRJ_ROOT).aspects/pom.xml $(PRJ_ROOT).aspects/$(ARTIFACT_ROOT).aspects.jar
- mh_installpom -plibspring-instrument-java $(PRJ_ROOT).instrument.tomcat/pom.xml
- mh_installjar -plibspring-instrument-java -nspring3-instrument-tomcat -i3.x -l $(PRJ_ROOT).instrument.tomcat/pom.xml $(PRJ_ROOT).instrument.tomcat/$(ARTIFACT_ROOT).instrument.tomcat.jar
+
+ # Install the spring-aspects artifact in the aop package
+ mh_installpom -plibspring-aop-java debian/poms/spring-aspects.pom.xml
+ mh_installjar -plibspring-aop-java -nspring3-aspects --usj-version=3.x --java-lib debian/poms/spring-aspects.pom.xml spring-aspects/build/libs/spring-aspects*.jar
+
+ # Install the spring-instrument-tomcat artifact in the instrument package
+ mh_installpom -plibspring-instrument-java debian/poms/spring-instrument-tomcat.pom.xml
+ mh_installjar -plibspring-instrument-java -nspring3-instrument-tomcat --usj-version=3.x --java-lib debian/poms/spring-aspects.pom.xml spring-instrument-tomcat/build/libs/spring-instrument-tomcat*.jar
get-orig-source:
uscan --download-current-version --rename --force-download
--
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