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 f4c7da22063ed05a2c81c55cb75938528dc1a3ff Author: Emmanuel Bourg <[email protected]> Date: Wed Aug 3 20:11:50 2016 +0200 Refreshed the patches --- debian/changelog | 8 +++++++ debian/patches/0003_no_ibm_websphere.diff | 4 ++-- debian/patches/0005_commonj.diff | 6 +++--- .../0022-ignore-docbook-reference-plugin.patch | 8 +++---- debian/patches/0028-disable-jdiff-report.patch | 2 +- .../0034-velocity-tools-compatibility.patch | 2 +- .../patches/0035-ignore-asciidoctor-plugin.patch | 2 +- .../patches/0036-ignore-compilation-warnings.patch | 2 +- debian/patches/0037-ignore-sonar-plugin.patch | 25 +++++++++++++++------- debian/patches/0039-openjpa-compatibility.patch | 2 +- .../patches/0041-servlet-api-compatibility.patch | 2 +- debian/patches/0042-ignore-money-api.patch | 2 +- debian/patches/0043-ignore-okhttp.patch | 4 ++-- debian/patches/0044-ignore-httpunit.patch | 2 +- 14 files changed, 44 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index 943b9ff..dd9a701 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libspring-java (4.3.2-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release + - Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Wed, 03 Aug 2016 19:55:28 +0200 + libspring-java (4.2.7-1) unstable; urgency=medium * Team upload. diff --git a/debian/patches/0003_no_ibm_websphere.diff b/debian/patches/0003_no_ibm_websphere.diff index 625fb1a..3719f73 100644 --- a/debian/patches/0003_no_ibm_websphere.diff +++ b/debian/patches/0003_no_ibm_websphere.diff @@ -4,9 +4,9 @@ Last-Update: 2010-06-20 Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -546,6 +546,15 @@ - testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") +@@ -550,6 +550,15 @@ testCompile("org.eclipse.persistence:javax.persistence:2.0.0") + testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}") } + + sourceSets { diff --git a/debian/patches/0005_commonj.diff b/debian/patches/0005_commonj.diff index aef40fa..7bd5228 100644 --- a/debian/patches/0005_commonj.diff +++ b/debian/patches/0005_commonj.diff @@ -9,10 +9,10 @@ Forwarded: no --- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/WorkManagerTaskExecutor.java -@@ -120,20 +120,22 @@ +@@ -137,20 +137,22 @@ public void execute(Runnable task) { Assert.state(this.workManager != null, "No WorkManager specified"); - Work work = new DelegatingWork(task); + Work work = new DelegatingWork(this.taskDecorator != null ? this.taskDecorator.decorate(task) : task); - try { + //try { if (this.workListener != null) { @@ -34,7 +34,7 @@ Forwarded: no } @Override -@@ -183,12 +185,12 @@ +@@ -200,12 +202,12 @@ //------------------------------------------------------------------------- @Override diff --git a/debian/patches/0022-ignore-docbook-reference-plugin.patch b/debian/patches/0022-ignore-docbook-reference-plugin.patch index 932cf71..e9e5d1b 100644 --- a/debian/patches/0022-ignore-docbook-reference-plugin.patch +++ b/debian/patches/0022-ignore-docbook-reference-plugin.patch @@ -4,7 +4,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -1156,7 +1156,6 @@ +@@ -1147,7 +1147,6 @@ description = "Spring Framework" apply plugin: "org.asciidoctor.convert" @@ -12,7 +12,7 @@ Forwarded: not-needed apply plugin: "groovy" // apply plugin: "detect-split-packages" -@@ -1170,13 +1169,6 @@ +@@ -1161,13 +1160,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") } } -@@ -1250,7 +1242,7 @@ +@@ -1241,7 +1233,7 @@ } } @@ -35,7 +35,7 @@ Forwarded: not-needed group = "Distribution" baseName = "spring-framework" classifier = "docs" -@@ -1264,10 +1256,6 @@ +@@ -1255,10 +1247,6 @@ from (api) { into "javadoc-api" } diff --git a/debian/patches/0028-disable-jdiff-report.patch b/debian/patches/0028-disable-jdiff-report.patch index ef33fc1..1e17958 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 -@@ -1159,7 +1159,7 @@ +@@ -1150,7 +1150,7 @@ apply plugin: "groovy" // apply plugin: "detect-split-packages" diff --git a/debian/patches/0034-velocity-tools-compatibility.patch b/debian/patches/0034-velocity-tools-compatibility.patch index 55f820b..3e86a65 100644 --- a/debian/patches/0034-velocity-tools-compatibility.patch +++ b/debian/patches/0034-velocity-tools-compatibility.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: no --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityToolboxView.java -@@ -108,7 +108,7 @@ +@@ -110,7 +110,7 @@ if (getToolboxConfigLocation() != null) { ToolboxManager toolboxManager = ServletToolboxManager.getInstance( getServletContext(), getToolboxConfigLocation()); diff --git a/debian/patches/0035-ignore-asciidoctor-plugin.patch b/debian/patches/0035-ignore-asciidoctor-plugin.patch index a0b2475..a3956f2 100644 --- a/debian/patches/0035-ignore-asciidoctor-plugin.patch +++ b/debian/patches/0035-ignore-asciidoctor-plugin.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -1155,24 +1155,11 @@ +@@ -1146,24 +1146,11 @@ configure(rootProject) { description = "Spring Framework" diff --git a/debian/patches/0036-ignore-compilation-warnings.patch b/debian/patches/0036-ignore-compilation-warnings.patch index d1cfcf1..52691fc 100644 --- a/debian/patches/0036-ignore-compilation-warnings.patch +++ b/debian/patches/0036-ignore-compilation-warnings.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: no --- a/build.gradle +++ b/build.gradle -@@ -91,7 +91,7 @@ +@@ -97,7 +97,7 @@ "-Xlint:dep-ann", "-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", "-Xlint:overrides", "-Xlint:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:fallthrough", "-Xlint:rawtypes", "-Xlint:deprecation", diff --git a/debian/patches/0037-ignore-sonar-plugin.patch b/debian/patches/0037-ignore-sonar-plugin.patch index 8de0e4e..bbb7493 100644 --- a/debian/patches/0037-ignore-sonar-plugin.patch +++ b/debian/patches/0037-ignore-sonar-plugin.patch @@ -3,14 +3,23 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -1136,22 +1136,6 @@ +@@ -10,10 +10,6 @@ } } --apply plugin: 'sonar-runner' +-plugins { +- id "org.sonarqube" version "1.1" +-} - --sonarRunner { -- sonarProperties { + ext { + linkHomepage = 'https://projects.spring.io/spring-framework' + linkCi = 'https://build.spring.io/browse/SPR' +@@ -1129,20 +1125,6 @@ + } + } + +-sonarqube { +- properties { - property "sonar.projectName", "Spring Framework" - property "sonar.profile", "Spring Framework" - property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec" @@ -26,19 +35,19 @@ Forwarded: not-needed configure(rootProject) { description = "Spring Framework" -@@ -1367,21 +1351,6 @@ +@@ -1358,21 +1340,6 @@ } -configure([project(':spring-build-src'), project(':spring-framework-bom')]) { -- sonarRunner { +- sonarqube { - skipProject = true - } -} - -configure(project(':spring-core')) { -- sonarRunner { -- sonarProperties { +- sonarqube { +- properties { - property "sonar.exclusions", - "src/main/java/org/springframework/cglib/**/*,src/main/java/org/springframework/asm/**/*" - } diff --git a/debian/patches/0039-openjpa-compatibility.patch b/debian/patches/0039-openjpa-compatibility.patch index 0b291d4..6844621 100644 --- a/debian/patches/0039-openjpa-compatibility.patch +++ b/debian/patches/0039-openjpa-compatibility.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -766,6 +766,7 @@ +@@ -756,6 +756,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' } diff --git a/debian/patches/0041-servlet-api-compatibility.patch b/debian/patches/0041-servlet-api-compatibility.patch index afaa761..168a45b 100644 --- a/debian/patches/0041-servlet-api-compatibility.patch +++ b/debian/patches/0041-servlet-api-compatibility.patch @@ -91,7 +91,7 @@ Forwarded: no } --- a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java -@@ -680,4 +680,8 @@ +@@ -677,4 +677,8 @@ throw new UnsupportedOperationException(); } diff --git a/debian/patches/0042-ignore-money-api.patch b/debian/patches/0042-ignore-money-api.patch index fd52618..e238a16 100644 --- a/debian/patches/0042-ignore-money-api.patch +++ b/debian/patches/0042-ignore-money-api.patch @@ -29,7 +29,7 @@ Forwarded: not-needed // just handling JSR-310 specific date and time types --- a/build.gradle +++ b/build.gradle -@@ -487,6 +487,14 @@ +@@ -488,6 +488,14 @@ testCompile("org.apache.commons:commons-pool2:2.4.2") testCompile("org.slf4j:slf4j-api:${slf4jVersion}") } diff --git a/debian/patches/0043-ignore-okhttp.patch b/debian/patches/0043-ignore-okhttp.patch index fa4208b..7390ebb 100644 --- a/debian/patches/0043-ignore-okhttp.patch +++ b/debian/patches/0043-ignore-okhttp.patch @@ -3,8 +3,8 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -742,6 +742,14 @@ - testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2Version}") +@@ -733,6 +733,14 @@ + testCompile("com.fasterxml.jackson.module:jackson-module-kotlin:${jackson2Version}") testRuntime("com.sun.mail:javax.mail:${javamailVersion}") } + diff --git a/debian/patches/0044-ignore-httpunit.patch b/debian/patches/0044-ignore-httpunit.patch index da0a8b5..f2aa3cf 100644 --- a/debian/patches/0044-ignore-httpunit.patch +++ b/debian/patches/0044-ignore-httpunit.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -1063,6 +1063,15 @@ +@@ -1052,6 +1052,15 @@ testRuntime("org.terracotta:management-model:2.0.0") } -- 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
