[libspring-java] 02/03: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Apr 27 21:14:04 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 56cb06f45154f90d79dbca789a14d13deaec91e9
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Apr 27 22:54:00 2015 +0200
Refreshed the patches
---
debian/changelog | 8 +++++
debian/patches/0021-use-system-dependencies.patch | 36 +++++++++++------------
debian/patches/0026-derby-compatibility.patch | 4 +--
debian/patches/0027-disable-jcache-support.patch | 4 +--
4 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8d615eb..b2b7d6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libspring-java (3.2.13-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 27 Apr 2015 22:53:03 +0200
+
libspring-java (3.2.12-1) experimental; urgency=medium
* Team upload.
diff --git a/debian/patches/0021-use-system-dependencies.patch b/debian/patches/0021-use-system-dependencies.patch
index c0db704..9061080 100644
--- a/debian/patches/0021-use-system-dependencies.patch
+++ b/debian/patches/0021-use-system-dependencies.patch
@@ -6,8 +6,8 @@ Forwarded: not-needed
@@ -1,6 +1,7 @@
buildscript {
repositories {
- maven { url "http://repo.springsource.org/plugins-release" }
-+ maven { url "file://usr/share/maven-repo" }
+ 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")
@@ -29,7 +29,7 @@ Forwarded: not-needed
@@ -75,6 +76,7 @@
repositories {
- maven { url "http://repo.spring.io/libs-release" }
+ maven { url "https://repo.spring.io/libs-release" }
+ maven { url "file://usr/share/maven-repo" }
}
@@ -129,7 +129,7 @@ Forwarded: not-needed
@@ -361,12 +367,12 @@
optional(project(":spring-aop"))
- optional(project(":spring-context")) // for JCA, @EnableTransactionManagement
+ 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")
@@ -191,7 +191,7 @@ Forwarded: not-needed
@@ -444,12 +450,12 @@
compile(project(":spring-core"))
compile(project(":spring-tx"))
- optional(project(":spring-context")) // for JndiDataSourceLookup
+ 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}")
@@ -213,8 +213,8 @@ Forwarded: not-needed
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(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")
@@ -230,29 +230,29 @@ Forwarded: not-needed
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("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("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-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(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")
@@ -337,8 +337,8 @@ Forwarded: not-needed
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(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")
@@ -462,9 +462,9 @@ Forwarded: not-needed
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
+ 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")
diff --git a/debian/patches/0026-derby-compatibility.patch b/debian/patches/0026-derby-compatibility.patch
index 51dd56d..6076f62 100644
--- a/debian/patches/0026-derby-compatibility.patch
+++ b/debian/patches/0026-derby-compatibility.patch
@@ -2,11 +2,11 @@ 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 @@
+@@ -84,16 +84,6 @@
logger.warn("Could not shutdown in-memory Derby database", ex);
return;
}
-- if (!IS_AT_LEAST_DOT_SIX) {
+- if (!isAtLeastDotSix) {
- // Explicitly purge the in-memory database, to prevent it
- // from hanging around after being shut down.
- try {
diff --git a/debian/patches/0027-disable-jcache-support.patch b/debian/patches/0027-disable-jcache-support.patch
index 6261d50..7bb4b8b 100644
--- a/debian/patches/0027-disable-jcache-support.patch
+++ b/debian/patches/0027-disable-jcache-support.patch
@@ -4,8 +4,8 @@ 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(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")
--
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