[libspring-java] 06/07: Build with gradle-debian-helper
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Oct 22 08:04:34 UTC 2015
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 469962140183c9f0cb1fb5cc9eac33baa35704ec
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Oct 22 01:46:05 2015 +0200
Build with gradle-debian-helper
---
debian/changelog | 1 +
debian/control | 3 +-
debian/maven.ignoreRules | 24 +-
debian/maven.rules | 34 +-
debian/patches/0003_no_ibm_websphere.diff | 7 +-
debian/patches/0020-disable-modules.patch | 86 ----
debian/patches/0021-use-system-dependencies.patch | 481 ---------------------
.../0022-ignore-docbook-reference-plugin.patch | 14 +-
debian/patches/0027-disable-jcache-support.patch | 11 +-
debian/patches/0028-disable-jdiff-report.patch | 2 +-
debian/patches/0029-use-jruby-core.patch | 20 -
debian/patches/0030-tomcat7-compatibility.patch | 4 +-
debian/patches/0032-missing-tiles-dependency.patch | 13 +
.../patches/0033-missing-taglibs-dependency.patch | 14 +
debian/patches/series | 5 +-
debian/rules | 17 +-
16 files changed, 75 insertions(+), 661 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 90f515b..54ed0f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libspring-java (3.2.13-4) UNRELEASED; urgency=medium
* Team upload.
* Fixed the build failure with Quartz 1.8.6
* Fixed a compatibility issue with Gradle 2
+ * Build with gradle-debian-helper
* Removed the compatibility patches for Gradle < 1.7
* Removed the dependency on the Servlet API from the binary packages
diff --git a/debian/control b/debian/control
index 08411af..f37e9fd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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), default-jdk (>= 1:1.6), gradle (>= 1.7)
+Build-Depends: debhelper (>= 9), default-jdk (>= 1:1.6), gradle (>= 1.7), gradle-debian-helper
Build-Depends-Indep: bsh,
glassfish-javaee,
glassfish-toplink-essentials,
@@ -19,7 +19,6 @@ Build-Depends-Indep: bsh,
libatinject-jsr330-api-java,
libaxis-java,
libc3p0-java,
- libcastor-core-java,
libcastor-xml-java,
libcglib3-java,
libcommons-beanutils-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index bdf59cd..30e2dc8 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,18 +1,8 @@
-# Module "spring-asm" is not builded
-# as we use asm4 directly
-org.springframework spring-asm * * * *
-# No Websphere
-com.ibm.websphere com.springsource.com.ibm.websphere.uow * * * *
-com.ibm.websphere com.ibm.websphere.uow * * * *
-# No CommonJ
-com.bea.commonj com.springsource.commonj * * * *
-# No Derby
-org.apache.derby com.springsource.org.apache.derby.client * * * *
-org.apache.derby com.springsource.org.apache.derby * * * *
-# Others
-com.caucho com.springsource.com.caucho * * * *
-com.sun.xml.bind jaxb-impl * * * *
+javax.activation activation * * * *
+com.ibm.websphere uow * * * *
com.h2database h2 * * * *
-javax.annotation jsr250-api * * * *
-org.jruby jruby * * * *
-com.oracle oc4j * * * *
+javax.cache cache-api * * * *
+jfree jfreechart * * * *
+org.codehaus.castor castor * * * *
+org.hibernate hibernate-annotations * * * *
+org.springframework.build.gradle docbook-reference-plugin * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 5ba82a7..ac1f29e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,18 +1,30 @@
org.springframework * * s/3\..*/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 * * * *
+cglib cglib * s/.*/3.x/ * *
+com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * *
commons-httpclient commons-httpclient * * * *
-javax.el el-api * * * *
+s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * *
+javax.el el-api * s/.*/2.2/ * *
+s/javax.faces/com.sun.faces/ jsf-api * s/.*/debian/ * *
+s/javax.mail/com.sun.mail/ s/mail/javax.mail/ * s/.*/debian/ * *
+javax.jdo s/jdo-api/jdo2-api/ * s/.*/debian/ * *
javax.portlet portlet-api * * * *
-javax.servlet jstl * * * *
-javax.servlet servlet-api * * * *
+s/javax.resource/org.apache.geronimo.specs/ s/connector-api/geronimo-j2ee-connector_1.5_spec/ * s/.*/debian/ * *
+javax.servlet jstl * s/.*/1.1/ * *
+javax.servlet servlet-api * 2.5 * *
+javax.servlet s/javax.servlet-api/servlet-api/ * s/3.0.1/3.0/ * *
javax.servlet.jsp jsp-api * * * *
-junit junit * * * *
-log4j log4j * * * *
-org.apache.tomcat tomcat-catalina * * * *
-org.codehaus.groovy groovy-all
+s/javax.validation/org.apache.geronimo.specs/ s/validation-api/geronimo-validation_1.0_spec/ * s/.*/debian/ * *
+s/javax.xml/axis/ s/jaxrpc-api/axis-jaxrpc/ * s/.*/debian/ * *
+s/javax.xml.soap/axis/ s/saaj-api/axis-saaj/ * s/.*/debian/ * *
+junit junit * s/.*/4.x/ * *
+log4j log4j * s/.*/1.2.x/ * *
+org.apache.tomcat s/catalina/tomcat-catalina/ * s/.*/8.x/ * *
+s/org.codehaus.fabric3.api/org.apache.geronimo.specs/ s/commonj/geronimo-commonj_1.1_spec/ * s/.*/debian/ * *
+org.codehaus.groovy groovy-all * s/.*/2.x/ * *
+org.eclipse.persistence s/org.eclipse.persistence.*/eclipselink/ * s/.*/debian/ * *
org.jruby s/jruby/jruby-core/ jar s/.*/debian/ * *
-org.testng testng * * * *
+org.ow2.asm asm* * s/.*/4.x/ * *
+org.testng testng * s/.*/6.x/ * *
taglibs standard * * * *
+s/velocity/org.apache.velocity/ velocity * s/.*/debian/ * *
diff --git a/debian/patches/0003_no_ibm_websphere.diff b/debian/patches/0003_no_ibm_websphere.diff
index 9240310..e90a340 100644
--- a/debian/patches/0003_no_ibm_websphere.diff
+++ b/debian/patches/0003_no_ibm_websphere.diff
@@ -4,12 +4,7 @@ Last-Update: 2010-06-20
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -364,10 +364,19 @@
- optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
- optional("javax.resource:connector-api:1.5")
- optional("javax.ejb:ejb-api:3.0")
-- optional("com.ibm.websphere:uow:6.0.2.17")
-+ //optional("com.ibm.websphere:uow:6.0.2.17")
+@@ -368,6 +368,15 @@
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
testCompile("javax.persistence:persistence-api:1.0")
}
diff --git a/debian/patches/0020-disable-modules.patch b/debian/patches/0020-disable-modules.patch
deleted file mode 100644
index 8dd105f..0000000
--- a/debian/patches/0020-disable-modules.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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
deleted file mode 100644
index f3a9caa..0000000
--- a/debian/patches/0021-use-system-dependencies.patch
+++ /dev/null
@@ -1,481 +0,0 @@
-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 "https://repo.spring.io/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 "https://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("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("net.sf.ehcache:ehcache-core:debian")
-+ optional("org.quartz-scheduler:quartz:debian")
-+ 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
index 6c3f832..11ab9dc 100644
--- a/debian/patches/0022-ignore-docbook-reference-plugin.patch
+++ b/debian/patches/0022-ignore-docbook-reference-plugin.patch
@@ -4,15 +4,7 @@ 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 @@
+@@ -851,17 +851,11 @@
configure(rootProject) {
description = "Spring Framework"
@@ -30,7 +22,7 @@ Forwarded: not-needed
// 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 @@
+@@ -933,7 +927,7 @@
}
}
@@ -39,7 +31,7 @@ Forwarded: not-needed
group = "Distribution"
baseName = "spring-framework"
classifier = "docs"
-@@ -967,10 +960,6 @@
+@@ -947,10 +941,6 @@
from (api) {
into "javadoc-api"
}
diff --git a/debian/patches/0027-disable-jcache-support.patch b/debian/patches/0027-disable-jcache-support.patch
index 0658f00..0be6fc8 100644
--- a/debian/patches/0027-disable-jcache-support.patch
+++ b/debian/patches/0027-disable-jcache-support.patch
@@ -3,16 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -469,7 +469,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:debian")
- optional("org.apache.geronimo.specs:geronimo-commonj_1.1_spec:debian")
-@@ -489,6 +489,15 @@
+@@ -481,6 +481,15 @@
// pick up **/*.types files in src/main
sourceSets.main.resources.srcDirs += "src/main/java"
diff --git a/debian/patches/0028-disable-jdiff-report.patch b/debian/patches/0028-disable-jdiff-report.patch
index 052728b..879defc 100644
--- a/debian/patches/0028-disable-jdiff-report.patch
+++ b/debian/patches/0028-disable-jdiff-report.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -882,7 +882,7 @@
+@@ -863,7 +863,7 @@
apply plugin: "groovy"
// apply plugin: "detect-split-packages"
diff --git a/debian/patches/0029-use-jruby-core.patch b/debian/patches/0029-use-jruby-core.patch
deleted file mode 100644
index 23ad157..0000000
--- a/debian/patches/0029-use-jruby-core.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Use jruby-core maven artifact instead jruby main one
-Author: Miguel Landaeta <nomadium at debian.org>
-Forwarded: no
-Last-Update: 2015-08-16
-
---- a/build.gradle
-+++ b/build.gradle
-@@ -339,10 +339,10 @@
- optional("org.aspectj:aspectjweaver:${aspectjVersion}")
- optional("org.codehaus.groovy:groovy-all:1.x")
- optional("org.beanshell:bsh:debian")
-- optional("org.jruby:jruby:debian") {
-+ optional("org.jruby:jruby-core:debian") {
- exclude group: 'org.jruby.joni', module: 'joni'
- exclude group: 'org.jruby.extras', module: 'jnr-netdb'
-- exclude group: 'org.jruby.extras', module: 'bytelist'
-+ //exclude group: 'org.jruby.extras', module: 'bytelist'
- }
- testCompile("javax.inject:javax.inject-tck:1")
- testCompile("commons-dbcp:commons-dbcp:debian")
diff --git a/debian/patches/0030-tomcat7-compatibility.patch b/debian/patches/0030-tomcat7-compatibility.patch
index 1396dc5..8fa8136 100644
--- a/debian/patches/0030-tomcat7-compatibility.patch
+++ b/debian/patches/0030-tomcat7-compatibility.patch
@@ -138,9 +138,9 @@ Last-Update: 2015-08-16
--- a/build.gradle
+++ b/build.gradle
-@@ -316,6 +316,10 @@
+@@ -315,6 +315,10 @@
dependencies {
- provided("org.apache.tomcat:tomcat-catalina:8.x")
+ provided("org.apache.tomcat:catalina:6.0.16")
}
+
+ jar {
diff --git a/debian/patches/0032-missing-tiles-dependency.patch b/debian/patches/0032-missing-tiles-dependency.patch
new file mode 100644
index 0000000..abe68e4
--- /dev/null
+++ b/debian/patches/0032-missing-tiles-dependency.patch
@@ -0,0 +1,13 @@
+Description: Add the missing dependency on tiles-el
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/build.gradle
++++ b/build.gradle
+@@ -618,6 +618,7 @@
+ 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-el:2.1.2")
+ optional("org.apache.tiles:tiles-jsp:2.1.2")
+ optional("org.apache.tiles:tiles-servlet:2.1.2")
+ testCompile(project(":spring-aop"))
diff --git a/debian/patches/0033-missing-taglibs-dependency.patch b/debian/patches/0033-missing-taglibs-dependency.patch
new file mode 100644
index 0000000..c6fb109
--- /dev/null
+++ b/debian/patches/0033-missing-taglibs-dependency.patch
@@ -0,0 +1,14 @@
+Description: Add a missing dependency on the taglibs
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+
+--- a/build.gradle
++++ b/build.gradle
+@@ -722,6 +722,7 @@
+ optional("javax.servlet:jstl:1.2")
+ optional("javax.portlet:portlet-api:2.0")
+ optional("javax.persistence:persistence-api:1.0")
++ optional("taglibs:standard:1.1.2")
+ optional("org.aspectj:aspectjweaver:${aspectjVersion}")
+ testCompile("org.hibernate:hibernate-core:3.3.2.GA")
+ testCompile("hsqldb:hsqldb:${hsqldbVersion}")
diff --git a/debian/patches/series b/debian/patches/series
index d20760f..ee6d755 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,12 +2,11 @@
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
0026-derby-compatibility.patch
0027-disable-jcache-support.patch
0028-disable-jdiff-report.patch
-0029-use-jruby-core.patch
0030-tomcat7-compatibility.patch
0031-gradle2-compatibility.patch
+0032-missing-tiles-dependency.patch
+0033-missing-taglibs-dependency.patch
diff --git a/debian/rules b/debian/rules
index 818c6d9..2846ee5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,22 +5,17 @@ JAVA_HOME := /usr/lib/jvm/default-java
MODULES = aop beans context context-support core expression instrument jdbc jms orm oxm test tx web webmvc webmvc-portlet
%:
- dh $@
+ dh $@ --buildsystem=gradle
override_dh_auto_build:
- dh_auto_build
- gradle --offline --stacktrace --refresh-dependencies --gradle-user-home .gradle jar -x test -x check
+ dh_auto_build -- jar -x test -x check \
+ -x :spring-orm-hibernate4:compileJava \
+ -x :spring-struts:compileJava \
+ -x :spring-test-mvc:compileJava \
+ -x :spring-webmvc-tiles3:compileJava
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
-
- rm -Rf spring-aspects/build
- rm -Rf spring-instrument-tomcat/build
- rm -Rf spring-framework-bom/build
mh_clean
override_dh_auto_install:
--
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