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 70ad13350365497d3ed14d15b637a4843ed79ecc Author: Emmanuel Bourg <[email protected]> Date: Thu Oct 22 00:14:43 2015 +0200 Removed the compatibility patches for Gradle < 1.7 --- debian/changelog | 1 + debian/control | 2 +- 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/0027-disable-jcache-support.patch | 4 ++-- debian/patches/0028-disable-jdiff-report.patch | 2 +- debian/patches/0029-use-jruby-core.patch | 2 +- debian/patches/0030-tomcat7-compatibility.patch | 22 +++++++++++----------- debian/patches/series | 3 --- 10 files changed, 17 insertions(+), 63 deletions(-) diff --git a/debian/changelog b/debian/changelog index f5b017a..2c0c581 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libspring-java (3.2.13-4) UNRELEASED; urgency=medium * Team upload. + * Removed the compatibility patches for Gradle < 1.7 * Removed the dependency on the Servlet API from the binary packages -- Emmanuel Bourg <[email protected]> Wed, 21 Oct 2015 23:32:19 +0200 diff --git a/debian/control b/debian/control index 78d480c..08411af 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: java Priority: extra Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Damien Raude-Morvan <[email protected]>, Miguel Landaeta <[email protected]> -Build-Depends: debhelper (>= 9), default-jdk (>= 1:1.6), gradle +Build-Depends: debhelper (>= 9), default-jdk (>= 1:1.6), gradle (>= 1.7) Build-Depends-Indep: bsh, glassfish-javaee, glassfish-toplink-essentials, diff --git a/debian/patches/0023-disable-testng-reports.patch b/debian/patches/0023-disable-testng-reports.patch deleted file mode 100644 index 4320870..0000000 --- a/debian/patches/0023-disable-testng-reports.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 <[email protected]> -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 deleted file mode 100644 index e74aed3..0000000 --- a/debian/patches/0024-gradle-1.5-compatibility.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 <[email protected]> -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 deleted file mode 100644 index 01fe911..0000000 --- a/debian/patches/0025-compiler-dependencies.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 <[email protected]> -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/0027-disable-jcache-support.patch b/debian/patches/0027-disable-jcache-support.patch index 7bb4b8b..022ec2a 100644 --- a/debian/patches/0027-disable-jcache-support.patch +++ b/debian/patches/0027-disable-jcache-support.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -470,7 +470,7 @@ +@@ -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") @@ -12,7 +12,7 @@ Forwarded: not-needed 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 @@ +@@ -489,6 +489,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 2e31e86..052728b 100644 --- a/debian/patches/0028-disable-jdiff-report.patch +++ b/debian/patches/0028-disable-jdiff-report.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -883,7 +883,7 @@ +@@ -882,7 +882,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 index 5428a86..23ad157 100644 --- a/debian/patches/0029-use-jruby-core.patch +++ b/debian/patches/0029-use-jruby-core.patch @@ -5,7 +5,7 @@ Last-Update: 2015-08-16 --- a/build.gradle +++ b/build.gradle -@@ -340,10 +340,10 @@ project("spring-context") { +@@ -339,10 +339,10 @@ optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.codehaus.groovy:groovy-all:1.x") optional("org.beanshell:bsh:debian") diff --git a/debian/patches/0030-tomcat7-compatibility.patch b/debian/patches/0030-tomcat7-compatibility.patch index a625638..1396dc5 100644 --- a/debian/patches/0030-tomcat7-compatibility.patch +++ b/debian/patches/0030-tomcat7-compatibility.patch @@ -4,7 +4,7 @@ Origin: upstream, https://github.com/spring-projects/spring-framework/commit/37f Last-Update: 2015-08-16 --- /dev/null -+++ libspring-java-3.2.13/spring-instrument-tomcat/src/main/java/org/apache/catalina/loader/WebappClassLoader.java ++++ b/spring-instrument-tomcat/src/main/java/org/apache/catalina/loader/WebappClassLoader.java @@ -0,0 +1,44 @@ +/* + * Copyright 2002-2015 the original author or authors. @@ -50,8 +50,8 @@ Last-Update: 2015-08-16 + } + +} ---- libspring-java-3.2.13.orig/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java -+++ libspring-java-3.2.13/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java +--- a/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java ++++ b/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. @@ -59,7 +59,7 @@ Last-Update: 2015-08-16 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. -@@ -30,11 +30,10 @@ import org.springframework.instrument.cl +@@ -30,11 +30,10 @@ * to loaded classes without the need to use a VM-wide agent. * * <p>To be registered using a @@ -74,7 +74,7 @@ Last-Update: 2015-08-16 * * <pre class="code"><Loader loaderClass="org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader"/></pre> * -@@ -44,10 +43,10 @@ import org.springframework.instrument.cl +@@ -44,10 +43,10 @@ * {@code getThrowawayClassLoader} methods mirror the corresponding methods * in the LoadTimeWeaver interface, as expected by ReflectiveLoadTimeWeaver. * @@ -89,7 +89,7 @@ Last-Update: 2015-08-16 * * @author Costin Leau * @author Juergen Hoeller -@@ -55,6 +54,7 @@ import org.springframework.instrument.cl +@@ -55,6 +54,7 @@ * @see #addTransformer * @see #getThrowawayClassLoader * @see org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver @@ -97,7 +97,7 @@ Last-Update: 2015-08-16 */ public class TomcatInstrumentableClassLoader extends WebappClassLoader { -@@ -103,13 +103,13 @@ public class TomcatInstrumentableClassLo +@@ -103,13 +103,13 @@ */ public ClassLoader getThrowawayClassLoader() { WebappClassLoader tempLoader = new WebappClassLoader(); @@ -113,7 +113,7 @@ Last-Update: 2015-08-16 protected ResourceEntry findResourceInternal(String name, String path) { ResourceEntry entry = super.findResourceInternal(name, path); if (entry != null && entry.binaryContent != null && path.endsWith(CLASS_SUFFIX)) { -@@ -119,11 +119,19 @@ public class TomcatInstrumentableClassLo +@@ -119,11 +119,19 @@ return entry; } @@ -136,9 +136,9 @@ Last-Update: 2015-08-16 } ---- libspring-java-3.2.13.orig/build.gradle -+++ libspring-java-3.2.13/build.gradle -@@ -317,6 +317,10 @@ project("spring-instrument-tomcat") { +--- a/build.gradle ++++ b/build.gradle +@@ -316,6 +316,10 @@ dependencies { provided("org.apache.tomcat:tomcat-catalina:8.x") } diff --git a/debian/patches/series b/debian/patches/series index 14eb911..e15ddb1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,9 +5,6 @@ 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
