[gradle/experimental] Update to 1.7

gil gil at fedoraproject.org
Wed Sep 4 12:57:57 UTC 2013 

commit ba2793db9e019e69f18002965852bd98b6746f45
Author: gil <puntogil at libero.it>
Date:   Wed Sep 4 14:57:43 2013 +0200

    Update to 1.7

 gradle.spec |   68 ++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 40 insertions(+), 28 deletions(-)
---
diff --git a/gradle.spec b/gradle.spec
index 6118420..71bb19d 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -26,13 +26,13 @@
 # FIXME/ED http://issues.gradle.org/browse/GRADLE-2210 ?
 
 Name:          gradle
-Version:       1.6
-Release:       2%{?nameddottag}%{?dist}
+Version:       1.7
+Release:       1%{?nameddottag}%{?dist}
 Summary:       Groovy based build system
 Group:         Development/Tools
 License:       ASL 2.0
 Url:           http://www.gradle.org/
-Source0:       http://services.gradle.org/distributions/gradle-1.6-src.zip
+Source0:       http://services.gradle.org/distributions/gradle-1.7-src.zip
 Source3:       gradle-1.0-wrapper
 Source4:       gradle-%{namedversion}-build.xml
 Source5:       gradle.desktop
@@ -46,10 +46,9 @@ Patch2:        gradle-1.0-css3-pie-not-available.patch
 # http://issues.gradle.org/browse/GRADLE-2422
 # Miguel Landaeta @miguel.cc
 # Damien Raude-Morvan @debian.org
-#Patch3:        gradle-1.6-native-jnr-posix.patch
 Patch3:        gradle-1.6-jnr-posix.patch
 # this patch is only used in bootstrap mode for generate a launcher script
-Patch4:        gradle-1.6-script.patch
+Patch4:        gradle-%{namedversion}-script.patch
 # mgoldmann
 Patch5:        gradle-1.0-Use-Exception-instead-CloneNotSupportedException.patch
 # jhernand 
@@ -57,7 +56,7 @@ Patch6:        gradle-1.1-use-proper-system-environment-variables.patch
 # mgoldmann
 # Since Gradle uses groovy-all.jar which bundles all dependencies and this is NOT allowed in Fedora
 # we need to use clean groovy.jar and point Gradle to its dependencies
-Patch7:        gradle-1.2-Fix-classpath-after-splitting-groovy-all-into-multip.patch
+Patch7:        gradle-1.7-Fix-classpath-after-splitting-groovy-all-into-multip.patch
 # Related to PATCH10 - we need to use the deps (asm, antlr) directly, not bundled versions
 Patch8:        gradle-1.2-Change-groovy-all-references-to-valid-package-names.patch
 # mgoldmann
@@ -66,9 +65,9 @@ Patch8:        gradle-1.2-Change-groovy-all-references-to-valid-package-names.pa
 Patch9:        gradle-1.0-Add-proper-checkstyle-dependencies.patch
 # Another tricky one, but I remember I had serious issues with classpath creation for codenarc
 # Using LOCAL_GROOVY instead of GROOVY did the trick. Yep, ugly
-Patch10:       gradle-1.2-Add-proper-codenarc-dependencies.patch
+Patch10:       gradle-1.7-Add-proper-codenarc-dependencies.patch
 # disable. require sonar http://www.sonarsource.org/
-Patch11:       gradle-1.3-Disable-sonar-plugin.patch
+Patch11:       gradle-1.7-Disable-sonar-plugin.patch
 # jhernand
 # change jna-posix with jnr-posix and add jnr-constant and jaffl
 Patch12:       gradle-1.3-Change-dependency-from-jna-to-jnr-for-native.patch
@@ -76,37 +75,42 @@ Patch12:       gradle-1.3-Change-dependency-from-jna-to-jnr-for-native.patch
 # Since we operate on symlinks Java is fooled by it and we need to specify the patch to gradle home manually
 Patch13:       gradle-1.0-Set-the-libdir-to-usr-share-gradle.patch
 # fix gradle checkstyle deps
-Patch14:       gradle-1.1-Add-missing-dependencies-when-using-clean-checkstyle.patch
+Patch14:       gradle-1.7-Add-missing-dependencies-when-using-clean-checkstyle.patch
 # remove docbook-xml at zip jquery:jquery.min:1.8.0 at js and http://themes.googleusercontent.com/static/fonts/ references
-Patch15:       gradle-1.3-No-zipped-docbook-jquery-google-fonts-available.patch
-# fix the location of the build deps
-# and remove jarjar.org.apache.maven (3) references
-# related to PATCH3
-Patch16:       gradle-1.3-Use-local-available-libraries.patch
+Patch15:       gradle-1.7-No-zipped-docbook-jquery-google-fonts-available.patch
 # remove jetty plugin references, prevent gradle error: unavailable module, gradle-jetty
-#Patch17:       gradle-1.3-Disable-jetty-plugin.patch
+Patch16:       gradle-1.7-Disable-jetty-plugin.patch
 # remove not required timestamp from artifacts version
 # disable also not needed commitId
-Patch18:       gradle-1.2-Fix-version-remove-timestamp.patch
+Patch17:       gradle-1.7-Fix-version-remove-timestamp.patch
 # maven 3 compatibility
-Patch19:       gradle-1.1-LoggingHelper.patch
-# TODO
-# unavailable deps require jmock 2.5.1
-# disable also the releaseArtifacts, docs and samples tasks (require gradle maven plugin)
-# Pat ch29:       gradle-1.0-disable-tests.patch
+Patch18:       gradle-1.1-LoggingHelper.patch
 # workaround
 # disable userguide and dslHtml tasks (unavailable deps: docbook:docbook-xsl:1.75.2 at zip)
 # docs depend on test tasks
-Patch20:       gradle-1.0-docs.patch
+Patch19:       gradle-1.7-docs.patch
 # Disable zinc support for gradle scala plugin,
 # com.typesafe.zinc:zinc:0.2.1 not available in Fedora
-Patch21:       gradle-1.6-no-zinc.patch
+Patch20:       gradle-1.7-no-zinc.patch
+# Use asm3, cause: gradle use, also, groovy-all asm3 embedded classes
+Patch21:       gradle-1.7-asm3.patch
+
+# fix the location of the build deps
+# and remove jarjar.org.apache.maven (3) references
+# related to PATCH3
+Patch22:       gradle-1.3-Use-local-available-libraries.patch
+# TODO
+# unavailable deps require jmock 2.5.1
+# disable also the releaseArtifacts, docs and samples tasks (require gradle maven plugin)
+Patch23:       gradle-1.0-disable-tests.patch
+
+
 # print the stack trace even when failure is not instance of GradleException
-Patch31:       gradle-1.6-printStackTrace.patch
+Patch30:       gradle-1.6-printStackTrace.patch
 
-Patch32:       gradle-1.6-ivy.patch
+Patch31:       gradle-1.7-ivy.patch
 # FIXME Remove this patch when polyglot is available
-Patch33:       gradle-1.6-Disabled-polyglot-maven-support.patch
+Patch32:       gradle-1.6-Disabled-polyglot-maven-support.patch
 
 # groovy 1.8.x embedded library
 BuildRequires: antlr-tool
@@ -148,6 +152,7 @@ BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api)
 BuildRequires: mvn(org.apache.xbean:xbean-reflect)
 # bnd ant task
 BuildRequires: mvn(biz.aQute:bnd)
+# biz.aQute.bnd:bndlib:2.1.0
 BuildRequires: mvn(biz.aQute:bndlib)
 BuildRequires: mvn(org.bouncycastle:bcprov-jdk16)
 BuildRequires: mvn(org.bouncycastle:bcpg-jdk16)
@@ -162,7 +167,7 @@ BuildRequires: mvn(org.eclipse.aether:aether-ant-tasks)
 BuildRequires: mvn(org.fusesource.jansi:jansi)
 BuildRequires: mvn(org.hamcrest:hamcrest-core)
 BuildRequires: mvn(org.hamcrest:hamcrest-library)
-BuildRequires: mvn(org.ow2.asm:asm-all)
+#BuildRequires: mvn(org.ow2.asm:asm-all)
 BuildRequires: mvn(org.samba.jcifs:jcifs)
 BuildRequires: mvn(org.simpleframework:simple)
 BuildRequires: mvn(org.slf4j:jcl-over-slf4j)
@@ -506,6 +511,10 @@ sed -i "s|@Override|//@Override|" \
   subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomInstallTask.java
 %endif
 
+# TODO Require aqute-bndlib 2.1.0 is not available, use 1.5x.x
+sed -i "s|aQute.bnd.osgi.Analyzer|aQute.lib.osgi.Analyzer|" \
+ subprojects/osgi/src/main/groovy/org/gradle/api/internal/plugins/osgi/ContainedVersionAnalyzer.java \
+ subprojects/osgi/src/main/groovy/org/gradle/api/internal/plugins/osgi/DefaultOsgiManifest.java
 
 sed -i 's|org.sonatype.aether.RepositorySystemSession|org.eclipse.aether.RepositorySystemSession|' \
   subprojects/build-setup/src/main/groovy/org/gradle/buildsetup/plugins/internal/maven/MavenProjectsCreator.java
@@ -693,7 +702,7 @@ ln -sf $(build-classpath objectweb-asm/asm-all) %{buildroot}%{_datadir}/%{name}/
 ln -sf $(build-classpath commons-cli) %{buildroot}%{_datadir}/%{name}/lib/commons-cli-1.2.jar
 
 ln -sf $(build-classpath atinject)  %{buildroot}%{_datadir}/%{name}/lib/atinject.jar
-ln -sf $(build-classpath objectweb-asm4/asm-all-4.0) %{buildroot}%{_datadir}/%{name}/lib/asm-all-4.0.jar
+#ln -sf $(build-classpath objectweb-asm4/asm-all-4.0) %{buildroot}%{_datadir}/%{name}/lib/asm-all-4.0.jar
 ln -sf $(build-classpath atinject) %{buildroot}%{_datadir}/%{name}/lib/plugins/atinject.jar
 
 ln -sf $(build-classpath commons-collections) %{buildroot}%{_datadir}/%{name}/lib/commons-collections-3.2.1.jar
@@ -815,6 +824,9 @@ fi
 %doc LICENSE NOTICE
 
 %changelog
+* Fri Aug 30 2013 gil cattaneo <puntogil at libero.it> 1.7-1
+- Update to 1.7
+
 * Tue Aug 13 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.6-2
 - Port to Eclipse Aether
 - Port from Maven Ant Tasks to Aether Ant Tasks

More information about the scm-commits mailing list