README.adoc

@@ -176,6 +176,10 @@ Please note that the following Gradle tasks generate both indy and non indy vari
 
 The official CI server runs {groovy-ci}[here] and is sponsored by http://www.jetbrains.com[JetBrains].
 
+== Java Profiler
+
+Groovy core team tunes performance through YourKit Java Profiler, which is sponsored by https://www.yourkit.com[YourKit].
+
 == License
 
 Groovy is licensed under the terms of the http://www.apache.org/licenses/LICENSE-2.0.html[Apache License, Version 2.0]

build.gradle

@@ -36,7 +36,7 @@ buildscript {
         classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.7'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.0.3'
         classpath 'me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1'
-        //classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.1'
+        classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.1'
         //classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
         classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.1.3"
         classpath 'com.gradle:build-scan-plugin:1.8'
@@ -148,7 +148,7 @@ configurations {
 
 ext {
     antVersion = '1.9.4'
-    asmVersion = '6.0'
+    asmVersion = '6.1.1'
     antlrVersion = '2.7.7'
     coberturaVersion = '1.9.4.1'
     commonsCliVersion = '1.2'

debian/changelog

-groovy (2.4.15-4) UNRELEASED; urgency=medium
+groovy (2.4.16-1) unstable; urgency=medium
 
   * Team upload
 
@@ -14,7 +14,13 @@ groovy (2.4.15-4) UNRELEASED; urgency=medium
   * Add groovyConsole desktop file. (Closes: #879892)
     Thank you to Dirk Heinrichs for the patch and reminder.
 
- -- tony mancill <tmancill@debian.org>  Tue, 02 Oct 2018 17:04:35 -0700
+  [ Emmanuel Bourg ]
+  * New upstream release
+    - Refreshed the patches
+    - Updated the poms
+  * Fixed the build failure with Java 11 (Closes: #916840)
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 19 Dec 2018 14:42:03 +0100
 
 groovy (2.4.15-3) unstable; urgency=medium
 

debian/control

@@ -41,7 +41,7 @@ Package: groovy
 Architecture: all
 Depends:
  antlr,
- default-jre-headless (>= 2:1.6) | java6-runtime-headless,
+ default-jre-headless (>= 2:1.7) | java7-runtime-headless,
  ivy,
  junit4,
  libasm-java (>= 6.0~alpha-2~),

debian/maven.ignoreRules

@@ -2,6 +2,7 @@ com.github.lookfirst sardine
 com.googlecode openbeans
 gradle.plugin.org.nosphere.apache creadur-rat-gradle
 me.champeau.gradle gradle-javadoc-hotfix-plugin
+me.champeau.gradle japicmp-gradle-plugin
 net.sourceforge.cobertura cobertura
 org.asciidoctor asciidoctor-gradle-plugin
 org.codehaus.gpars gpars

debian/patches/09_ignore_buildscan.patch

@@ -4,7 +4,7 @@ Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
 @@ -39,24 +39,6 @@
-         //classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.1'
+         classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.1'
          //classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
          classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.1.3"
 -        classpath 'com.gradle:build-scan-plugin:1.8'

debian/patches/11_language_level.patch

+Description: Sets the Java language level to build with Java 11
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -60,8 +60,8 @@
+     apply plugin: 'java'
+ 
+     buildDir = 'target'
+-    sourceCompatibility = 1.6
+-    targetCompatibility = 1.6
++    sourceCompatibility = 7
++    targetCompatibility = 7
+ 
+     group = 'org.codehaus.groovy'
+     version = groovyVersion

debian/patches/12_java11_compatibility.patch

+Description: Fixes the compatibility with Java 11
+Origin: backport, https://github.com/apache/groovy/commit/90a852b1#diff-8e84f74cdcd98790e1e699f245b18ba1
+--- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxResources.java
++++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxResources.java
+@@ -41,7 +41,7 @@
+             // a security exception
+             SecurityManager mgr = System.getSecurityManager();
+             if (mgr != null) {
+-                mgr.checkSystemClipboardAccess();
++                mgr.checkPermission(new AWTPermission("accessClipboard"));
+             }
+             systemClipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+         }

debian/patches/series

@@ -9,3 +9,5 @@ transition_Gradle_3.1.patch
 08_GROOVY-8163.patch
 09_ignore_buildscan.patch
 10_fix_javadoc_links.patch
+11_language_level.patch
+12_java11_compatibility.patch

debian/poms/groovy-all.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.groovy</groupId>
   <artifactId>groovy-all</artifactId>
-  <version>2.4.15</version>
+  <version>2.4.16</version>
   <packaging>jar</packaging>
   <name>Apache Groovy</name>
   <description>Groovy: A powerful, dynamic language for the JVM</description>
@@ -537,6 +537,12 @@
     <contributor>
       <name>Thibault Kruse</name>
     </contributor>
+    <contributor>
+      <name>Tim Tiemens</name>
+    </contributor>
+    <contributor>
+      <name>Mike Spille</name>
+    </contributor>
     <contributor>
       <name>Paolo Di Tommaso</name>
     </contributor>
@@ -682,15 +688,15 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet.jsp-api</artifactId>
-      <version>2.3</version>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1</version>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
+      <version>2.3</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

debian/poms/groovy-ant.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.groovy</groupId>
   <artifactId>groovy-ant</artifactId>
-  <version>2.4.15</version>
+  <version>2.4.16</version>
   <packaging>jar</packaging>
   <name>Apache Groovy</name>
   <description>Groovy: A powerful, dynamic language for the JVM</description>
@@ -537,6 +537,12 @@
     <contributor>
       <name>Thibault Kruse</name>
     </contributor>
+    <contributor>
+      <name>Tim Tiemens</name>
+    </contributor>
+    <contributor>
+      <name>Mike Spille</name>
+    </contributor>
     <contributor>
       <name>Paolo Di Tommaso</name>
     </contributor>
@@ -609,7 +615,7 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -621,7 +627,7 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-groovydoc</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

debian/poms/groovy-bsf.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.groovy</groupId>
   <artifactId>groovy-bsf</artifactId>
-  <version>2.4.15</version>
+  <version>2.4.16</version>
   <packaging>jar</packaging>
   <name>Apache Groovy</name>
   <description>Groovy: A powerful, dynamic language for the JVM</description>
@@ -537,6 +537,12 @@
     <contributor>
       <name>Thibault Kruse</name>
     </contributor>
+    <contributor>
+      <name>Tim Tiemens</name>
+    </contributor>
+    <contributor>
+      <name>Mike Spille</name>
+    </contributor>
     <contributor>
       <name>Paolo Di Tommaso</name>
     </contributor>
@@ -627,7 +633,7 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

debian/poms/groovy-console.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.groovy</groupId>
   <artifactId>groovy-console</artifactId>
-  <version>2.4.15</version>
+  <version>2.4.16</version>
   <packaging>jar</packaging>
   <name>Apache Groovy</name>
   <description>Groovy: A powerful, dynamic language for the JVM</description>
@@ -537,6 +537,12 @@
     <contributor>
       <name>Thibault Kruse</name>
     </contributor>
+    <contributor>
+      <name>Tim Tiemens</name>
+    </contributor>
+    <contributor>
+      <name>Mike Spille</name>
+    </contributor>
     <contributor>
       <name>Paolo Di Tommaso</name>
     </contributor>
@@ -609,19 +615,19 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-swing</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-templates</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

debian/poms/groovy-docgenerator.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.groovy</groupId>
   <artifactId>groovy-docgenerator</artifactId>
-  <version>2.4.15</version>
+  <version>2.4.16</version>
   <packaging>jar</packaging>
   <name>Apache Groovy</name>
   <description>Groovy: A powerful, dynamic language for the JVM</description>
@@ -537,6 +537,12 @@
     <contributor>
       <name>Thibault Kruse</name>
     </contributor>
+    <contributor>
+      <name>Tim Tiemens</name>
+    </contributor>
+    <contributor>
+      <name>Mike Spille</name>
+    </contributor>
     <contributor>
       <name>Paolo Di Tommaso</name>
     </contributor>
@@ -609,13 +615,13 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-templates</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

debian/poms/groovy-groovydoc.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.groovy</groupId>
   <artifactId>groovy-groovydoc</artifactId>
-  <version>2.4.15</version>
+  <version>2.4.16</version>
   <packaging>jar</packaging>
   <name>Apache Groovy</name>
   <description>Groovy: A powerful, dynamic language for the JVM</description>
@@ -537,6 +537,12 @@
     <contributor>
       <name>Thibault Kruse</name>
     </contributor>
+    <contributor>
+      <name>Tim Tiemens</name>
+    </contributor>
+    <contributor>
+      <name>Mike Spille</name>
+    </contributor>
     <contributor>
       <name>Paolo Di Tommaso</name>
     </contributor>
@@ -609,13 +615,13 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-templates</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

debian/poms/groovy-groovysh.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.groovy</groupId>
   <artifactId>groovy-groovysh</artifactId>
-  <version>2.4.15</version>
+  <version>2.4.16</version>
   <packaging>jar</packaging>
   <name>Apache Groovy</name>
   <description>Groovy: A powerful, dynamic language for the JVM</description>
@@ -537,6 +537,12 @@
     <contributor>
       <name>Thibault Kruse</name>
     </contributor>
+    <contributor>
+      <name>Tim Tiemens</name>
+    </contributor>
+    <contributor>
+      <name>Mike Spille</name>
+    </contributor>
     <contributor>
       <name>Paolo Di Tommaso</name>
     </contributor>
@@ -609,13 +615,13 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-console</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

debian/poms/groovy-jmx.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.groovy</groupId>
   <artifactId>groovy-jmx</artifactId>
-  <version>2.4.15</version>
+  <version>2.4.16</version>
   <packaging>jar</packaging>
   <name>Apache Groovy</name>
   <description>Groovy: A powerful, dynamic language for the JVM</description>
@@ -537,6 +537,12 @@
     <contributor>
       <name>Thibault Kruse</name>
     </contributor>
+    <contributor>
+      <name>Tim Tiemens</name>
+    </contributor>
+    <contributor>
+      <name>Mike Spille</name>
+    </contributor>
     <contributor>
       <name>Paolo Di Tommaso</name>
     </contributor>
@@ -609,7 +615,7 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

debian/poms/groovy-json.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.groovy</groupId>
   <artifactId>groovy-json</artifactId>
-  <version>2.4.15</version>
+  <version>2.4.16</version>
   <packaging>jar</packaging>
   <name>Apache Groovy</name>
   <description>Groovy: A powerful, dynamic language for the JVM</description>
@@ -537,6 +537,12 @@
     <contributor>
       <name>Thibault Kruse</name>
     </contributor>
+    <contributor>
+      <name>Tim Tiemens</name>
+    </contributor>
+    <contributor>
+      <name>Mike Spille</name>
+    </contributor>
     <contributor>
       <name>Paolo Di Tommaso</name>
     </contributor>
@@ -609,7 +615,7 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

debian/poms/groovy-jsr223.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.groovy</groupId>
   <artifactId>groovy-jsr223</artifactId>
-  <version>2.4.15</version>
+  <version>2.4.16</version>
   <packaging>jar</packaging>
   <name>Apache Groovy</name>
   <description>Groovy: A powerful, dynamic language for the JVM</description>
@@ -537,6 +537,12 @@
     <contributor>
       <name>Thibault Kruse</name>
     </contributor>
+    <contributor>
+      <name>Tim Tiemens</name>
+    </contributor>
+    <contributor>
+      <name>Mike Spille</name>
+    </contributor>
     <contributor>
       <name>Paolo Di Tommaso</name>
     </contributor>
@@ -609,7 +615,7 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

debian/poms/groovy-nio.pom

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.codehaus.groovy</groupId>
   <artifactId>groovy-nio</artifactId>
-  <version>2.4.15</version>
+  <version>2.4.16</version>
   <packaging>jar</packaging>
   <name>Apache Groovy</name>
   <description>Groovy: A powerful, dynamic language for the JVM</description>
@@ -537,6 +537,12 @@
     <contributor>
       <name>Thibault Kruse</name>
     </contributor>
+    <contributor>
+      <name>Tim Tiemens</name>
+    </contributor>
+    <contributor>
+      <name>Mike Spille</name>
+    </contributor>
     <contributor>
       <name>Paolo Di Tommaso</name>
     </contributor>
@@ -609,7 +615,7 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
-      <version>2.4.15</version>
+      <version>2.4.16</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>