This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository groovy.
commit a0a548a36c72b9a8ccec68a51027e66a246188a0
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Sun Mar 11 00:29:44 2018 +0100
Refreshed the patches
---
debian/changelog | 2 +-
debian/patches/01_fix_doc_gradle.diff | 2 +-
debian/patches/07_servlet_api_compatibility.patch | 2 +-
debian/patches/08_GROOVY-8163.patch | 8 ++++----
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ed4c69b..7c91df0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-groovy (2.4.13-1) UNRELEASED; urgency=medium
+groovy (2.4.14-1) UNRELEASED; urgency=medium
* New upstream release
- Refreshed the patches
diff --git a/debian/patches/01_fix_doc_gradle.diff
b/debian/patches/01_fix_doc_gradle.diff
index a5149a3..baf83b7 100644
--- a/debian/patches/01_fix_doc_gradle.diff
+++ b/debian/patches/01_fix_doc_gradle.diff
@@ -10,7 +10,7 @@ Forwarded: not-needed
- if (JavaVersion.current().java7Compatible) {
- dependsOn 'asciidocAll', 'assembleAsciidoc'
- }
- ext.footer = 'Copyright © 2003-2017 The Apache Software Foundation.
All rights reserved.'
+ ext.footer = 'Copyright © 2003-2018 The Apache Software Foundation.
All rights reserved.'
ext.title = "Groovy ${groovyVersion}"
}
diff --git a/debian/patches/07_servlet_api_compatibility.patch
b/debian/patches/07_servlet_api_compatibility.patch
index 2d1d5eb..48128ab 100644
--- a/debian/patches/07_servlet_api_compatibility.patch
+++ b/debian/patches/07_servlet_api_compatibility.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: no
---
a/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java
+++
b/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java
-@@ -152,6 +152,20 @@
+@@ -154,6 +154,20 @@
public void write(byte[] b, int off, int len) throws
IOException {
getResponseStream().write(b, off, len);
}
diff --git a/debian/patches/08_GROOVY-8163.patch
b/debian/patches/08_GROOVY-8163.patch
index 4817104..eaf1565 100644
--- a/debian/patches/08_GROOVY-8163.patch
+++ b/debian/patches/08_GROOVY-8163.patch
@@ -26,7 +26,7 @@ Subject: [PATCH] GROOVY-8163: Prevent CachedField and
CachedMethod from
import org.codehaus.groovy.reflection.CachedClass;
import org.codehaus.groovy.reflection.CachedConstructor;
import org.codehaus.groovy.reflection.CachedField;
-@@ -1804,6 +1805,9 @@
+@@ -1798,6 +1799,9 @@
} catch (IllegalArgumentException e) {
// can't access the field directly but there may be a getter
mp = null;
@@ -172,7 +172,7 @@ Subject: [PATCH] GROOVY-8163: Prevent CachedField and
CachedMethod from
if (isFinal()) {
--- a/src/main/org/codehaus/groovy/reflection/CachedMethod.java
+++ b/src/main/org/codehaus/groovy/reflection/CachedMethod.java
-@@ -90,6 +90,12 @@
+@@ -95,6 +95,12 @@
public final Object invoke(Object object, Object[] arguments) {
try {
@@ -185,7 +185,7 @@ Subject: [PATCH] GROOVY-8163: Prevent CachedField and
CachedMethod from
return cachedMethod.invoke(object, arguments);
} catch (IllegalArgumentException e) {
throw new InvokerInvocationException(e);
-@@ -124,6 +130,7 @@
+@@ -129,6 +135,7 @@
}
public final Method setAccessible() {
@@ -193,7 +193,7 @@ Subject: [PATCH] GROOVY-8163: Prevent CachedField and
CachedMethod from
// if (queuedToCompile.compareAndSet(false,true)) {
// if (isCompilable())
// CompileThread.addMethod(this);
-@@ -324,6 +331,7 @@
+@@ -331,6 +338,7 @@
}
public Method getCachedMethod() {
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/groovy.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
