From f9336fc68bfb2668f90c082155ea6fda61e79b76 Mon Sep 17 00:00:00 2001 From: Bernhard M. Wiedemann Date: Dec 09 2019 20:42:05 +0000 Subject: Update groovy to rev 3 via SR 755232 https://build.opensuse.org/request/show/755232 by user dimstar_suse Allow buildign with Java 11 --- diff --git a/packages/g/groovy/0002-Gradle-local-mode.patch b/packages/g/groovy/0002-Gradle-local-mode.patch index 1df10d9..52b4a77 100644 --- a/packages/g/groovy/0002-Gradle-local-mode.patch +++ b/packages/g/groovy/0002-Gradle-local-mode.patch @@ -1,20 +1,6 @@ -From 41cf7f90856a5cd564964f734aa70a6ad5e74841 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -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 @@ index c2e095a..c049f93 100644 - } - - 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 @@ index c2e095a..c049f93 100644 // 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 @@ index 6ed3616..1c647cc 100644 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() && !f.@name.toString().contains('generated-sources')) { -- files << [ -- name: f.@name.toString(), -- errors: f.error.collect { e -> -- def rule = e.@source.toString() -- rule = rule.substring(rule.lastIndexOf('.')+1) -- [line: e.@line.toString(), -- column: e.@column.toString(), -- message: e.@message.toString(), -- source: rule, -- severity: e.@severity.toString()] -- }] -- } -- } -- 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 @@ index b485933..81d1311 100644 mavenCentral() } dependencies { --- -2.9.3 - diff --git a/packages/g/groovy/0003-Bintray.patch b/packages/g/groovy/0003-Bintray.patch index d9f7537..aba9c6a 100644 --- a/packages/g/groovy/0003-Bintray.patch +++ b/packages/g/groovy/0003-Bintray.patch @@ -1,19 +1,6 @@ -From f6fc82767bd6e4c52b5eb78fb8162bd4c72b5569 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -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 @@ index c049f93..fdbe73b 100644 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 @@ index c049f93..fdbe73b 100644 - 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 @@ index ef761c9..83ea5f0 100644 - 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 @@ index ef761c9..83ea5f0 100644 def javadocSpec = { maxMemory = javaDoc_mx project.configure(options) { -@@ -187,11 +173,6 @@ task docGDK { +@@ -190,11 +176,6 @@ } } @@ -84,44 +70,32 @@ index ef761c9..83ea5f0 100644 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) diff --git a/packages/g/groovy/apache-groovy-src-2.4.16.zip b/packages/g/groovy/apache-groovy-src-2.4.16.zip new file mode 120000 index 0000000..51066bd --- /dev/null +++ b/packages/g/groovy/apache-groovy-src-2.4.16.zip @@ -0,0 +1 @@ +/ipfs/bafybeifopezgxlmyuzfzueo2h4tc4kty77c6xtpzfr53ritczmnd6ormp4 \ No newline at end of file diff --git a/packages/g/groovy/apache-groovy-src-2.4.8.zip b/packages/g/groovy/apache-groovy-src-2.4.8.zip deleted file mode 120000 index 61c6cbd..0000000 --- a/packages/g/groovy/apache-groovy-src-2.4.8.zip +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeiczhprleuspmck3lorqbya6ku34vgmyesnsgwirnkip3i5qh3f6de \ No newline at end of file diff --git a/packages/g/groovy/groovy-all-2.4.16.pom b/packages/g/groovy/groovy-all-2.4.16.pom new file mode 100644 index 0000000..b417159 --- /dev/null +++ b/packages/g/groovy/groovy-all-2.4.16.pom @@ -0,0 +1,796 @@ + + + 4.0.0 + org.codehaus.groovy + groovy-all + 2.4.16 + jar + Apache Groovy + Groovy: A powerful, dynamic language for the JVM + http://groovy-lang.org + 2003 + + Apache Software Foundation + http://groovy-lang.org + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + glaforge + Guillaume Laforge + org.apache.maven.model.Organization@1b374774 + + Project Manager + Despot + Developer + + + + bob + bob mcwhirter + bob@werken.com + org.apache.maven.model.Organization@4ef55508 + + Founder + + + + jstrachan + James Strachan + james@coredevelopers.com + org.apache.maven.model.Organization@66984649 + + Founder + + + + joe + Joe Walnes + org.apache.maven.model.Organization@1f1fde0f + + Developer Emeritus + + + + skizz + Chris Stevenson + org.apache.maven.model.Organization@51e7beff + + Developer Emeritus + + + + jamiemc + Jamie McCrindle + org.apache.maven.model.Organization@7f4b3afd + + Developer Emeritus + + + + mattf + Matt Foemmel + org.apache.maven.model.Organization@2ec31e53 + + Developer Emeritus + + + + alextkachman + Alex Tkachman + + Developer Emeritus + + + + roshandawrani + Roshan Dawrani + + Developer Emeritus + + + + spullara + Sam Pullara + sam@sampullara.com + + Developer Emeritus + + + + kasper + Kasper Nielsen + + Developer Emeritus + + + + travis + Travis Kay + + Developer Emeritus + + + + zohar + Zohar Melamed + + Developer Emeritus + + + + jwilson + John Wilson + tug@wilson.co.uk + org.apache.maven.model.Organization@4c9bd035 + + Developer Emeritus + + + + cpoirier + Chris Poirier + cpoirier@dreaming.org + + Developer Emeritus + + + + ckl + Christiaan ten Klooster + ckl@dacelo.nl + org.apache.maven.model.Organization@5c8288b8 + + Developer Emeritus + + + + goetze + Steve Goetze + goetze@dovetail.com + org.apache.maven.model.Organization@563ed1ff + + Developer Emeritus + + + + bran + Bing Ran + b55r@sina.com + org.apache.maven.model.Organization@5b26cb82 + + Developer Emeritus + + + + jez + Jeremy Rayner + jeremy.rayner@gmail.com + org.apache.maven.model.Organization@622f08db + + Developer Emeritus + + + + jstump + John Stump + johnstump2@yahoo.com + + Developer Emeritus + + + + blackdrag + Jochen Theodorou + blackdrag@gmx.org + + Developer + Despot + + + + russel + Russel Winder + russel@russel.org.uk + org.apache.maven.model.Organization@7ac15e93 + + Developer + Founder of Gant + + + + phk + Pilho Kim + phkim@cluecom.co.kr + + Developer Emeritus + + + + cstein + Christian Stein + sormuras@gmx.de + org.apache.maven.model.Organization@5dae96f4 + + Developer Emeritus + + + + mittie + Dierk Koenig + dierk.koenig@canoo.com + org.apache.maven.model.Organization@387c3f98 + + Developer + + + + paulk + Paul King + paulk@asert.com.au + org.apache.maven.model.Organization@45b5e01 + + Developer + Despot + + + + galleon + Guillaume Alleon + guillaume.alleon@gmail.com + + Developer Emeritus + + + + user57 + Jason Dillon + jason@planet57.com + + Developer Emeritus + + + + shemnon + Danno Ferrin + + Developer Emeritus + + + + jwill + James Williams + + Developer Emeritus + + + + timyates + Tim Yates + + Developer + + + + aalmiray + Andres Almiray + aalmiray@users.sourceforge.net + + Developer + + + + mguillem + Marc Guillemot + mguillemot@yahoo.fr + + Developer Emeritus + + + + jimwhite + Jim White + jim@pagesmiths.com + org.apache.maven.model.Organization@705ea75a + + Developer + + + + pniederw + Peter Niederwieser + pniederw@gmail.com + + Developer Emeritus + + + + andresteingress + Andre Steingress + + Developer + + + + hamletdrc + Hamlet D'Arcy + hamletdrc@gmail.com + + Developer Emeritus + + + + melix + Cedric Champeau + cedric.champeau@gmail.com + + Developer + Despot + + + + pascalschumacher + Pascal Schumacher + + Developer + + + + sunlan + Daniel Sun + realbluesun@hotmail.com + + Developer + Despot + + + + + + Joern Eyrich + + + Robert Kuzelj + + + Rod Cope + + + Yuri Schimke + + + James Birchfield + + + Robert Fuller + + + Sergey Udovenko + + + Hallvard Traetteberg + + + Peter Reilly + + + Brian McCallister + + + Richard Monson-Haefel + + + Brian Larson + + + Artur Biesiadowski + abies@pg.gda.pl + + + Ivan Z. Ganza + + + Arjun Nayyar + + + Mark Chu-Carroll + + + Mark Turansky + + + Jean-Louis Berliet + + + Graham Miller + + + Marc Palmer + + + Tugdual Grall + + + Edwin Tellman + + + Evan A Slatis + + + Mike Dillon + + + Bernhard Huber + + + Marc DeXeT + + + Dejan Bosanac + dejan@nighttale.net + + + Denver Dino + + + Ted Naleid + + + Chanwit Kaewkasi + + + Brad Long + + + John Bito + + + Jim Jagielski + + + Rodolfo Velasco + + + John Hurst + + + Merlyn Albery-Speyer + + + jeremi Joslin + + + UEHARA Junji + + + NAKANO Yasuharu + + + Dinko Srkoc + + + Raffaele Cigni + + + Alberto Vilches Raton + + + Paulo Poiati + + + Alexander Klein + + + Adam Murdoch + + + David Durham + + + Daniel Henrique Alves Lima + + + John Wagenleitner + + + Colin Harrington + + + Brian Alexander + + + Jan Weitz + + + Joachim Baumann + + + David Sutherland + + + Mattias Reichel + + + David Lee + + + Sergei Egorov + + + Hein Meling + + + Michael Baehr + + + Craig Andrews + + + Peter Ledbrook + + + Thibault Kruse + + + Tim Tiemens + + + Mike Spille + + + Paolo Di Tommaso + + + Rene Scheibe + + + Matias Bjarland + + + Richard Hightower + + + Andrey Bloschetsov + + + Yu Kobayashi + + + Nick Grealy + + + Marcin Grzejszczak + + + Pap L?rinc + + + Guillaume Balaine + + + Santhosh Kumar T + + + Alan Green + + + Alex Popescu + + + Martin Kempf + + + Stephane Landelle + + + Vladimir Vivien + + + + + Groovy Developer List + http://mail-archives.apache.org/mod_mbox/groovy-dev/ + + + Groovy User List + http://mail-archives.apache.org/mod_mbox/groovy-users/ + + + + scm:git:https://github.com/apache/groovy.git + scm:git:https://github.com/apache/groovy.git + https://github.com/apache/groovy.git + + + jira + http://issues.apache.org/jira/browse/GROOVY + + + + org.apache.ant + ant + 1.9.4 + compile + true + + + org.apache.ant + ant-junit + 1.9.4 + runtime + + + junit + junit + + + true + + + org.apache.ant + ant-launcher + 1.9.4 + runtime + true + + + org.apache.ant + ant-antlr + 1.9.4 + runtime + true + + + bsf + bsf + 2.4.0 + compile + + + commons-logging + commons-logging + + + true + + + commons-logging + commons-logging + 1.2 + compile + true + + + com.thoughtworks.qdox + qdox + 1.12.1 + compile + true + + + jline + jline + 2.12 + compile + + + junit + junit + + + true + + + javax.servlet + servlet-api + 2.4 + provided + true + + + javax.servlet + jsp-api + 2.0 + provided + true + + + junit + junit + 4.12 + compile + true + + + com.beust + jcommander + 1.47 + compile + true + + + org.testng + testng + 6.8.13 + runtime + + + bsh + org.beanshell + + + jcommander + com.beust + + + true + + + org.apache.ant + ant + 1.9.4 + compile + true + + + com.thoughtworks.xstream + xstream + 1.4.10 + compile + + + junit + junit + + + xpp3_min + xpp3 + + + jmock + jmock + + + true + + + org.fusesource.jansi + jansi + 1.11 + compile + true + + + org.apache.ivy + ivy + 2.4.0 + compile + + + * + * + + + true + + + org.codehaus.gpars + gpars + 1.2.1 + runtime + + + groovy-all + org.codehaus.groovy + + + true + + + diff --git a/packages/g/groovy/groovy-all-2.4.8.pom b/packages/g/groovy/groovy-all-2.4.8.pom deleted file mode 100644 index 5c5d46a..0000000 --- a/packages/g/groovy/groovy-all-2.4.8.pom +++ /dev/null @@ -1,763 +0,0 @@ - - - 4.0.0 - org.codehaus.groovy - groovy-all - 2.4.8 - jar - Apache Groovy - Groovy: A powerful, dynamic language for the JVM - http://groovy-lang.org - 2003 - - Apache Software Foundation - http://groovy-lang.org - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - Groovy Developer List - http://mail-archives.apache.org/mod_mbox/groovy-dev/ - - - Groovy User List - http://mail-archives.apache.org/mod_mbox/groovy-users/ - - - - - glaforge - Guillaume Laforge - org.apache.maven.model.Organization@239556d2 - - Project Manager - Despot - Developer - - - - bob - bob mcwhirter - bob@werken.com - org.apache.maven.model.Organization@4e6ce75d - - Founder - - - - jstrachan - James Strachan - james@coredevelopers.com - org.apache.maven.model.Organization@4fe62df6 - - Founder - - - - joe - Joe Walnes - org.apache.maven.model.Organization@de11305 - - Developer Emeritus - - - - skizz - Chris Stevenson - org.apache.maven.model.Organization@537b56c0 - - Developer Emeritus - - - - jamiemc - Jamie McCrindle - org.apache.maven.model.Organization@b90883 - - Developer Emeritus - - - - mattf - Matt Foemmel - org.apache.maven.model.Organization@4606b967 - - Developer Emeritus - - - - alextkachman - Alex Tkachman - - Developer Emeritus - - - - roshandawrani - Roshan Dawrani - - Developer Emeritus - - - - spullara - Sam Pullara - sam@sampullara.com - - Developer Emeritus - - - - kasper - Kasper Nielsen - - Developer Emeritus - - - - travis - Travis Kay - - Developer Emeritus - - - - zohar - Zohar Melamed - - Developer Emeritus - - - - jwilson - John Wilson - tug@wilson.co.uk - org.apache.maven.model.Organization@6a83e630 - - Developer Emeritus - - - - cpoirier - Chris Poirier - cpoirier@dreaming.org - - Developer Emeritus - - - - ckl - Christiaan ten Klooster - ckl@dacelo.nl - org.apache.maven.model.Organization@6323304f - - Developer Emeritus - - - - goetze - Steve Goetze - goetze@dovetail.com - org.apache.maven.model.Organization@5905025 - - Developer Emeritus - - - - bran - Bing Ran - b55r@sina.com - org.apache.maven.model.Organization@2903fbf0 - - Developer Emeritus - - - - jez - Jeremy Rayner - jeremy.rayner@gmail.com - org.apache.maven.model.Organization@1f0323f2 - - Developer Emeritus - - - - jstump - John Stump - johnstump2@yahoo.com - - Developer Emeritus - - - - blackdrag - Jochen Theodorou - blackdrag@gmx.org - - Developer - Despot - - - - russel - Russel Winder - russel@russel.org.uk - org.apache.maven.model.Organization@e16b27c - - Developer - Founder of Gant - - - - phk - Pilho Kim - phkim@cluecom.co.kr - - Developer Emeritus - - - - cstein - Christian Stein - sormuras@gmx.de - org.apache.maven.model.Organization@5aa9f2d - - Developer Emeritus - - - - mittie - Dierk Koenig - dierk.koenig@canoo.com - org.apache.maven.model.Organization@655941d0 - - Developer - - - - paulk - Paul King - paulk@asert.com.au - org.apache.maven.model.Organization@25ff91b5 - - Developer - Despot - - - - galleon - Guillaume Alleon - guillaume.alleon@gmail.com - - Developer Emeritus - - - - user57 - Jason Dillon - jason@planet57.com - - Developer Emeritus - - - - shemnon - Danno Ferrin - - Developer Emeritus - - - - jwill - James Williams - - Developer Emeritus - - - - timyates - Tim Yates - - Developer - - - - aalmiray - Andres Almiray - aalmiray@users.sourceforge.net - - Developer - - - - mguillem - Marc Guillemot - mguillemot@yahoo.fr - - Developer Emeritus - - - - jimwhite - Jim White - jim@pagesmiths.com - org.apache.maven.model.Organization@7106c88b - - Developer - - - - pniederw - Peter Niederwieser - pniederw@gmail.com - - Developer Emeritus - - - - andresteingress - Andre Steingress - - Developer - - - - hamletdrc - Hamlet D'Arcy - hamletdrc@gmail.com - - Developer Emeritus - - - - melix - Cedric Champeau - cedric.champeau@gmail.com - - Developer - Despot - - - - pascalschumacher - Pascal Schumacher - - Developer - - - - - - Joern Eyrich - - - Robert Kuzelj - - - Rod Cope - - - Yuri Schimke - - - James Birchfield - - - Robert Fuller - - - Sergey Udovenko - - - Hallvard Traetteberg - - - Peter Reilly - - - Brian McCallister - - - Richard Monson-Haefel - - - Brian Larson - - - Artur Biesiadowski - abies@pg.gda.pl - - - Ivan Z. Ganza - - - Arjun Nayyar - - - Mark Chu-Carroll - - - Mark Turansky - - - Jean-Louis Berliet - - - Graham Miller - - - Marc Palmer - - - Tugdual Grall - - - Edwin Tellman - - - Evan A Slatis - - - Mike Dillon - - - Bernhard Huber - - - Marc DeXeT - - - Dejan Bosanac - dejan@nighttale.net - - - Denver Dino - - - Ted Naleid - - - Chanwit Kaewkasi - - - Brad Long - - - John Bito - - - Jim Jagielski - - - Rodolfo Velasco - - - John Hurst - - - Merlyn Albery-Speyer - - - jeremi Joslin - - - UEHARA Junji - - - NAKANO Yasuharu - - - Dinko Srkoc - - - Raffaele Cigni - - - Alberto Vilches Raton - - - Paulo Poiati - - - Alexander Klein - - - Adam Murdoch - - - David Durham - - - Daniel Henrique Alves Lima - - - John Wagenleitner - - - Colin Harrington - - - Brian Alexander - - - Jan Weitz - - - Joachim Baumann - - - David Sutherland - - - Mattias Reichel - - - David Lee - - - Sergei Egorov - - - Hein Meling - - - Michael Baehr - - - Craig Andrews - - - Peter Ledbrook - - - Thibault Kruse - - - Paolo Di Tommaso - - - Rene Scheibe - - - Matias Bjarland - - - Richard Hightower - - - Andrey Bloschetsov - - - Yu Kobayashi - - - Nick Grealy - - - Marcin Grzejszczak - - - Pap L?rinc - - - Guillaume Balaine - - - Santhosh Kumar T - - - Alan Green - - - - jira - http://issues.apache.org/jira/browse/GROOVY - - - scm:git:https://github.com/apache/groovy.git - scm:git:https://github.com/apache/groovy.git - https://github.com/apache/groovy.git - - - - org.apache.ant - ant-launcher - 1.9.4 - runtime - true - - - org.apache.ant - ant-antlr - 1.9.4 - runtime - true - - - org.apache.ant - ant-junit - 1.9.4 - runtime - - - junit - junit - - - true - - - org.apache.ant - ant - 1.9.4 - compile - true - - - bsf - bsf - 2.4.0 - compile - - - commons-logging - commons-logging - - - true - - - commons-logging - commons-logging - 1.2 - compile - true - - - com.thoughtworks.qdox - qdox - 1.12.1 - compile - true - - - jline - jline - 2.12 - compile - - - junit - junit - - - true - - - javax.servlet - jsp-api - 2.0 - provided - true - - - javax.servlet - servlet-api - 2.4 - provided - true - - - junit - junit - 4.12 - compile - true - - - com.beust - jcommander - 1.47 - compile - true - - - org.testng - testng - 6.8.13 - runtime - - - bsh - org.beanshell - - - jcommander - com.beust - - - true - - - org.fusesource.jansi - jansi - 1.11 - compile - true - - - org.codehaus.gpars - gpars - 1.2.1 - runtime - - - groovy-all - org.codehaus.groovy - - - true - - - com.thoughtworks.xstream - xstream - 1.4.7 - compile - - - junit - junit - - - xpp3_min - xpp3 - - - jmock - jmock - - - true - - - org.apache.ivy - ivy - 2.4.0 - compile - true - - - org.apache.ant - ant - 1.9.4 - compile - true - - - diff --git a/packages/g/groovy/groovy-buildscan.patch b/packages/g/groovy/groovy-buildscan.patch new file mode 100644 index 0000000..83c7d10 --- /dev/null +++ b/packages/g/groovy/groovy-buildscan.patch @@ -0,0 +1,25 @@ +--- 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) } + } diff --git a/packages/g/groovy/groovy-java11.patch b/packages/g/groovy/groovy-java11.patch new file mode 100644 index 0000000..9b8e9bc --- /dev/null +++ b/packages/g/groovy/groovy-java11.patch @@ -0,0 +1,11 @@ +--- 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(); + } diff --git a/packages/g/groovy/groovy-source-levels.patch b/packages/g/groovy/groovy-source-levels.patch new file mode 100644 index 0000000..725d9f2 --- /dev/null +++ b/packages/g/groovy/groovy-source-levels.patch @@ -0,0 +1,13 @@ +--- 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 diff --git a/packages/g/groovy/groovy.changes b/packages/g/groovy/groovy.changes index 9f9d608..97b6543 100644 --- a/packages/g/groovy/groovy.changes +++ b/packages/g/groovy/groovy.changes @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Mon Dec 9 12:21:54 UTC 2019 - Fridrich Strba + +- 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 + +------------------------------------------------------------------- Mon Dec 2 06:35:30 UTC 2019 - Fridrich Strba - For some reason, the .xmvn-reactor ends up on s390x in the diff --git a/packages/g/groovy/groovy.spec b/packages/g/groovy/groovy.spec index 9fce9ae..c0a6092 100644 --- a/packages/g/groovy/groovy.spec +++ b/packages/g/groovy/groovy.spec @@ -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 @@ Patch4: 0005-Update-to-QDox-2.0.patch 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}-testng = %{version}-%{release} 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 @@ find \( -name *.jar -o -name *.class \) -delete %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 %{mvn_package} ':groovy::indy:' %{mvn_package} ':groovy-{*}' @1