Commit d08978d1 authored by Emmanuel Bourg's avatar Emmanuel Bourg

Refreshed the patches

parent 53e07d47
libspring-java (4.3.21-3) UNRELEASED; urgency=medium
libspring-java (4.3.22-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
- Refreshed the patches
* Depend on librome-java (>= 1.6)
* Depend on libapache-poi-java (>= 4.0)
* Switch from libservlet3.1-java to lib{servlet,jsp,el,websocket}-api-java
......
......@@ -4,7 +4,7 @@ Last-Update: 2010-06-20
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -585,6 +585,15 @@
@@ -586,6 +586,15 @@
testCompile("org.eclipse.persistence:javax.persistence:2.0.0")
testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}")
}
......
......@@ -4,7 +4,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -1155,7 +1155,6 @@
@@ -1156,7 +1156,6 @@
description = "Spring Framework"
apply plugin: "org.asciidoctor.convert"
......@@ -12,7 +12,7 @@ Forwarded: not-needed
apply plugin: "groovy"
// apply plugin: "detect-split-packages"
@@ -1169,13 +1168,6 @@
@@ -1170,13 +1169,6 @@
attributes 'spring-version': project.version, 'revnumber': project.version, 'docinfo': ""
}
......@@ -26,7 +26,7 @@ Forwarded: not-needed
afterEvaluate {
tasks.findAll { it.name.startsWith("reference") }.each{ it.dependsOn.add("asciidoctor") }
}
@@ -1249,7 +1241,7 @@
@@ -1250,7 +1242,7 @@
}
}
......@@ -35,7 +35,7 @@ Forwarded: not-needed
group = "Distribution"
baseName = "spring-framework"
classifier = "docs"
@@ -1263,10 +1255,6 @@
@@ -1264,10 +1256,6 @@
from (api) {
into "javadoc-api"
}
......
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -1158,7 +1158,7 @@
@@ -1159,7 +1159,7 @@
apply plugin: "groovy"
// apply plugin: "detect-split-packages"
......
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -1154,24 +1154,11 @@
@@ -1155,24 +1155,11 @@
configure(rootProject) {
description = "Spring Framework"
......
......@@ -14,7 +14,7 @@ Forwarded: not-needed
ext {
linkHomepage = 'https://projects.spring.io/spring-framework'
linkCi = 'https://build.spring.io/browse/SPR'
@@ -1137,20 +1133,6 @@
@@ -1138,20 +1134,6 @@
}
}
......@@ -35,7 +35,7 @@ Forwarded: not-needed
configure(rootProject) {
description = "Spring Framework"
@@ -1366,21 +1348,6 @@
@@ -1367,21 +1349,6 @@
}
......
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -765,6 +765,7 @@
@@ -766,6 +766,7 @@
exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jta_1.1_spec'
exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jms_1.1_spec'
}
......
......@@ -29,7 +29,7 @@ Forwarded: not-needed
// just handling JSR-310 specific date and time types
--- a/build.gradle
+++ b/build.gradle
@@ -492,6 +492,14 @@
@@ -493,6 +493,14 @@
testCompile("org.apache.commons:commons-pool2:2.4.2")
testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
}
......
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -742,6 +742,14 @@
@@ -743,6 +743,14 @@
testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
}
......
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -1060,6 +1060,15 @@
@@ -1061,6 +1061,15 @@
testRuntime("log4j:log4j:${log4jVersion}")
}
......
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -673,6 +673,14 @@
@@ -674,6 +674,14 @@
testRuntime("org.ehcache:ehcache:${ehcache3Version}")
testRuntime("org.terracotta:management-model:2.3.0")
}
......
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -475,7 +475,8 @@
@@ -476,7 +476,8 @@
compile(files(project(":spring-core").cglibRepackJar))
optional(project(":spring-instrument"))
optional("javax.inject:javax.inject:1")
......@@ -13,7 +13,7 @@ Forwarded: not-needed
optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0")
optional("javax.money:money-api:1.0.1")
optional("org.eclipse.persistence:javax.persistence:2.0.0")
@@ -583,7 +584,8 @@
@@ -584,7 +585,8 @@
optional(project(":spring-context")) // for JCA, @EnableTransactionManagement
optional("javax.transaction:javax.transaction-api:${jtaVersion}")
optional("javax.resource:connector-api:1.5")
......
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
@@ -347,6 +347,8 @@
@@ -348,6 +348,8 @@
compile(files(cglibRepackJar))
compile(files(objenesisRepackJar))
compile("commons-logging:commons-logging:1.2")
......@@ -12,7 +12,7 @@ Forwarded: not-needed
optional("commons-codec:commons-codec:1.10")
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("net.sf.jopt-simple:jopt-simple:5.0.3")
@@ -487,6 +489,8 @@
@@ -488,6 +490,8 @@
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
optional("org.beanshell:bsh:2.0b5")
optional("org.jruby:jruby:${jrubyVersion}")
......@@ -21,7 +21,7 @@ Forwarded: not-needed
testCompile("javax.inject:javax.inject-tck:1")
testCompile("org.javamoney:moneta:1.1")
testCompile("commons-dbcp:commons-dbcp:1.4")
@@ -717,6 +721,7 @@
@@ -718,6 +722,7 @@
optional("javax.el:javax.el-api:2.2.5")
optional("javax.faces:javax.faces-api:2.2")
optional("javax.validation:validation-api:1.0.0.GA")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment