commit 765dd945b24fa92089c03042a8f887f33f3aaa9e Author: Michal Srb msrb@redhat.com Date: Thu Jan 22 15:50:46 2015 +0100
Update to 2.4.0
- Fix java.lang.LinkageError when using @Grab (Resolves: rhbz#1184269)
.gitignore | 1 + ...ocal-mode.patch => 0002-Gradle-local-mode.patch | 52 +++++++------- 0002-Upgrade-to-Gradle-2-final.patch | 74 -------------------- 0004-Bintray.patch => 0003-Bintray.patch | 74 ++++++++++--------- 0004-Remove-android-support.patch | 52 ++++++++++++++ groovy.spec | 72 ++++++++++++++----- sources | 2 +- 7 files changed, 171 insertions(+), 156 deletions(-) --- diff --git a/.gitignore b/.gitignore index 841fdf8..aa2678c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ groovy-src-1.7.10.zip /groovy-src-1.8.9.zip /LICENSE-2.0.txt /GROOVY_2_3_7.tar.gz +/GROOVY_2_4_0.tar.gz diff --git a/0003-Gradle-local-mode.patch b/0002-Gradle-local-mode.patch similarity index 62% rename from 0003-Gradle-local-mode.patch rename to 0002-Gradle-local-mode.patch index 7b29f91..3e5e4b6 100644 --- a/0003-Gradle-local-mode.patch +++ b/0002-Gradle-local-mode.patch @@ -1,16 +1,17 @@ -From 2177bf210315917fa5dcb22d5600657e26aa1a3b Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski mizdebsk@redhat.com -Date: Thu, 23 Oct 2014 14:44:25 +0200 -Subject: [PATCH 3/5] Gradle local mode +From 02feb96ca82e2b493db82377447d1c5c60ed5693 Mon Sep 17 00:00:00 2001 +From: Michal Srb msrb@redhat.com +Date: Thu, 22 Jan 2015 13:35:59 +0100 +Subject: [PATCH 1/3] Gradle local mode
--- - build.gradle | 15 +++------------ + build.gradle | 12 +++--------- gradle/codehaus.gradle | 1 + + gradle/quality.gradle | 1 - gradle/utils.gradle | 1 + - 3 files changed, 5 insertions(+), 12 deletions(-) + 4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/build.gradle b/build.gradle -index d6f346b..f95e47f 100644 +index fa2f731..91319b7 100644 --- a/build.gradle +++ b/build.gradle @@ -7,18 +7,13 @@ if (JavaVersion.current().java6Compatible) { @@ -26,14 +27,14 @@ index d6f346b..f95e47f 100644 } - - dependencies { -- classpath 'org.asciidoctor:asciidoctor-gradle-plugin:0.7.3' -- classpath 'net.saliman:gradle-cobertura-plugin:1.1.2' +- classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.0' - classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:2.2.3' +- classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.0' - } }
File javaHome = new File(System.getProperty('java.home')) -@@ -37,12 +32,12 @@ allprojects { +@@ -37,14 +32,12 @@ allprojects { group = 'org.codehaus.groovy' version = groovyVersion repositories { @@ -43,30 +44,20 @@ index d6f346b..f95e47f 100644
apply plugin: 'groovy' apply from: "${rootProject.projectDir}/gradle/indy.gradle" -- apply from: "${rootProject.projectDir}/gradle/asciidoctor.gradle" +- if (JavaVersion.current().java7Compatible) { +- apply from: "${rootProject.projectDir}/gradle/asciidoctor.gradle" +- } }
// todo: use the conventional "resources" directory for classpath resources -@@ -80,6 +75,7 @@ subprojects { +@@ -82,6 +75,7 @@ subprojects { }
repositories { + xmvn() // todo Some repos are needed only for some configs. Declare them just for the configuration once Gradle allows this. - // mavenCentral() // default, tools maven { url 'http://www.aQute.biz/repo' } // tools -@@ -172,11 +168,6 @@ dependencies { - exclude(module: 'junit') - } - tools "redhill:simian:$simianVersion" -- tools("net.sourceforge.cobertura:cobertura:$coberturaVersion") { -- exclude(module: 'asm') -- exclude(module: 'asm') -- exclude(module: 'ant') -- } - tools "org.ow2.asm:asm-all:$asmVersion" - tools "com.thoughtworks.qdox:qdox:$qdoxVersion" - tools "biz.aQute:bnd:$bndVersion" + 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 66a6208..5684566 100644 --- a/gradle/codehaus.gradle @@ -79,6 +70,15 @@ index 66a6208..5684566 100644 mavenCentral() } dependencies { +diff --git a/gradle/quality.gradle b/gradle/quality.gradle +index 12d4eaa..704f784 100644 +--- a/gradle/quality.gradle ++++ b/gradle/quality.gradle +@@ -87,4 +87,3 @@ allprojects { + } + + apply from: 'gradle/jacoco/jacoco.gradle' +-apply from: 'gradle/binarycompatibility.gradle' diff --git a/gradle/utils.gradle b/gradle/utils.gradle index 4360092..cee1425 100644 --- a/gradle/utils.gradle @@ -92,5 +92,5 @@ index 4360092..cee1425 100644 } dependencies { -- -1.9.3 +2.1.0
diff --git a/0004-Bintray.patch b/0003-Bintray.patch similarity index 72% rename from 0004-Bintray.patch rename to 0003-Bintray.patch index e6b2573..32378fd 100644 --- a/0004-Bintray.patch +++ b/0003-Bintray.patch @@ -1,16 +1,16 @@ -From a4c6914113f89ce47a5780381c21dc600f06682b Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski mizdebsk@redhat.com -Date: Fri, 24 Oct 2014 14:25:15 +0200 -Subject: [PATCH 4/5] Bintray +From eccbcc11f5877a953c2b5a167f911cef3b7e80fd Mon Sep 17 00:00:00 2001 +From: Michal Srb msrb@redhat.com +Date: Thu, 22 Jan 2015 13:42:54 +0100 +Subject: [PATCH 2/3] Bintray
--- build.gradle | 12 ------------ - gradle/docs.gradle | 11 +---------- + gradle/docs.gradle | 16 +--------------- gradle/upload.gradle | 12 +++--------- - 3 files changed, 4 insertions(+), 31 deletions(-) + 3 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/build.gradle b/build.gradle -index f95e47f..691719f 100644 +index 91319b7..4e2c572 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,6 @@ @@ -24,12 +24,12 @@ index f95e47f..691719f 100644 buildscript { repositories { xmvn() -@@ -114,7 +110,6 @@ ext { - luceneVersion = '4.3.1' +@@ -113,7 +109,6 @@ ext { + luceneVersion = '4.7.2' openejbVersion = '1.0' qdoxVersion = '1.12.1' - simianVersion = '2.2.4' - slf4jVersion = '1.7.5' + slf4jVersion = '1.7.6' xmlunitVersion = '1.5' xstreamVersion = '1.4.7' @@ -164,10 +159,6 @@ dependencies { @@ -40,51 +40,55 @@ index f95e47f..691719f 100644 - exclude(module: 'junit') - } - tools "redhill:simian:$simianVersion" - tools "org.ow2.asm:asm-all:$asmVersion" - tools "com.thoughtworks.qdox:qdox:$qdoxVersion" - tools "biz.aQute:bnd:$bndVersion" -@@ -421,9 +412,6 @@ apply from: 'gradle/groovydoc.gradle' + tools("net.sourceforge.cobertura:cobertura:$coberturaVersion") { + exclude(module: 'asm') + exclude(module: 'asm') +@@ -426,9 +417,6 @@ apply from: 'gradle/groovydoc.gradle' 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 if (file('user.gradle').exists()) { - apply from: 'user.gradle' diff --git a/gradle/docs.gradle b/gradle/docs.gradle -index 0c45ac9..f3536a8 100644 +index d8d8b06..c0044bb 100644 --- a/gradle/docs.gradle +++ b/gradle/docs.gradle -@@ -1,15 +1,8 @@ --task doc(dependsOn: ['asciidocAll', 'assembleAsciidoc', 'javadocAll', 'groovydocAll', 'docGDK']) { -+task doc(dependsOn: ['javadocAll', 'groovydocAll', 'docGDK']) { +@@ -1,22 +1,8 @@ + task doc(dependsOn: ['javadocAll', 'groovydocAll', 'docGDK']) { +- if (JavaVersion.current().java7Compatible) { +- dependsOn 'asciidocAll', 'assembleAsciidoc' +- } ext.footer = 'Copyright © 2003-2014 The Codehaus. All rights reserved.' ext.title = "Groovy ${groovyVersion}" }
--task assembleAsciidoc(type: Copy, dependsOn: 'asciidocAll') { -- subprojects { -- from project.asciidoctor +-if (JavaVersion.current().java7Compatible) { +- task assembleAsciidoc(type: Copy, dependsOn: 'asciidocAll') { +- subprojects { +- from project.asciidoctor +- } +- into "$buildDir/asciidoc" - } -- into "$buildDir/asciidoc" +- +- task asciidocAll(dependsOn: 'asciidoctor') -} - def javadocSpec = { maxMemory = javaDoc_mx project.configure(options) { -@@ -48,8 +41,6 @@ def groovydocSpec = { - allprojects { - javadoc javadocSpec - groovydoc groovydocSpec -- -- task asciidocAll(dependsOn: 'asciidoctor') - } - - // Root project has an extra 'all' javadoc task +@@ -189,4 +175,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 a214136..60fa1a8 100644 +index 15c8952..204dd19 100644 --- a/gradle/upload.gradle +++ b/gradle/upload.gradle @@ -40,7 +40,7 @@ allprojects { @@ -113,7 +117,7 @@ index a214136..60fa1a8 100644 doFirst { if (rootProject.useIndy()) { new GradleException('You cannot use uploadArchives or install task with the flag [indy] turned' -@@ -85,12 +82,9 @@ allprojects { +@@ -89,12 +86,9 @@ allprojects {
// the root project generates an alternate 'groovy-all' artifact [uploadArchives, install]*.with { @@ -128,5 +132,5 @@ index a214136..60fa1a8 100644 tasks.withType(Jar).matching { it.name.startsWith('backport') }.each { t -> project.artifacts.add('archives', t.archivePath) { -- -1.9.3 +2.1.0
diff --git a/0004-Remove-android-support.patch b/0004-Remove-android-support.patch new file mode 100644 index 0000000..1cb5dfa --- /dev/null +++ b/0004-Remove-android-support.patch @@ -0,0 +1,52 @@ +From b04d037d3f5db5bfe142c81d6f39895727d04161 Mon Sep 17 00:00:00 2001 +From: Michal Srb msrb@redhat.com +Date: Thu, 22 Jan 2015 14:06:56 +0100 +Subject: [PATCH 3/3] Remove android support + +--- + build.gradle | 1 - + gradle/assemble.gradle | 16 ---------------- + 2 files changed, 17 deletions(-) + +diff --git a/build.gradle b/build.gradle +index 4e2c572..ac47c0b 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -129,7 +129,6 @@ dependencies { + exclude(group: 'junit', module: 'junit') + exclude(group: 'jmock', module: 'jmock') + } +- compile files("lib/openbeans-1.0.jar") + compile "org.fusesource.jansi:jansi:$jansiVersion" + compile("org.apache.ivy:ivy:$ivyVersion") { + transitive = false +diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle +index 6591bf4..7175cc7 100644 +--- a/gradle/assemble.gradle ++++ b/gradle/assemble.gradle +@@ -210,22 +210,6 @@ allprojects { + def target = new File("${archivePath}.tmp") + boolean isRootProject = project==rootProject + +- doFirst { +- from zipTree(target) +- ant { +- taskdef name: 'jarjar', classname: 'com.tonicsystems.jarjar.JarJarTask', classpath: rootProject.configurations.tools.asPath +- jarjar(jarfile: target) { +- zipfileset(src: jarjar.archivePath) +- if (isRootProject) { +- zipfileset(src: rootProject.configurations.runtime.files.find { it.name.startsWith('openbeans') }) +- } +- rule pattern: 'com.googlecode.openbeans.**', result: 'groovyjarjaropenbeans.@1' +- rule pattern: 'org.apache.harmony.beans.**', result: 'groovyjarjarharmonybeans.@1' +- rule pattern: 'java.beans.**', result: 'groovyjarjaropenbeans.@1' +- } +- } +- +- } + doLast { + target.delete() + } +-- +2.1.0 + diff --git a/groovy.spec b/groovy.spec index 6a6199a..d090f35 100644 --- a/groovy.spec +++ b/groovy.spec @@ -3,8 +3,8 @@ # the Requires list.
Name: groovy -Version: 2.3.7 -Release: 2%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: Dynamic language for the Java Platform
# Some of the files are licensed under BSD and CPL terms, but the CPL has been superceded @@ -14,7 +14,7 @@ Summary: Dynamic language for the Java Platform License: ASL 2.0 and BSD and EPL and Public Domain and CC-BY URL: http://groovy.codehaus.org/
-Source0: http://github.com/groovy/groovy-core/archive/GROOVY_2_3_7.tar.gz +Source0: http://github.com/groovy/groovy-core/archive/GROOVY_2_4_0.tar.gz Source1: groovy-script.sh Source3: groovy.desktop Source4: cpl-v10.txt @@ -22,48 +22,48 @@ Source5: epl-v10.txt Source6: http://www.apache.org/licenses/LICENSE-2.0.txt
Patch0: 0001-Port-to-Servlet-API-3.1.patch -Patch1: 0002-Upgrade-to-Gradle-2-final.patch -Patch2: 0003-Gradle-local-mode.patch -Patch3: 0004-Bintray.patch +Patch1: 0002-Gradle-local-mode.patch +Patch2: 0003-Bintray.patch +Patch3: 0004-Remove-android-support.patch Patch4: 0005-Port-to-QDox-2.0.patch
+ BuildRequires: gradle-local >= 2.1-0.9 +BuildRequires: javapackages-local +BuildRequires: java-devel >= 1.8 +BuildRequires: ant +BuildRequires: antlr-tool +BuildRequires: ant-antlr BuildRequires: aqute-bnd BuildRequires: gpars BuildRequires: apache-parent BuildRequires: testng BuildRequires: jline +BuildRequires: apache-commons-cli BuildRequires: apache-commons-beanutils BuildRequires: apache-commons-collections BuildRequires: checkstyle BuildRequires: jarjar -BuildRequires: glassfish-jsp -BuildRequires: glassfish-el - -BuildRequires: ant -BuildRequires: antlr-tool -BuildRequires: ant-antlr +BuildRequires: glassfish-jsp-api +BuildRequires: glassfish-servlet-api BuildRequires: objectweb-asm3 BuildRequires: bsf BuildRequires: apache-ivy BuildRequires: jansi -BuildRequires: jline1 -BuildRequires: tomcat-jsp-2.2-api BuildRequires: junit -BuildRequires: tomcat-servlet-3.0-api BuildRequires: xstream -BuildRequires: java-devel >= 1.8 BuildRequires: desktop-file-utils -BuildRequires: jpackage-utils -BuildRequires: apache-commons-cli BuildRequires: unzip -BuildRequires: javapackages-local BuildRequires: mvn(org.apache.ant:ant-junit) BuildRequires: mvn(org.apache.ant:ant-launcher) BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(javax.servlet:jsp-api)
Requires: %{name}-lib = %{version}-%{release} +Requires: glassfish-jsp-api +Requires: glassfish-servlet-api +# FIXME: this dependency is missing in generated POM files from some reason... +Requires: apache-commons-cli
BuildArch: noarch
@@ -84,7 +84,7 @@ This package contains Groovy JAR artifact.
%prep -%setup -q -n groovy-core-GROOVY_2_3_7 +%setup -q -n groovy-core-GROOVY_2_4_0 cp %{SOURCE4} %{SOURCE5} %{SOURCE6} . # Remove bundled JARs and classes find ( -name *.jar -o -name *.class ) -delete @@ -129,8 +129,36 @@ done ln -sf ../../java/%{name}/groovy-all.jar %{buildroot}%{_datadir}/%{name}/embeddable/groovy-all-%{version}.jar ln -sf ../../java/%{name}/groovy-all.jar %{buildroot}%{_datadir}/%{name}/embeddable/groovy-all-%{version}-indy.jar
+find %{buildroot}%{_datadir}/%{name}/lib/ ! -name "groovy*" -type f -print -delete xmvn-subst %{buildroot}%{_datadir}/%{name}/
+ln -sf `build-classpath ant/ant` %{buildroot}%{_datadir}/%{name}/lib/ant.jar +ln -sf `build-classpath ant/ant-antlr` %{buildroot}%{_datadir}/%{name}/lib/ant-antlr.jar +ln -sf `build-classpath ant/ant-junit` %{buildroot}%{_datadir}/%{name}/lib/ant-junit.jar +ln -sf `build-classpath ant/ant-launcher` %{buildroot}%{_datadir}/%{name}/lib/ant-launcher.jar +ln -sf `build-classpath bsf` %{buildroot}%{_datadir}/%{name}/lib/bsf.jar +ln -sf `build-classpath commons-cli` %{buildroot}%{_datadir}/%{name}/lib/commons-cli.jar +ln -sf `build-classpath commons-logging` %{buildroot}%{_datadir}/%{name}/lib/commons-logging.jar +ln -sf `build-classpath gpars/gpars` %{buildroot}%{_datadir}/%{name}/lib/gpars.jar +ln -sf `build-classpath hamcrest/core` %{buildroot}%{_datadir}/%{name}/lib/hamcrest-core.jar +ln -sf `build-classpath apache-ivy/ivy` %{buildroot}%{_datadir}/%{name}/lib/ivy.jar +ln -sf `build-classpath jansi/jansi` %{buildroot}%{_datadir}/%{name}/lib/jansi.jar +ln -sf `build-classpath beust-jcommander` %{buildroot}%{_datadir}/%{name}/lib/jcommander.jar +ln -sf `build-classpath jline/jline` %{buildroot}%{_datadir}/%{name}/lib/jline.jar +ln -sf `build-classpath glassfish-jsp-api` %{buildroot}%{_datadir}/%{name}/lib/jsp-api.jar +# part of JDK7+ (?) +#ln -sf `build-classpath jsr166y` %{buildroot}%{_datadir}/%{name}/lib/jsr166y.jar +ln -sf `build-classpath junit` %{buildroot}%{_datadir}/%{name}/lib/junit.jar +# TODO: do we need this? +#ln -sf `build-classpath multiverse-core` %{buildroot}%{_datadir}/%{name}/lib/multiverse-core.jar +# Android support, removed by patch +#ln -sf `build-classpath openbeans` %{buildroot}%{_datadir}/%{name}/lib/openbeans.jar +ln -sf `build-classpath qdox` %{buildroot}%{_datadir}/%{name}/lib/qdox.jar +ln -sf `build-classpath glassfish-servlet-api` %{buildroot}%{_datadir}/%{name}/lib/servlet-api.jar +ln -sf `build-classpath testng` %{buildroot}%{_datadir}/%{name}/lib/testng.jar +ln -sf `build-classpath xpp3` %{buildroot}%{_datadir}/%{name}/lib/xmlpull.jar +ln -sf `build-classpath xstream/xstream` %{buildroot}%{_datadir}/%{name}/lib/xstream.jar + %mvn_install
# Startup scripts @@ -166,6 +194,10 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications \ %doc LICENSE.txt NOTICE.txt README.adoc
%changelog +* Thu Jan 22 2015 Michal Srb msrb@redhat.com - 2.4.0-1 +- Update to 2.4.0 +- Fix java.lang.LinkageError when using @Grab (Resolves: rhbz#1184269) + * Sun Jan 4 2015 Mikolaj Izdebski mizdebsk@redhat.com - 2.3.7-2 - Update desktop file
diff --git a/sources b/sources index b4e9037..78fdca7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f6596fd7ce8ab6376c59d5e9dc6eb3fb GROOVY_2_3_7.tar.gz 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt +ba27512d4d18bd4b8f1421c0d84d9260 GROOVY_2_4_0.tar.gz
java-sig-commits@lists.fedoraproject.org