Skip to content
Commits on Source (7)
......@@ -62,11 +62,11 @@ configure(allprojects) { project ->
ext.jtaVersion = "1.2"
ext.junitVersion = "4.12"
ext.log4jVersion = "1.2.17"
ext.nettyVersion = "4.1.31.Final"
ext.nettyVersion = "4.1.32.Final"
ext.okhttpVersion = "2.7.5"
ext.okhttp3Version = "3.8.1"
ext.openjpaVersion = "2.4.2"
ext.poiVersion = "3.14"
ext.poiVersion = "3.17"
ext.reactorVersion = "2.0.8.RELEASE"
ext.romeVersion = "1.7.4"
ext.slf4jVersion = "1.7.25"
......@@ -75,7 +75,7 @@ configure(allprojects) { project ->
ext.testngVersion = "6.9.10"
ext.tiles2Version = "2.2.2"
ext.tiles3Version = "3.0.8"
ext.tomcatVersion = "8.5.35"
ext.tomcatVersion = "8.5.37"
ext.tyrusVersion = "1.3.5" // constrained by WebLogic 12.1.3 support
ext.undertowVersion = "1.3.33.Final"
ext.xmlunitVersion = "1.6"
......@@ -206,7 +206,8 @@ configure(allprojects) { project ->
"http://fasterxml.github.io/jackson-core/javadoc/2.8/",
"http://fasterxml.github.io/jackson-databind/javadoc/2.8/",
"http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.8/",
"http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/"
"http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/",
"https://junit.org/junit4/javadoc/${junitVersion}/"
] as String[]
}
......
libspring-java (4.3.22-1) unstable; 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
-- Emmanuel Bourg <ebourg@apache.org> Tue, 22 Jan 2019 21:44:42 +0100
libspring-java (4.3.21-2) unstable; urgency=medium
* Team upload.
......
......@@ -14,7 +14,7 @@ Build-Depends-Indep: bsh,
jruby (>= 1.7.19~),
junit4 (>= 4.5),
libactivation-java,
libapache-poi-java,
libapache-poi-java (>= 4.0),
libasm-java (>= 5.0),
libaspectj-java,
libatinject-jsr330-api-java,
......@@ -32,6 +32,7 @@ Build-Depends-Indep: bsh,
libecj-java,
libeclipselink-java,
libehcache-java,
libel-api-java,
libfreemarker-java,
libgeronimo-annotation-1.3-spec-java,
libgeronimo-commonj-spec-java (>= 1.1.1-3),
......@@ -65,6 +66,7 @@ Build-Depends-Indep: bsh,
libjpa-2.1-spec-java,
libjsf-api-java,
libjsonpath-java,
libjsp-api-java,
libjws-api-java,
libmail-java,
libnetty-java,
......@@ -74,14 +76,15 @@ Build-Depends-Indep: bsh,
libprotobuf-java-format-java (>= 1.3),
libquartz2-java,
libreactor-core-java (>= 2.0.8),
librome-java,
libservlet3.1-java,
librome-java (>= 1.6),
libservlet-api-java,
libtaglibs-standard-jstlel-java,
libtiles-java (>= 3.0),
libtomcat9-java,
libvelocity-tools-java (>= 2.0-3),
libwebjars-locator-java,
libwebjars-locator-core-java,
libwebsocket-api-java,
libxmlbeans-java,
libxmlunit-java,
libxstream-java,
......
......@@ -2,7 +2,6 @@ com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * *
com.fasterxml.jackson.dataformat jackson-dataformat-xml * s/.*/2.x/ * *
s/com.mchange/c3p0/ c3p0 * s/.*/debian/ * *
s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * *
javax.el javax.el-api * s/.*/3.0/ * *
s/javax.cache/org.apache.geronimo.specs/ s/cache-api/geronimo-jcache_1.0_spec/ * s/.*/debian/ * *
s/javax.enterprise.concurrent/org.apache.geronimo.specs/ s/javax.enterprise.concurrent-api/geronimo-concurrent_1.0_spec/ * s/.*/debian/ * *
s/javax.faces/com.sun.faces/ s/javax.faces-api/jsf-api/ * s/.*/debian/ * *
......@@ -10,11 +9,8 @@ s/javax.jms/org.apache.geronimo.specs/ s/jms-api/geronimo-jms_1.1_spec/ * s/.*/d
javax.portlet portlet-api * * * *
s/javax.resource/org.apache.geronimo.specs/ s/connector-api/geronimo-j2ee-connector_1.5_spec/ * s/.*/debian/ * *
s/javax.servlet.jsp.jstl/org.apache.taglibs/ s/javax.servlet.jsp.jstl-api/taglibs-standard-spec/ * s/.*/debian/ * *
javax.servlet javax.servlet-api * s/.*/3.1/ * *
javax.servlet.jsp javax.servlet.jsp-api * s/2.*/2.3/ * * *
s/javax.transaction/org.apache.geronimo.specs/ s/javax.transaction-api/geronimo-jta_1.2_spec/ * s/.*/debian/ * *
s/javax.validation/org.apache.geronimo.specs/ s/validation-api/geronimo-validation_1.0_spec/ * s/.*/debian/ * *
javax.websocket javax.websocket-api * * * *
junit junit * s/.*/4.x/ * *
log4j log4j * s/.*/1.2.x/ * *
org.apache.tomcat s/catalina/tomcat-catalina/ * s/.*/9.x/ * *
......@@ -32,5 +28,4 @@ s/velocity/org.apache.velocity/ velocity * s/.*/debian/ * *
org.apache.jdo parent-pom * * * *
org.yaml snakeyaml * s/.*/1.x/ * *
net.sf.ehcache s/ehcache/ehcache-core/ * s/.*/debian/ * *
s/com.rometools/rome/ rome * s/.*/debian/ * *
org.quartz-scheduler quartz * s/.*/2.x/ * *
......@@ -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 @@
}
......
Description: Use the older ROME API available in Debian
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
@@ -21,8 +21,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.rometools.rome.feed.atom.Entry;
-import com.rometools.rome.feed.atom.Feed;
+import com.sun.syndication.feed.atom.Entry;
+import com.sun.syndication.feed.atom.Feed;
/**
* Abstract superclass for Atom Feed views, using the
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
@@ -22,8 +22,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.rometools.rome.feed.WireFeed;
-import com.rometools.rome.io.WireFeedOutput;
+import com.sun.syndication.feed.WireFeed;
+import com.sun.syndication.io.WireFeedOutput;
import org.springframework.util.StringUtils;
import org.springframework.web.servlet.view.AbstractView;
--- a/spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java
@@ -23,10 +23,10 @@
import java.io.Writer;
import java.nio.charset.Charset;
-import com.rometools.rome.feed.WireFeed;
-import com.rometools.rome.io.FeedException;
-import com.rometools.rome.io.WireFeedInput;
-import com.rometools.rome.io.WireFeedOutput;
+import com.sun.syndication.feed.WireFeed;
+import com.sun.syndication.io.FeedException;
+import com.sun.syndication.io.WireFeedInput;
+import com.sun.syndication.io.WireFeedOutput;
import org.springframework.http.HttpInputMessage;
import org.springframework.http.HttpOutputMessage;
--- a/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
@@ -16,7 +16,7 @@
package org.springframework.http.converter.feed;
-import com.rometools.rome.feed.atom.Feed;
+import com.sun.syndication.feed.atom.Feed;
import org.springframework.http.MediaType;
--- a/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
@@ -16,7 +16,7 @@
package org.springframework.http.converter.feed;
-import com.rometools.rome.feed.rss.Channel;
+import com.sun.syndication.feed.rss.Channel;
import org.springframework.http.MediaType;
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
@@ -21,8 +21,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.rometools.rome.feed.rss.Channel;
-import com.rometools.rome.feed.rss.Item;
+import com.sun.syndication.feed.rss.Channel;
+import com.sun.syndication.feed.rss.Item;
import org.springframework.http.MediaType;
......@@ -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")
......
Description: Fixes the compatibility with the version of Apache POI in Debian
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractExcelView.java
@@ -217,7 +217,7 @@
* @param text the text to put in the cell
*/
protected void setText(HSSFCell cell, String text) {
- cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+ cell.setCellType(org.apache.poi.ss.usermodel.CellType.STRING);
cell.setCellValue(text);
}
......@@ -6,7 +6,6 @@
0035-ignore-asciidoctor-plugin.patch
0036-ignore-compilation-warnings.patch
0037-ignore-sonar-plugin.patch
0038-rome-compatibility.patch
0039-openjpa-compatibility.patch
0040-ignore-json-assert.patch
0041-servlet-api-compatibility.patch
......@@ -18,3 +17,4 @@
0047-ejb-api-compatibility.patch
0048-snakeyaml-compatibility.patch
0049-java11-compatibility.patch
0050-apache-poi-compatibility.patch
version=4.3.21.RELEASE
version=4.3.22.RELEASE