Hello community, here is the log from the commit of package groovy for openSUSE:Factory checked in at 2019-12-09 21:36:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/groovy (Old) and /work/SRC/openSUSE:Factory/.groovy.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "groovy" Mon Dec 9 21:36:20 2019 rev:3 rq:755232 version:2.4.16 Changes: -------- --- /work/SRC/openSUSE:Factory/groovy/groovy.changes 2019-12-02 11:38:25.626461764 +0100 +++ /work/SRC/openSUSE:Factory/.groovy.new.4691/groovy.changes 2019-12-09 21:36:36.518065420 +0100 @@ -1,0 +2,18 @@ +Mon Dec 9 12:21:54 UTC 2019 - Fridrich Strba <[email protected]> + +- Update to upstream version 2.4.16 +- Modified patches: + * 0002-Gradle-local-mode.patch + * 0003-Bintray.patch + + Rediff to changed context +- Added patches: + * groovy-buildscan.patch + + Disable build-scan plugin during the build + * groovy-java11.patch + + Fixes compatibility with Java 11 + * groovy-source-levels.patch + + Set the language level to 7 in order to allow building + with Java 11 +- Build with Java 11 + +------------------------------------------------------------------- Old: ---- apache-groovy-src-2.4.8.zip groovy-all-2.4.8.pom New: ---- apache-groovy-src-2.4.16.zip groovy-all-2.4.16.pom groovy-buildscan.patch groovy-java11.patch groovy-source-levels.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ groovy.spec ++++++ --- /var/tmp/diff_new_pack.zV59eQ/_old 2019-12-09 21:36:37.330065101 +0100 +++ /var/tmp/diff_new_pack.zV59eQ/_new 2019-12-09 21:36:37.338065097 +0100 @@ -17,7 +17,7 @@ Name: groovy -Version: 2.4.8 +Version: 2.4.16 Release: 0 Summary: Dynamic language for the Java Platform License: Apache-2.0 AND BSD-3-Clause AND EPL-1.0 AND SUSE-Public-Domain AND CC-BY-2.5 @@ -37,6 +37,9 @@ Patch5: 0006-Disable-artifactory-publish.patch Patch6: 0007-Fix-missing-extension-definitions.patch Patch7: groovy-overview.patch +Patch8: groovy-buildscan.patch +Patch9: groovy-java11.patch +Patch10: groovy-source-levels.patch BuildRequires: ant BuildRequires: ant-antlr BuildRequires: antlr @@ -90,7 +93,6 @@ Requires: %{name}-xml = %{version}-%{release} # optional in pom.xml, but present in upstream binary tarball Requires: xpp3-minimal -BuildConflicts: java-devel >= 9 #!BuildRequires: eclipse-platform gradle-bootstrap groovy-bootstrap gpars BuildArch: noarch @@ -243,6 +245,9 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 %{mvn_package} ':groovy::indy:' %{mvn_package} ':groovy-{*}' @1 ++++++ 0002-Gradle-local-mode.patch ++++++ --- /var/tmp/diff_new_pack.zV59eQ/_old 2019-12-09 21:36:37.358065090 +0100 +++ /var/tmp/diff_new_pack.zV59eQ/_new 2019-12-09 21:36:37.358065090 +0100 @@ -1,20 +1,6 @@ -From 41cf7f90856a5cd564964f734aa70a6ad5e74841 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski <[email protected]> -Date: Thu, 23 Oct 2014 14:44:25 +0200 -Subject: [PATCH 2/6] Gradle local mode - ---- - build.gradle | 26 +------- - gradle/codehaus.gradle | 1 + - gradle/quality.gradle | 164 ------------------------------------------------- - gradle/utils.gradle | 1 + - 4 files changed, 5 insertions(+), 187 deletions(-) - -diff --git a/build.gradle b/build.gradle -index c2e095a..c049f93 100644 --- a/build.gradle +++ b/build.gradle -@@ -18,27 +18,8 @@ +@@ -18,29 +18,8 @@ */ buildscript { repositories { @@ -34,12 +20,14 @@ - } - - dependencies { -- classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.2' +- 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' +- classpath 'me.champeau.gradle:buildscan-recipes-plugin:0.2.0' } } @@ -68,8 +56,14 @@ // todo Some repos are needed only for some configs. Declare them just for the configuration once Gradle allows this. maven { url 'http://repository.jboss.org/nexus/content/groups/m2-release-proxy' } // examples, tools } -diff --git a/gradle/codehaus.gradle b/gradle/codehaus.gradle -index 6ed3616..1c647cc 100644 +@@ -468,7 +468,6 @@ + apply from: 'gradle/idea.gradle' + apply from: 'gradle/eclipse.gradle' + apply from: 'gradle/codehaus.gradle' +-apply from: 'gradle/quality.gradle' + + // If a local configuration file for tweaking the build is present, apply it + if (file('user.gradle').exists()) { --- a/gradle/codehaus.gradle +++ b/gradle/codehaus.gradle @@ -22,6 +22,7 @@ import groovy.io.* @@ -80,180 +74,6 @@ mavenCentral() } dependencies { -diff --git a/gradle/quality.gradle b/gradle/quality.gradle -index bc8e85e..e58a764 100644 ---- a/gradle/quality.gradle -+++ b/gradle/quality.gradle -@@ -18,167 +18,3 @@ - */ - import groovy.text.markup.MarkupTemplateEngine - import groovy.text.markup.TemplateConfiguration -- --allprojects { -- apply plugin: "org.nosphere.apache.rat" -- //apply plugin: "com.github.hierynomus.license" -- apply plugin: 'checkstyle' -- apply plugin: 'codenarc' -- apply plugin: 'findbugs' -- configurations.codenarc { -- // because we will rely on the version we build -- // because version ranges are evil -- // and because it causes bnd to be brought transitively -- // I am unsure why; says it is required by groovy-ant but its pom.xml does not declare so -- exclude group:'org.codehaus.groovy' -- } -- --// license { --// header rootProject.file('config/licensing/HEADER.txt') --// include "**/*.groovy" --// include "**/*.java" --// include "**/*.properties" --// include "**/*.js" --// include "**/*.css" --// include "**/*.html" --// include "**/*.gradle" --// include "**/*.xml" --// exclude "org/codehaus/groovy/antlr/**" --// exclude 'reloading/**' // test resources for documentation of reloading --// exclude 'includes/**' // documentation resources included as snippets of code --// //dryRun = true --// ignoreFailures = true --// //skipExistingHeaders = true --// //ext.year = Calendar.instance.get(Calendar.YEAR) --// } -- -- // don't fail build on CodeNarc tasks -- tasks.withType(CodeNarc) { -- ignoreFailures = true -- configFile = file("$rootProject.projectDir/config/codenarc/codenarc.groovy") -- codenarcClasspath = rootProject.sourceSets.main.output + -- project(':groovy-templates').sourceSets.main.output + -- project(':groovy-xml').sourceSets.main.output + -- configurations.compile + -- files(configurations.codenarc.findAll { !(it.name =~ /groovy|junit/)}) -- } -- -- tasks.withType(Checkstyle) { -- showViolations = false -- ignoreFailures = true -- configFile = file("$rootProject.projectDir/config/checkstyle/checkstyle.xml") -- configProperties = ['rootProject.projectDir': rootProject.projectDir] -- def reportFile = file("${buildDir}/reports/checkstyle/${name}.xml") -- source = sourceSets.main.allJava.matching { -- // TODO why doesn't this exclusion work? -- exclude '**/generated-sources/**/*' -- } -- reports { -- include ( '**/*.java') -- xml { -- destination reportFile -- } -- } -- task("${name}Report") { -- def configDir = file("$rootProject.projectDir/config/checkstyle") -- def templateFile = 'checkstyle-report.groovy' -- def htmlReportFile = file("${buildDir}/reports/checkstyle/${name}.html") -- inputs.file file("$configDir/$templateFile") -- inputs.file reportFile -- outputs.file htmlReportFile -- -- doLast { -- if (reportFile.exists()) { -- def templateConfiguration = new TemplateConfiguration() -- templateConfiguration.with { -- autoIndent = true -- autoNewLine = true -- } -- def engine = new MarkupTemplateEngine(this.class.classLoader, configDir, templateConfiguration) -- def xml = new XmlSlurper().parse(reportFile.newReader('utf-8')) -- def files = [] -- xml.file.each { f -> -- // TODO remove generated-sources check once exclude above works -- if (f.error.size() && [email protected]().contains('generated-sources')) { -- files << [ -- name: [email protected](), -- errors: f.error.collect { e -> -- def rule = [email protected]() -- rule = rule.substring(rule.lastIndexOf('.')+1) -- [line: [email protected](), -- column: [email protected](), -- message: [email protected](), -- source: rule, -- severity: [email protected]()] -- }] -- } -- } -- def model = [ -- project: project, -- files: files -- ] -- htmlReportFile.withWriter('utf-8') { wrt -> -- engine.createTemplateByPath('checkstyle-report.groovy').make(model).writeTo(wrt) -- } -- } -- } -- } -- finalizedBy "${name}Report" -- } -- -- findbugs { -- // continue build despite findbug warnings -- ignoreFailures = true -- sourceSets = [sourceSets.main] -- } -- tasks.withType(FindBugs) { -- effort = 'max' -- reports { -- xml.enabled = false -- html.enabled = true -- } -- } --} -- --subprojects { sp -> -- def extras = [] -- switch(sp.name) { -- case 'groovy-templates': -- extras = [ -- // test files -- 'src/spec/test-resources/*.txt', -- 'src/test/resources/includes/hello-escaped.txt', -- 'src/test/resources/includes/hello.html' -- ] -- break; -- case ['groovy-groovydoc', 'groovy-docgenerator']: -- extras = [ -- '**/stylesheet.css' // MIT license as per NOTICE/LICENSE files -- ] -- break; -- } -- rat { -- inputDir = sp.projectDir.absolutePath -- excludes = [ 'target/**', '.gradle/**', '*.iml', '.classpath', '.project', '.settings/**', 'bin/**' , *extras] -- } --} -- --rat { -- excludes = [ 'subprojects/**', // covered above -- 'benchmark/**', // benchmarking files excluded from src zip -- 'config/**', -- 'src/test/org/codehaus/groovy/ast/LineColumnCheck.txt', // test file -- 'security/groovykeys', // excluded from src zip -- '**/.gradle/**', '**/wrapper/**', 'gradlew*', // gradle wrapper files excluded from src zip -- 'gradle.properties', // artifactory release plugin removes header when bumping version -- '**/target/**', 'licenses/**', 'notices/**', -- 'out/**', '*.ipr', '**/*.iml', '*.iws', // Intellij files -- '**/style.css', // MIT license as per NOTICE/LICENSE files -- '**/jquery-2.1.1.min.js', // MIT license as per NOTICE/LICENSE files -- '.classpath', '.project', '.settings/**', 'bin/**', // Eclipse files -- ] --} -- --apply from: 'gradle/jacoco/jacoco.gradle' --// Temporarily disabled because of conflict --//apply from: 'gradle/binarycompatibility.gradle' -diff --git a/gradle/utils.gradle b/gradle/utils.gradle -index b485933..81d1311 100644 --- a/gradle/utils.gradle +++ b/gradle/utils.gradle @@ -32,6 +32,7 @@ import static org.objectweb.asm.Opcodes.V1_5 @@ -264,6 +84,3 @@ mavenCentral() } dependencies { --- -2.9.3 - ++++++ 0003-Bintray.patch ++++++ --- /var/tmp/diff_new_pack.zV59eQ/_old 2019-12-09 21:36:37.366065086 +0100 +++ /var/tmp/diff_new_pack.zV59eQ/_new 2019-12-09 21:36:37.370065085 +0100 @@ -1,19 +1,6 @@ -From f6fc82767bd6e4c52b5eb78fb8162bd4c72b5569 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski <[email protected]> -Date: Fri, 24 Oct 2014 14:25:15 +0200 -Subject: [PATCH 3/6] Bintray - ---- - build.gradle | 9 --------- - gradle/docs.gradle | 21 +-------------------- - gradle/upload.gradle | 8 +------- - 3 files changed, 2 insertions(+), 36 deletions(-) - -diff --git a/build.gradle b/build.gradle -index c049f93..fdbe73b 100644 --- a/build.gradle +++ b/build.gradle -@@ -26,7 +26,6 @@ buildscript { +@@ -46,7 +46,6 @@ apply from: 'gradle/filter.gradle' apply from: 'gradle/indy.gradle' apply from: 'gradle/publish.gradle' @@ -21,7 +8,7 @@ File javaHome = new File(System.getProperty('java.home')) logger.lifecycle "Using Java from $javaHome (version ${System.getProperty('java.version')})" -@@ -167,11 +166,6 @@ dependencies { +@@ -186,11 +185,7 @@ testCompile "com.thoughtworks.qdox:qdox:$qdoxVersion" tools "com.googlecode.jarjar:jarjar:$jarjarVersion" @@ -30,21 +17,20 @@ - exclude(module: 'asm') - exclude(module: 'ant') - } - tools "org.ow2.asm:asm-all:$asmVersion" ++ tools "org.ow2.asm:asm-commons:$asmVersion" + tools "org.ow2.asm:asm:$asmVersion" tools "com.thoughtworks.qdox:qdox:$qdoxVersion" -@@ -437,9 +431,6 @@ apply from: 'gradle/groovydoc.gradle' +@@ -447,9 +441,6 @@ apply from: 'gradle/docs.gradle' apply from: 'gradle/assemble.gradle' apply from: 'gradle/upload.gradle' -apply from: 'gradle/idea.gradle' -apply from: 'gradle/eclipse.gradle' -apply from: 'gradle/codehaus.gradle' - apply from: 'gradle/quality.gradle' // If a local configuration file for tweaking the build is present, apply it -diff --git a/gradle/docs.gradle b/gradle/docs.gradle -index ef761c9..83ea5f0 100644 + if (file('user.gradle').exists()) { --- a/gradle/docs.gradle +++ b/gradle/docs.gradle @@ -17,24 +17,10 @@ @@ -54,7 +40,7 @@ - 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}" } @@ -72,7 +58,7 @@ def javadocSpec = { maxMemory = javaDoc_mx project.configure(options) { -@@ -187,11 +173,6 @@ task docGDK { +@@ -190,11 +176,6 @@ } } @@ -84,44 +70,32 @@ if (JavaVersion.current().isJava7Compatible()) { javadocAll.options.source = '1.7' } -@@ -203,4 +184,4 @@ if (JavaVersion.current().isJava8Compatible()) { - options.addStringOption('Xdoclint:none', '-quiet') - } - } --} -\ No newline at end of file -+} -diff --git a/gradle/upload.gradle b/gradle/upload.gradle -index 50926ec..42e8c28 100644 --- a/gradle/upload.gradle +++ b/gradle/upload.gradle -@@ -91,15 +91,12 @@ allprojects { +@@ -94,15 +94,12 @@ - artifacts { - archives jar -- archives sourceJar -- archives javadocJar -- archives groovydocJar - } + artifacts { + archives jar +- archives sourceJar +- archives javadocJar +- archives groovydocJar + } - [uploadArchives, install]*.with { - // dependency on jarAllAll should in theory be replaced with jar, jarWithIndy but - // in practice, it is faster -- dependsOn([jarAllAll, sourceJar, javadocJar, groovydocJar]) + [uploadArchives, install]*.with { + // dependency on jarAllAll should in theory be replaced with jar, jarWithIndy but + // in practice, it is faster +- dependsOn([jarAllAll, sourceJar, javadocJar, groovydocJar]) + dependsOn([jarAllAll]) - doFirst { - if (rootProject.useIndy()) { - new GradleException('You cannot use uploadArchives or install task with the flag [indy] turned' -@@ -121,9 +118,6 @@ allprojects { - // gradle doesn't expect us to mutate configurations like we do here - // so signing the configuration won't work and we do it manually here - signArchiveTask(jar) -- signArchiveTask(sourceJar) -- signArchiveTask(javadocJar) -- signArchiveTask(groovydocJar) - def indyJar = rootProject.ext.deriveFile(jar.archivePath, 'indy') - if (indyJar.exists()) { - signWithClassifier('indy', indyJar) --- -2.9.3 - + doFirst { + if (rootProject.useIndy()) { + new GradleException('You cannot use uploadArchives or install task with the flag [indy] turned' +@@ -124,9 +121,6 @@ + // gradle doesn't expect us to mutate configurations like we do here + // so signing the configuration won't work and we do it manually here + signArchiveTask(jar) +- signArchiveTask(sourceJar) +- signArchiveTask(javadocJar) +- signArchiveTask(groovydocJar) + def indyJar = rootProject.ext.deriveFile(jar.archivePath, 'indy') + if (indyJar.exists()) { + signWithClassifier('indy', indyJar) ++++++ groovy-all-2.4.8.pom -> groovy-all-2.4.16.pom ++++++ --- /work/SRC/openSUSE:Factory/groovy/groovy-all-2.4.8.pom 2019-11-19 13:44:51.752399984 +0100 +++ /work/SRC/openSUSE:Factory/.groovy.new.4691/groovy-all-2.4.16.pom 2019-12-09 21:36:36.330065495 +0100 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> - <version>2.4.8</version> + <version>2.4.16</version> <packaging>jar</packaging> <name>Apache Groovy</name> <description>Groovy: A powerful, dynamic language for the JVM</description> @@ -20,21 +20,11 @@ <distribution>repo</distribution> </license> </licenses> - <mailingLists> - <mailingList> - <name>Groovy Developer List</name> - <archive>http://mail-archives.apache.org/mod_mbox/groovy-dev/</archive> - </mailingList> - <mailingList> - <name>Groovy User List</name> - <archive>http://mail-archives.apache.org/mod_mbox/groovy-users/</archive> - </mailingList> - </mailingLists> <developers> <developer> <id>glaforge</id> <name>Guillaume Laforge</name> - <organization>org.apache.maven.model.Organization@239556d2</organization> + <organization>org.apache.maven.model.Organization@1b374774</organization> <roles> <role>Project Manager</role> <role>Despot</role> @@ -45,7 +35,7 @@ <id>bob</id> <name>bob mcwhirter</name> <email>[email protected]</email> - <organization>org.apache.maven.model.Organization@4e6ce75d</organization> + <organization>org.apache.maven.model.Organization@4ef55508</organization> <roles> <role>Founder</role> </roles> @@ -54,7 +44,7 @@ <id>jstrachan</id> <name>James Strachan</name> <email>[email protected]</email> - <organization>org.apache.maven.model.Organization@4fe62df6</organization> + <organization>org.apache.maven.model.Organization@66984649</organization> <roles> <role>Founder</role> </roles> @@ -62,7 +52,7 @@ <developer> <id>joe</id> <name>Joe Walnes</name> - <organization>org.apache.maven.model.Organization@de11305</organization> + <organization>org.apache.maven.model.Organization@1f1fde0f</organization> <roles> <role>Developer Emeritus</role> </roles> @@ -70,7 +60,7 @@ <developer> <id>skizz</id> <name>Chris Stevenson</name> - <organization>org.apache.maven.model.Organization@537b56c0</organization> + <organization>org.apache.maven.model.Organization@51e7beff</organization> <roles> <role>Developer Emeritus</role> </roles> @@ -78,7 +68,7 @@ <developer> <id>jamiemc</id> <name>Jamie McCrindle</name> - <organization>org.apache.maven.model.Organization@b90883</organization> + <organization>org.apache.maven.model.Organization@7f4b3afd</organization> <roles> <role>Developer Emeritus</role> </roles> @@ -86,7 +76,7 @@ <developer> <id>mattf</id> <name>Matt Foemmel</name> - <organization>org.apache.maven.model.Organization@4606b967</organization> + <organization>org.apache.maven.model.Organization@2ec31e53</organization> <roles> <role>Developer Emeritus</role> </roles> @@ -138,7 +128,7 @@ <id>jwilson</id> <name>John Wilson</name> <email>[email protected]</email> - <organization>org.apache.maven.model.Organization@6a83e630</organization> + <organization>org.apache.maven.model.Organization@4c9bd035</organization> <roles> <role>Developer Emeritus</role> </roles> @@ -155,7 +145,7 @@ <id>ckl</id> <name>Christiaan ten Klooster</name> <email>[email protected]</email> - <organization>org.apache.maven.model.Organization@6323304f</organization> + <organization>org.apache.maven.model.Organization@5c8288b8</organization> <roles> <role>Developer Emeritus</role> </roles> @@ -164,7 +154,7 @@ <id>goetze</id> <name>Steve Goetze</name> <email>[email protected]</email> - <organization>org.apache.maven.model.Organization@5905025</organization> + <organization>org.apache.maven.model.Organization@563ed1ff</organization> <roles> <role>Developer Emeritus</role> </roles> @@ -173,7 +163,7 @@ <id>bran</id> <name>Bing Ran</name> <email>[email protected]</email> - <organization>org.apache.maven.model.Organization@2903fbf0</organization> + <organization>org.apache.maven.model.Organization@5b26cb82</organization> <roles> <role>Developer Emeritus</role> </roles> @@ -182,7 +172,7 @@ <id>jez</id> <name>Jeremy Rayner</name> <email>[email protected]</email> - <organization>org.apache.maven.model.Organization@1f0323f2</organization> + <organization>org.apache.maven.model.Organization@622f08db</organization> <roles> <role>Developer Emeritus</role> </roles> @@ -208,7 +198,7 @@ <id>russel</id> <name>Russel Winder</name> <email>[email protected]</email> - <organization>org.apache.maven.model.Organization@e16b27c</organization> + <organization>org.apache.maven.model.Organization@7ac15e93</organization> <roles> <role>Developer</role> <role>Founder of Gant</role> @@ -226,7 +216,7 @@ <id>cstein</id> <name>Christian Stein</name> <email>[email protected]</email> - <organization>org.apache.maven.model.Organization@5aa9f2d</organization> + <organization>org.apache.maven.model.Organization@5dae96f4</organization> <roles> <role>Developer Emeritus</role> </roles> @@ -235,7 +225,7 @@ <id>mittie</id> <name>Dierk Koenig</name> <email>[email protected]</email> - <organization>org.apache.maven.model.Organization@655941d0</organization> + <organization>org.apache.maven.model.Organization@387c3f98</organization> <roles> <role>Developer</role> </roles> @@ -244,7 +234,7 @@ <id>paulk</id> <name>Paul King</name> <email>[email protected]</email> - <organization>org.apache.maven.model.Organization@25ff91b5</organization> + <organization>org.apache.maven.model.Organization@45b5e01</organization> <roles> <role>Developer</role> <role>Despot</role> @@ -307,7 +297,7 @@ <id>jimwhite</id> <name>Jim White</name> <email>[email protected]</email> - <organization>org.apache.maven.model.Organization@7106c88b</organization> + <organization>org.apache.maven.model.Organization@705ea75a</organization> <roles> <role>Developer</role> </roles> @@ -351,6 +341,15 @@ <role>Developer</role> </roles> </developer> + <developer> + <id>sunlan</id> + <name>Daniel Sun</name> + <email>[email protected]</email> + <roles> + <role>Developer</role> + <role>Despot</role> + </roles> + </developer> </developers> <contributors> <contributor> @@ -539,6 +538,12 @@ <name>Thibault Kruse</name> </contributor> <contributor> + <name>Tim Tiemens</name> + </contributor> + <contributor> + <name>Mike Spille</name> + </contributor> + <contributor> <name>Paolo Di Tommaso</name> </contributor> <contributor> @@ -574,29 +579,44 @@ <contributor> <name>Alan Green</name> </contributor> + <contributor> + <name>Alex Popescu</name> + </contributor> + <contributor> + <name>Martin Kempf</name> + </contributor> + <contributor> + <name>Stephane Landelle</name> + </contributor> + <contributor> + <name>Vladimir Vivien</name> + </contributor> </contributors> - <issueManagement> - <system>jira</system> - <url>http://issues.apache.org/jira/browse/GROOVY</url> - </issueManagement> + <mailingLists> + <mailingList> + <name>Groovy Developer List</name> + <archive>http://mail-archives.apache.org/mod_mbox/groovy-dev/</archive> + </mailingList> + <mailingList> + <name>Groovy User List</name> + <archive>http://mail-archives.apache.org/mod_mbox/groovy-users/</archive> + </mailingList> + </mailingLists> <scm> <connection>scm:git:https://github.com/apache/groovy.git</connection> <developerConnection>scm:git:https://github.com/apache/groovy.git</developerConnection> <url>https://github.com/apache/groovy.git</url> </scm> + <issueManagement> + <system>jira</system> + <url>http://issues.apache.org/jira/browse/GROOVY</url> + </issueManagement> <dependencies> <dependency> <groupId>org.apache.ant</groupId> - <artifactId>ant-launcher</artifactId> - <version>1.9.4</version> - <scope>runtime</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-antlr</artifactId> + <artifactId>ant</artifactId> <version>1.9.4</version> - <scope>runtime</scope> + <scope>compile</scope> <optional>true</optional> </dependency> <dependency> @@ -614,9 +634,16 @@ </dependency> <dependency> <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> + <artifactId>ant-launcher</artifactId> <version>1.9.4</version> - <scope>compile</scope> + <scope>runtime</scope> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-antlr</artifactId> + <version>1.9.4</version> + <scope>runtime</scope> <optional>true</optional> </dependency> <dependency> @@ -661,15 +688,15 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> + <artifactId>servlet-api</artifactId> + <version>2.4</version> <scope>provided</scope> <optional>true</optional> </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> + <artifactId>jsp-api</artifactId> + <version>2.0</version> <scope>provided</scope> <optional>true</optional> </dependency> @@ -705,29 +732,16 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.fusesource.jansi</groupId> - <artifactId>jansi</artifactId> - <version>1.11</version> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.9.4</version> <scope>compile</scope> <optional>true</optional> </dependency> <dependency> - <groupId>org.codehaus.gpars</groupId> - <artifactId>gpars</artifactId> - <version>1.2.1</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>groovy-all</artifactId> - <groupId>org.codehaus.groovy</groupId> - </exclusion> - </exclusions> - <optional>true</optional> - </dependency> - <dependency> <groupId>com.thoughtworks.xstream</groupId> <artifactId>xstream</artifactId> - <version>1.4.7</version> + <version>1.4.10</version> <scope>compile</scope> <exclusions> <exclusion> @@ -746,17 +760,36 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.fusesource.jansi</groupId> + <artifactId>jansi</artifactId> + <version>1.11</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> <groupId>org.apache.ivy</groupId> <artifactId>ivy</artifactId> <version>2.4.0</version> <scope>compile</scope> + <exclusions> + <exclusion> + <artifactId>*</artifactId> + <groupId>*</groupId> + </exclusion> + </exclusions> <optional>true</optional> </dependency> <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>1.9.4</version> - <scope>compile</scope> + <groupId>org.codehaus.gpars</groupId> + <artifactId>gpars</artifactId> + <version>1.2.1</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <artifactId>groovy-all</artifactId> + <groupId>org.codehaus.groovy</groupId> + </exclusion> + </exclusions> <optional>true</optional> </dependency> </dependencies> ++++++ groovy-buildscan.patch ++++++ --- a/build.gradle +++ b/build.gradle @@ -23,22 +23,6 @@ } } -if (JavaVersion.current().java7Compatible) { - apply plugin: 'com.gradle.build-scan' - apply plugin: 'me.champeau.buildscan-recipes' - - buildScan { - licenseAgreementUrl = 'https://gradle.com/terms-of-service' - licenseAgree = 'yes' - publishAlways() - } - buildScanRecipes { - recipe 'git-commit', baseUrl: 'https://github.com/apache/groovy/tree' - recipe 'teamcity', baseUrl: 'https://ci.groovy-lang.org', guest: 'true' - recipes 'git-status', 'teamcity', 'travis-ci' - } -} - ext.modules = { subprojects.findAll{ !['performance', 'tests-vm8'].contains(it.name) } } ++++++ groovy-java11.patch ++++++ --- 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(); } ++++++ groovy-source-levels.patch ++++++ --- groovy-2.4.16/build.gradle 2019-12-09 11:04:16.703039296 +0100 +++ groovy-2.4.16/build.gradle 2019-12-09 11:06:08.723653849 +0100 @@ -41,8 +41,8 @@ apply plugin: 'java' buildDir = 'target' - sourceCompatibility = 1.6 - targetCompatibility = 1.6 + sourceCompatibility = 1.7 + targetCompatibility = 1.7 group = 'org.codehaus.groovy' version = groovyVersion
