diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 862959b..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -gradle.tar.gz -/gradle-1.0-src.zip diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..0f98991 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Package is retired diff --git a/gradle-1.0-Add-missing-dependencies-when-using-clean-checkstyle.patch b/gradle-1.0-Add-missing-dependencies-when-using-clean-checkstyle.patch deleted file mode 100644 index c032d34..0000000 --- a/gradle-1.0-Add-missing-dependencies-when-using-clean-checkstyle.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy ---- gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy 2012-09-21 21:09:50.707110044 +0200 -+++ gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy 2012-09-21 21:09:28.939215486 +0200 -@@ -52,6 +52,8 @@ - project.dependencies { - checkstyle "antlr:antlr:2.7.7" - checkstyle "com.puppycrawl.tools:checkstyle:$extension.toolVersion" -+ checkstyle "com.google.guava:guava:11.0.1" -+ checkstyle "commons-beanutils:commons-beanutils:1.8.3" - } - } - config diff --git a/gradle-1.0-Add-proper-checkstyle-dependencies.patch b/gradle-1.0-Add-proper-checkstyle-dependencies.patch deleted file mode 100644 index 8909910..0000000 --- a/gradle-1.0-Add-proper-checkstyle-dependencies.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nru gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy ---- gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy 2012-09-21 20:38:28.757837373 +0200 -@@ -50,7 +50,10 @@ - def config = project.configurations['checkstyle'] - if (config.dependencies.empty) { - project.dependencies { -+ checkstyle "antlr:antlr:2.7.7" - checkstyle "com.puppycrawl.tools:checkstyle:$extension.toolVersion" -+// checkstyle "com.google.guava:guava:11.0.1" -+// checkstyle "commons-beanutils:commons-beanutils:1.8.3" - } - } - config diff --git a/gradle-1.0-Add-proper-codenarc-dependencies.patch b/gradle-1.0-Add-proper-codenarc-dependencies.patch deleted file mode 100644 index ca91f0c..0000000 --- a/gradle-1.0-Add-proper-codenarc-dependencies.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -Nru gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy ---- gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy 2012-02-26 19:51:24.000000000 +0100 -+++ gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy 2012-09-21 20:41:41.905228525 +0200 -@@ -18,6 +18,7 @@ - import org.gradle.api.GradleException - import org.gradle.api.file.FileCollection - import org.gradle.api.internal.Instantiator -+import org.gradle.api.internal.ClassPathRegistry - import org.gradle.api.internal.project.IsolatedAntBuilder - import org.gradle.api.plugins.quality.internal.CheckstyleReportsImpl - import org.gradle.api.reporting.Reporting -@@ -141,7 +142,7 @@ - public void run() { - def propertyName = "org.gradle.checkstyle.violations" - def antBuilder = services.get(IsolatedAntBuilder) -- antBuilder.withClasspath(getCheckstyleClasspath()).execute { -+ antBuilder.withGroovy(services.get(ClassPathRegistry).getClassPath("GROOVY").asFiles).withClasspath(getCheckstyleClasspath()).execute { - ant.taskdef(name: 'checkstyle', classname: 'com.puppycrawl.tools.checkstyle.CheckStyleTask') - - ant.checkstyle(config: getConfigFile(), failOnViolation: false, failureProperty: propertyName) { -diff -Nru gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy ---- gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy 2012-09-21 20:42:29.333850013 +0200 -+++ gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy 2012-09-21 20:41:41.906228474 +0200 -@@ -52,8 +52,6 @@ - project.dependencies { - checkstyle "antlr:antlr:2.7.7" - checkstyle "com.puppycrawl.tools:checkstyle:$extension.toolVersion" --// checkstyle "com.google.guava:guava:11.0.1" --// checkstyle "commons-beanutils:commons-beanutils:1.8.3" - } - } - config -diff -Nru gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy ---- gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy 2012-02-26 19:51:24.000000000 +0100 -+++ gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy 2012-09-21 20:41:41.907228424 +0200 -@@ -21,6 +21,7 @@ - import org.gradle.api.GradleException - import org.gradle.api.file.FileCollection - import org.gradle.api.internal.Instantiator -+import org.gradle.api.internal.ClassPathRegistry - import org.gradle.api.internal.project.IsolatedAntBuilder - import org.gradle.api.logging.LogLevel - import org.gradle.api.plugins.quality.internal.CodeNarcReportsImpl -@@ -99,7 +100,7 @@ - void run() { - logging.captureStandardOutput(LogLevel.INFO) - def antBuilder = services.get(IsolatedAntBuilder) -- antBuilder.withClasspath(getCodenarcClasspath()).execute { -+ antBuilder.withGroovy(services.get(ClassPathRegistry).getClassPath("LOCAL_GROOVY").asFiles).withClasspath(getCodenarcClasspath()).execute { - ant.taskdef(name: 'codenarc', classname: 'org.codenarc.ant.CodeNarcTask') - try { - ant.codenarc(ruleSetFiles: "file:${getConfigFile()}", maxPriority1Violations: 0, maxPriority2Violations: 0, maxPriority3Violations: 0) { -diff -Nru gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcPlugin.groovy gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcPlugin.groovy ---- gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcPlugin.groovy 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcPlugin.groovy 2012-09-21 20:41:41.908228373 +0200 -@@ -55,6 +55,7 @@ - def config = project.configurations['codenarc'] - if (config.dependencies.empty) { - project.dependencies { -+ codenarc "antlr:antlr:2.7.7" - codenarc "org.codenarc:CodeNarc:$extension.toolVersion" - } - } diff --git a/gradle-1.0-Change-dependency-from-jna-to-jnr-for-native.patch b/gradle-1.0-Change-dependency-from-jna-to-jnr-for-native.patch deleted file mode 100644 index 2f2c282..0000000 --- a/gradle-1.0-Change-dependency-from-jna-to-jnr-for-native.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nru gradle-1.0/gradle/providedConfiguration.gradle gradle-1.0-gil/gradle/providedConfiguration.gradle ---- gradle-1.0/gradle/providedConfiguration.gradle 2012-02-26 19:51:24.000000000 +0100 -+++ gradle-1.0-gil/gradle/providedConfiguration.gradle 2012-09-21 20:55:56.978894352 +0200 -@@ -11,7 +11,7 @@ - } - - sourceSets.main { -- compileClasspath = configurations.provided -+// compileClasspath = configurations.provided - } - - plugins.withType(IdeaPlugin) { -diff -Nru gradle-1.0/subprojects/native/native.gradle gradle-1.0-gil/subprojects/native/native.gradle ---- gradle-1.0/subprojects/native/native.gradle 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/native/native.gradle 2012-09-21 20:55:56.979894298 +0200 -@@ -10,8 +10,10 @@ - compile libraries.commons_io - compile libraries.slf4j_api - compile libraries.jna -- compile module('org.jruby.ext.posix:jna-posix:1.0.3') { -+ compile module('org.jruby.ext.posix:jnr-posix:1.0.3') { - dependency libraries.jna -+ dependency 'org.jruby.extras:constantine:0.7' -+ dependency 'org.jruby.extras:jaffl:0.7' - } - compile module('org.fusesource.jansi:jansi:1.2.1') { - dependency libraries.jna diff --git a/gradle-1.0-Change-groovy-all-references-to-valid-package-names.patch b/gradle-1.0-Change-groovy-all-references-to-valid-package-names.patch deleted file mode 100644 index cde611b..0000000 --- a/gradle-1.0-Change-groovy-all-references-to-valid-package-names.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -Nru gradle-1.0/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/ExtractDslMetaDataTask.groovy gradle-1.0-gil/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/ExtractDslMetaDataTask.groovy ---- gradle-1.0/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/ExtractDslMetaDataTask.groovy 2012-02-26 19:51:24.000000000 +0100 -+++ gradle-1.0-gil/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/ExtractDslMetaDataTask.groovy 2012-09-21 20:33:53.398721824 +0200 -@@ -15,7 +15,7 @@ - */ - package org.gradle.build.docs.dsl - --import groovyjarjarantlr.collections.AST -+import antlr.collections.AST - import org.codehaus.groovy.antlr.AntlrASTProcessor - import org.codehaus.groovy.antlr.SourceBuffer - import org.codehaus.groovy.antlr.UnicodeEscapingReader -diff -Nru gradle-1.0/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/SourceMetaDataVisitor.java gradle-1.0-gil/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/SourceMetaDataVisitor.java ---- gradle-1.0/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/SourceMetaDataVisitor.java 2011-06-23 21:14:12.000000000 +0200 -+++ gradle-1.0-gil/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/SourceMetaDataVisitor.java 2012-09-21 20:33:53.400721713 +0200 -@@ -15,7 +15,7 @@ - */ - package org.gradle.build.docs.dsl; - --import groovyjarjarantlr.collections.AST; -+import antlr.collections.AST; - import org.apache.commons.lang.StringUtils; - import org.codehaus.groovy.antlr.GroovySourceAST; - import org.codehaus.groovy.antlr.LineColumn; -diff -Nru gradle-1.0/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java gradle-1.0-gil/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java ---- gradle-1.0/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java 2012-09-21 20:33:53.401721658 +0200 -@@ -19,7 +19,7 @@ - import groovy.lang.GroovyClassLoader; - import groovy.lang.GroovyCodeSource; - import groovy.lang.Script; --import groovyjarjarasm.asm.ClassWriter; -+import org.objectweb.asm.ClassWriter; - import org.apache.commons.lang.StringUtils; - import org.codehaus.groovy.ast.expr.ConstantExpression; - import org.codehaus.groovy.ast.stmt.ReturnStatement; -@@ -90,7 +90,7 @@ - // Groovy will only put the filename into the class, but that does not help a debugger for Gradle - // because it does not know where Gradle scripts might live. - @Override -- protected groovyjarjarasm.asm.ClassVisitor createClassVisitor() { -+ protected org.objectweb.asm.ClassVisitor createClassVisitor() { - return new ClassWriter(ClassWriter.COMPUTE_MAXS) { - // ignore the sourcePath that is given by Groovy (this is only the filename) and instead - // insert the full path if our script source has a source file -diff -Nru gradle-1.0/subprojects/core/src/test/groovy/org/gradle/process/internal/child/SerializableMockHelper.groovy gradle-1.0-gil/subprojects/core/src/test/groovy/org/gradle/process/internal/child/SerializableMockHelper.groovy ---- gradle-1.0/subprojects/core/src/test/groovy/org/gradle/process/internal/child/SerializableMockHelper.groovy 2011-06-23 21:14:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/core/src/test/groovy/org/gradle/process/internal/child/SerializableMockHelper.groovy 2012-09-21 20:33:53.402721605 +0200 -@@ -18,8 +18,8 @@ - - package org.gradle.process.internal.child - --import groovyjarjarasm.asm.ClassVisitor --import groovyjarjarasm.asm.ClassWriter -+import org.objectweb.asm.ClassVisitor -+import org.objectweb.asm.Writer - import java.util.concurrent.atomic.AtomicInteger - import org.codehaus.groovy.ast.ClassNode - import org.codehaus.groovy.control.CompilationUnit diff --git a/gradle-1.0-Disable-codenarc-plugin-since-CodeNarc-is-not-avaial.patch b/gradle-1.0-Disable-codenarc-plugin-since-CodeNarc-is-not-avaial.patch deleted file mode 100644 index d8a2a38..0000000 --- a/gradle-1.0-Disable-codenarc-plugin-since-CodeNarc-is-not-avaial.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Nru gradle-1.0/buildSrc/build.gradle gradle-1.0-gil/buildSrc/build.gradle ---- gradle-1.0/buildSrc/build.gradle 2012-09-21 21:21:55.224979248 +0200 -+++ gradle-1.0-gil/buildSrc/build.gradle 2012-09-21 21:20:43.709835683 +0200 -@@ -16,7 +16,7 @@ - - apply plugin: 'groovy' - apply plugin: 'checkstyle' --apply plugin: 'codenarc' -+//apply plugin: 'codenarc' - apply plugin: 'idea' - apply plugin: 'eclipse' - -diff -Nru gradle-1.0/gradle/codeQuality.gradle gradle-1.0-gil/gradle/codeQuality.gradle ---- gradle-1.0/gradle/codeQuality.gradle 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/gradle/codeQuality.gradle 2012-09-21 21:20:43.710835628 +0200 -@@ -1,5 +1,5 @@ - apply plugin: 'checkstyle' --apply plugin: 'codenarc' -+//apply plugin: 'codenarc' - - def configDir = new File(buildscript.sourceFile.parentFile.parentFile, 'config') - -@@ -10,9 +10,9 @@ - configProperties.checkstyleConfigDir = checkstyleConfigDir - } - --codenarc { -- configFile = new File(configDir, "codenarc.xml") --} -+//codenarc { -+// configFile = new File(configDir, "codenarc.xml") -+//} - - plugins.withType(GroovyBasePlugin) { - sourceSets.all { sourceSet -> -@@ -29,4 +29,4 @@ - dependsOn tasks.matching { task -> - [org.gradle.api.plugins.quality.CodeNarc, org.gradle.api.plugins.quality.Checkstyle].any { it.isInstance(task) } - } --} -\ Manca newline alla fine del file -+} diff --git a/gradle-1.0-Disable-jetty-plugin.patch b/gradle-1.0-Disable-jetty-plugin.patch deleted file mode 100644 index 46fc670..0000000 --- a/gradle-1.0-Disable-jetty-plugin.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nru gradle-1.0/build.gradle gradle-1.0-gil/build.gradle ---- gradle-1.0/build.gradle 2012-09-21 21:37:28.152575887 +0200 -+++ gradle-1.0-gil/build.gradle 2012-09-21 21:36:37.097427513 +0200 -@@ -498,7 +498,7 @@ - } - - def pluginProjects() { -- ['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'ide', 'announce', 'scala', 'cpp', 'ear'].collect { -+ ['plugins', 'codeQuality', 'antlr', 'wrapper', 'osgi', 'ide', 'announce', 'scala', 'cpp', 'ear'].collect { - project(it) - } - } -diff -Nru gradle-1.0/settings.gradle gradle-1.0-gil/settings.gradle ---- gradle-1.0/settings.gradle 2012-09-21 21:37:28.149576055 +0200 -+++ gradle-1.0-gil/settings.gradle 2012-09-21 21:36:37.098427457 +0200 -@@ -25,7 +25,7 @@ - include 'osgi' - //include 'maven' - include 'announce' --include 'jetty' -+//include 'jetty' - include 'codeQuality' - include 'antlr' - include 'ui' diff --git a/gradle-1.0-Disable-maven-plugin.patch b/gradle-1.0-Disable-maven-plugin.patch deleted file mode 100644 index 4d83dde..0000000 --- a/gradle-1.0-Disable-maven-plugin.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -Nru gradle-1.0/build.gradle gradle-1.0-gil/build.gradle ---- gradle-1.0/build.gradle 2012-09-21 20:47:05.895913238 +0200 -+++ gradle-1.0-gil/build.gradle 2012-09-21 20:46:29.733765832 +0200 -@@ -496,7 +496,7 @@ - } - - def pluginProjects() { -- ['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', 'ide', 'announce', 'scala', 'sonar', 'signing', 'cpp', 'ear'].collect { -+ ['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'ide', 'announce', 'scala', 'sonar', 'signing', 'cpp', 'ear'].collect { - project(it) - } - } -diff -Nru gradle-1.0/gradle/publish.gradle gradle-1.0-gil/gradle/publish.gradle ---- gradle-1.0/gradle/publish.gradle 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/gradle/publish.gradle 2012-09-21 20:46:29.734765781 +0200 -@@ -1,4 +1,4 @@ --apply plugin: 'maven' -+//apply plugin: 'maven' - - configurations { - publishCompile -diff -Nru gradle-1.0/settings.gradle gradle-1.0-gil/settings.gradle ---- gradle-1.0/settings.gradle 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/settings.gradle 2012-09-21 20:46:29.734765781 +0200 -@@ -23,7 +23,7 @@ - include 'scala' - include 'ide' - include 'osgi' --include 'maven' -+//include 'maven' - include 'announce' - include 'jetty' - include 'codeQuality' -diff -Nru gradle-1.0/subprojects/code-quality/code-quality.gradle gradle-1.0-gil/subprojects/code-quality/code-quality.gradle ---- gradle-1.0/subprojects/code-quality/code-quality.gradle 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/code-quality/code-quality.gradle 2012-09-21 20:46:29.735765730 +0200 -@@ -25,10 +25,10 @@ - - // minimal dependencies to make our code compile - // we don't ship these dependencies because findbugs plugin will download them (and more) at runtime -- provided "com.google.code.findbugs:findbugs:2.0.0@jar" -- provided "com.google.code.findbugs:bcel:2.0.0@jar" -- provided "dom4j:dom4j:1.6.1@jar" -- provided "jaxen:jaxen:1.1.1@jar" -+ compile "com.google.code.findbugs:findbugs:2.0.0@jar" -+ compile "com.google.code.findbugs:bcel:2.0.0@jar" -+ compile "dom4j:dom4j:1.6.1@jar" -+ compile "jaxen:jaxen:1.1.1@jar" - } - - useTestFixtures() -diff -Nru gradle-1.0/subprojects/cpp/cpp.gradle gradle-1.0-gil/subprojects/cpp/cpp.gradle ---- gradle-1.0/subprojects/cpp/cpp.gradle 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/cpp/cpp.gradle 2012-09-21 20:46:29.735765730 +0200 -@@ -19,7 +19,7 @@ - compile project(':core') - compile project(":plugins") - compile project(":ide") -- integTestRuntime project(":maven") -+// integTestRuntime project(":maven") - } - - useTestFixtures() -diff -Nru gradle-1.0/subprojects/plugins/plugins.gradle gradle-1.0-gil/subprojects/plugins/plugins.gradle ---- gradle-1.0/subprojects/plugins/plugins.gradle 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/plugins/plugins.gradle 2012-09-21 20:46:29.736765679 +0200 -@@ -38,7 +38,7 @@ - compile libraries.slf4j_api - compile 'org.testng:testng:6.3.1' - -- provided files(Jvm.current().toolsJar) // for SunJavaCompiler -+ compile files(Jvm.current().toolsJar) // for SunJavaCompiler - - runtime libraries.commons_cli - -@@ -59,4 +59,4 @@ - } - - useTestFixtures() --useTestFixtures(sourceSet: "testFixtures") -\ Manca newline alla fine del file -+useTestFixtures(sourceSet: "testFixtures") diff --git a/gradle-1.0-Disable-signing-plugin.patch b/gradle-1.0-Disable-signing-plugin.patch deleted file mode 100644 index bb78031..0000000 --- a/gradle-1.0-Disable-signing-plugin.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nru gradle-1.0/build.gradle gradle-1.0-gil/build.gradle ---- gradle-1.0/build.gradle 2012-09-21 20:51:24.631434894 +0200 -+++ gradle-1.0-gil/build.gradle 2012-09-21 20:50:15.841053901 +0200 -@@ -496,7 +496,7 @@ - } - - def pluginProjects() { -- ['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'ide', 'announce', 'scala', 'sonar', 'signing', 'cpp', 'ear'].collect { -+ ['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'ide', 'announce', 'scala', 'sonar', 'cpp', 'ear'].collect { - project(it) - } - } -diff -Nru gradle-1.0/settings.gradle gradle-1.0-gil/settings.gradle ---- gradle-1.0/settings.gradle 2012-09-21 20:51:24.633434788 +0200 -+++ gradle-1.0-gil/settings.gradle 2012-09-21 20:50:15.842053848 +0200 -@@ -34,7 +34,7 @@ - include 'docs' - include 'integTest' - include 'sonar' --include 'signing' -+//include 'signing' - include 'cpp' - include 'ear' - include 'native' diff --git a/gradle-1.0-Disable-sonar-plugin.patch b/gradle-1.0-Disable-sonar-plugin.patch deleted file mode 100644 index cbca618..0000000 --- a/gradle-1.0-Disable-sonar-plugin.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nru gradle-1.0/build.gradle gradle-1.0-gil/build.gradle ---- gradle-1.0/build.gradle 2012-09-21 20:54:19.564131270 +0200 -+++ gradle-1.0-gil/build.gradle 2012-09-21 20:53:17.560444431 +0200 -@@ -496,7 +496,7 @@ - } - - def pluginProjects() { -- ['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'ide', 'announce', 'scala', 'sonar', 'cpp', 'ear'].collect { -+ ['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'ide', 'announce', 'scala', 'cpp', 'ear'].collect { - project(it) - } - } -diff -Nru gradle-1.0/settings.gradle gradle-1.0-gil/settings.gradle ---- gradle-1.0/settings.gradle 2012-09-21 20:54:19.565131217 +0200 -+++ gradle-1.0-gil/settings.gradle 2012-09-21 20:53:17.561444378 +0200 -@@ -33,7 +33,7 @@ - include 'toolingApi' - include 'docs' - include 'integTest' --include 'sonar' -+//include 'sonar' - //include 'signing' - include 'cpp' - include 'ear' diff --git a/gradle-1.0-Disable-website-module.patch b/gradle-1.0-Disable-website-module.patch deleted file mode 100644 index 6bef75b..0000000 --- a/gradle-1.0-Disable-website-module.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru gradle-1.0/settings.gradle gradle-1.0-gil/settings.gradle ---- gradle-1.0/settings.gradle 2012-09-21 21:30:22.688226217 +0200 -+++ gradle-1.0-gil/settings.gradle 2012-09-21 21:29:32.903974209 +0200 -@@ -40,7 +40,7 @@ - include 'native' - include 'internalTesting' - include 'internalIntegTesting' --include 'website' -+//include 'website' - include 'performance' - - rootProject.name = 'gradle' diff --git a/gradle-1.0-Disabled-polyglot-maven-support.patch b/gradle-1.0-Disabled-polyglot-maven-support.patch deleted file mode 100644 index 8a93ede..0000000 --- a/gradle-1.0-Disabled-polyglot-maven-support.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff -Nru gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/CustomModelBuilder.java gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/CustomModelBuilder.java ---- gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/CustomModelBuilder.java 2011-10-25 05:52:58.000000000 +0200 -+++ gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/CustomModelBuilder.java 2012-09-21 20:04:18.564045008 +0200 -@@ -20,19 +20,21 @@ - import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; - import org.gradle.api.internal.artifacts.PlexusLoggerAdapter; - import org.slf4j.LoggerFactory; -+/* - import org.sonatype.maven.polyglot.execute.ExecuteManager; - import org.sonatype.maven.polyglot.execute.ExecuteManagerImpl; - import org.sonatype.maven.polyglot.groovy.builder.ModelBuilder; -- -+*/ - import java.lang.reflect.Field; - import java.util.Map; - - /** - * This is a slightly modified version as shipped with polyglot Maven. - */ --public class CustomModelBuilder extends ModelBuilder { -- -+//public class CustomModelBuilder extends ModelBuilder { -+public class CustomModelBuilder { - public CustomModelBuilder(Model model) { -+ /* - ExecuteManager executeManager = new ExecuteManagerImpl(); - setProp(executeManager.getClass(), executeManager, "log", - new PlexusLoggerAdapter(LoggerFactory.getLogger(ExecuteManagerImpl.class))); -@@ -48,6 +50,8 @@ - factories.remove("project"); - ModelFactory modelFactory = new ModelFactory(model); - registerFactory(modelFactory.getName(), null, modelFactory); -+ */ -+ throw new UnsupportedOperationException("CustomModelBuilder"); - } - - public static void setProp(Class c, Object obj, String fieldName, Object value) { -diff -Nru gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ModelFactory.java gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ModelFactory.java ---- gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ModelFactory.java 2011-10-25 05:52:58.000000000 +0200 -+++ gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ModelFactory.java 2012-09-21 20:04:18.565044951 +0200 -@@ -17,26 +17,30 @@ - - import groovy.util.FactoryBuilderSupport; - import org.apache.maven.model.Model; --import org.sonatype.maven.polyglot.groovy.builder.factory.NamedFactory; -+//import org.sonatype.maven.polyglot.groovy.builder.factory.NamedFactory; - - import java.util.Map; - - /** - * This is a slightly modified version as shipped with polyglot Maven. - */ --public class ModelFactory extends NamedFactory { -+//public class ModelFactory extends NamedFactory { -+public class ModelFactory { - private Model model; - - public ModelFactory(Model model) { -+ /* - super("project"); - this.model = model; -+ */ -+ throw new UnsupportedOperationException("ModelFactory"); - } - - public Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attrs) throws InstantiationException, IllegalAccessException { - return model; - } - -- @Override -+ //@Override - public void onNodeCompleted(FactoryBuilderSupport builder, Object parent, Object node) { - Model model = (Model)node; - } -diff -Nru gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/CustomModelBuilder.java gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/CustomModelBuilder.java ---- gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/CustomModelBuilder.java 2011-06-23 21:14:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/CustomModelBuilder.java 2012-09-21 20:04:18.566044894 +0200 -@@ -23,16 +23,20 @@ - import org.apache.maven.model.Model; - import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; - import org.slf4j.LoggerFactory; -+/* - import org.sonatype.maven.polyglot.execute.ExecuteManager; - import org.sonatype.maven.polyglot.execute.ExecuteManagerImpl; - import org.sonatype.maven.polyglot.groovy.builder.ModelBuilder; -+*/ - - /** - * This is a slightly modified version as shipped with polyglot Maven. - */ --public class CustomModelBuilder extends ModelBuilder { -+//public class CustomModelBuilder extends ModelBuilder { -+public class CustomModelBuilder { - - public CustomModelBuilder(Model model) { -+ /* - ExecuteManager executeManager = new ExecuteManagerImpl(); - setProp(executeManager.getClass(), executeManager, "log", - new PlexusLoggerAdapter(LoggerFactory.getLogger(ExecuteManagerImpl.class))); -@@ -48,6 +52,8 @@ - factories.remove("project"); - ModelFactory modelFactory = new ModelFactory(model); - registerFactory(modelFactory.getName(), null, modelFactory); -+ */ -+ throw new UnsupportedOperationException("CustomModelBuilder"); - } - - public static void setProp(Class c, Object obj, String fieldName, Object value) { -diff -Nru gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/ModelFactory.java gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/ModelFactory.java ---- gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/ModelFactory.java 2011-06-23 21:14:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/pombuilder/ModelFactory.java 2012-09-21 20:04:18.567044837 +0200 -@@ -20,24 +20,28 @@ - import groovy.util.FactoryBuilderSupport; - - import org.apache.maven.model.Model; --import org.sonatype.maven.polyglot.groovy.builder.factory.NamedFactory; -+//import org.sonatype.maven.polyglot.groovy.builder.factory.NamedFactory; - - /** - * This is a slightly modified version as shipped with polyglot Maven. - */ --public class ModelFactory extends NamedFactory { -+//public class ModelFactory extends NamedFactory { -+public class ModelFactory { - private Model model; - - public ModelFactory(Model model) { -+ /* - super("project"); - this.model = model; -+ */ -+ throw new UnsupportedOperationException("ModelFactory"); - } - - public Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attrs) throws InstantiationException, IllegalAccessException { - return model; - } - -- @Override -+ //@Override - public void onNodeCompleted(FactoryBuilderSupport builder, Object parent, Object node) { - Model model = (Model) node; - } diff --git a/gradle-1.0-Fix-classpath-after-splitting-groovy-all-into-multip.patch b/gradle-1.0-Fix-classpath-after-splitting-groovy-all-into-multip.patch deleted file mode 100644 index 0913013..0000000 --- a/gradle-1.0-Fix-classpath-after-splitting-groovy-all-into-multip.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Nru gradle-1.0/build.gradle gradle-1.0-gil/build.gradle ---- gradle-1.0/build.gradle 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/build.gradle 2012-09-21 20:31:52.419267435 +0200 -@@ -104,7 +104,12 @@ - antlr: 'antlr:antlr:2.7.7@jar', - dom4j: 'dom4j:dom4j:1.6.1@jar', - guava: 'com.google.guava:guava:11.0.1@jar', -- groovy: 'org.codehaus.groovy:groovy-all:1.8.6@jar', -+ groovy: [ -+ 'org.codehaus.groovy:groovy:1.8.6@jar', -+ 'asm:asm-all:3.3.1@jar', -+ 'antlr:antlr:2.7.7@jar', -+ 'commons-cli:commons-cli:1.2@jar' -+ ], - jaxen: 'jaxen:jaxen:1.1@jar', - jcip: "net.jcip:jcip-annotations:1.0", - jna: 'net.java.dev.jna:jna:3.2.7@jar', -diff -Nru gradle-1.0/subprojects/core/src/main/groovy/org/gradle/api/internal/DefaultClassPathProvider.java gradle-1.0-gil/subprojects/core/src/main/groovy/org/gradle/api/internal/DefaultClassPathProvider.java ---- gradle-1.0/subprojects/core/src/main/groovy/org/gradle/api/internal/DefaultClassPathProvider.java 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/core/src/main/groovy/org/gradle/api/internal/DefaultClassPathProvider.java 2012-09-21 20:31:52.420267381 +0200 -@@ -47,8 +47,16 @@ - classpath = classpath.plus(moduleRegistry.getExternalModule("ant-launcher").getClasspath()); - return classpath; - } -- if (name.equals("GROOVY")) { -- return moduleRegistry.getExternalModule("groovy-all").getClasspath(); -+ if (name.equals("GROOVY") || name.equals("LOCAL_GROOVY")) { -+ ClassPath classpath = new DefaultClassPath(); -+ classpath = classpath.plus(moduleRegistry.getExternalModule("groovy-all").getClasspath()); -+ -+ if (name.equals("LOCAL_GROOVY")) -+ classpath = classpath.plus(moduleRegistry.getExternalModule("antlr").getClasspath()); -+ -+ classpath = classpath.plus(moduleRegistry.getExternalModule("asm-all").getClasspath()); -+ classpath = classpath.plus(moduleRegistry.getExternalModule("commons-cli").getClasspath()); -+ return classpath; - } - - return null; -diff -Nru gradle-1.0/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultClassLoaderRegistry.java gradle-1.0-gil/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultClassLoaderRegistry.java ---- gradle-1.0/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultClassLoaderRegistry.java 2012-04-30 02:27:38.000000000 +0200 -+++ gradle-1.0-gil/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultClassLoaderRegistry.java 2012-09-21 20:31:52.420267381 +0200 -@@ -54,7 +54,7 @@ - rootClassLoader.allowPackage("org.apache.tools.ant"); - rootClassLoader.allowPackage("groovy"); - rootClassLoader.allowPackage("org.codehaus.groovy"); -- rootClassLoader.allowPackage("groovyjarjarantlr"); -+ rootClassLoader.allowPackage("antlr"); - rootClassLoader.allowPackage("org.apache.ivy"); - rootClassLoader.allowPackage("org.slf4j"); - rootClassLoader.allowPackage("org.apache.commons.logging"); diff --git a/gradle-1.0-Fix-version-remove-timestamp.patch b/gradle-1.0-Fix-version-remove-timestamp.patch deleted file mode 100644 index 9c0d482..0000000 --- a/gradle-1.0-Fix-version-remove-timestamp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru gradle-1.0/buildSrc/src/main/groovy/org/gradle/build/Version.groovy gradle-1.0-gil/buildSrc/src/main/groovy/org/gradle/build/Version.groovy ---- gradle-1.0/buildSrc/src/main/groovy/org/gradle/build/Version.groovy 2012-02-26 19:51:24.000000000 +0100 -+++ gradle-1.0-gil/buildSrc/src/main/groovy/org/gradle/build/Version.groovy 2012-09-21 21:38:35.109831292 +0200 -@@ -65,7 +65,7 @@ - project.gradle.taskGraph.whenReady { graph -> - type = Type.values().find { it.detector(project) } - if (type != Type.FINAL) { -- versionNumber += "-" + buildTime -+ //versionNumber += "-" + buildTime - } - } - diff --git a/gradle-1.0-Maven-3-support.patch b/gradle-1.0-Maven-3-support.patch deleted file mode 100644 index d11742f..0000000 --- a/gradle-1.0-Maven-3-support.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -Nru gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultLocalMavenRepositoryLocator.java gradle-1.0-gil/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultLocalMavenRepositoryLocator.java ---- gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultLocalMavenRepositoryLocator.java 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultLocalMavenRepositoryLocator.java 2012-09-21 20:22:57.195186172 +0200 -@@ -15,79 +15,32 @@ - */ - package org.gradle.api.internal.artifacts.mvnsettings; - --import org.apache.maven.settings.DefaultMavenSettingsBuilder; --import org.apache.maven.settings.MavenSettingsBuilder; --import org.apache.maven.settings.Settings; --import org.gradle.api.internal.artifacts.PlexusLoggerAdapter; --import org.slf4j.Logger; --import org.slf4j.LoggerFactory; -- - import java.io.File; --import java.lang.reflect.Field; - import java.util.Map; --import java.util.regex.Matcher; --import java.util.regex.Pattern; - - /** - * @author Steve Ebersole - */ - public class DefaultLocalMavenRepositoryLocator implements LocalMavenRepositoryLocator { -- private static final Logger LOGGER = LoggerFactory.getLogger(DefaultLocalMavenRepositoryLocator.class); -- private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("\\$\\{([^\\}]*)\\}"); -- -- private final MavenFileLocations mavenFileLocations; -- private final Map systemProperties; -- private final Map environmentVariables; -+ private static final String SETTINGS_LOCATION_OVERRIDE = "maven.settings"; - - public DefaultLocalMavenRepositoryLocator(MavenFileLocations mavenFileLocations, Map systemProperties, Map environmentVariables) { -- this.mavenFileLocations = mavenFileLocations; -- this.systemProperties = systemProperties; -- this.environmentVariables = environmentVariables; - } - - public File getLocalMavenRepository() { -- Settings settings = buildSettings(); -- String repoPath = settings.getLocalRepository().trim(); -- return new File(resolvePlaceholders(repoPath)); -- } -- -- private String resolvePlaceholders(String value) { -- StringBuffer result = new StringBuffer(); -- Matcher matcher = PLACEHOLDER_PATTERN.matcher(value); -- -- while (matcher.find()) { -- String placeholder = matcher.group(1); -- String replacement = placeholder.startsWith("env.") ? environmentVariables.get(placeholder.substring(4)) : systemProperties.get(placeholder); -- if (replacement == null) { -- throw new CannotLocateLocalMavenRepositoryException(String.format("Cannot resolve placeholder '%s' in value '%s'", placeholder, value)); -- } -- matcher.appendReplacement(result, Matcher.quoteReplacement(replacement)); -- } -- matcher.appendTail(result); -- -- return result.toString(); -+ return determineSettingsFileLocation(); - } - -- private Settings buildSettings() { -- try { -- return createSettingsBuilder().buildSettings(); -- } catch (Exception e) { -- throw new CannotLocateLocalMavenRepositoryException(e); -- } -+ private static String normalizePath(String path) { -+ if ( path.startsWith( "~" ) ) { -+ path = System.getProperty( "user.home" ) + path.substring( 1 ); -+ } -+ return path; - } - -- private MavenSettingsBuilder createSettingsBuilder() throws Exception { -- DefaultMavenSettingsBuilder builder = new DefaultMavenSettingsBuilder(); -- builder.enableLogging(new PlexusLoggerAdapter(LOGGER)); -- -- Field userSettingsFileField = DefaultMavenSettingsBuilder.class.getDeclaredField("userSettingsFile"); -- userSettingsFileField.setAccessible(true); -- userSettingsFileField.set(builder, mavenFileLocations.getUserSettingsFile()); -- -- Field globalSettingsFileField = DefaultMavenSettingsBuilder.class.getDeclaredField("globalSettingsFile"); -- globalSettingsFileField.setAccessible(true); -- globalSettingsFileField.set(builder, mavenFileLocations.getGlobalSettingsFile()); -- -- return builder; -+ private File determineSettingsFileLocation() { -+ final String defaultLocation = "~/.m2/settings.xml"; -+ final String location = System.getProperty( SETTINGS_LOCATION_OVERRIDE, defaultLocation ); -+ return new File( normalizePath( location ) ); - } - } -diff -Nru gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/LoggingHelper.java gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/LoggingHelper.java ---- gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/LoggingHelper.java 2011-10-25 05:52:58.000000000 +0200 -+++ gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/LoggingHelper.java 2012-09-21 20:22:57.197186053 +0200 -@@ -17,7 +17,7 @@ - - import org.apache.maven.artifact.ant.AntDownloadMonitor; - import org.apache.maven.artifact.manager.DefaultWagonManager; --import org.apache.maven.artifact.manager.WagonManager; -+import org.apache.maven.artifact.handler.ArtifactHandler; - import org.apache.tools.ant.Project; - import org.codehaus.plexus.PlexusContainer; - import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -@@ -30,7 +30,7 @@ - public class LoggingHelper { - public static void injectLogger(PlexusContainer container, Project project) { - try { -- WagonManager wagonManager = (WagonManager) container.lookup(WagonManager.ROLE); -+ ArtifactHandler wagonManager = (ArtifactHandler) container.lookup(ArtifactHandler.ROLE); - Field field = DefaultWagonManager.class.getDeclaredField("downloadMonitor"); - field.setAccessible(true); - AntDownloadMonitor antDownloadMonitor = (AntDownloadMonitor) field.get(wagonManager); diff --git a/gradle-1.0-Missing-method-in-PlexusLoggerAdapter.patch b/gradle-1.0-Missing-method-in-PlexusLoggerAdapter.patch deleted file mode 100644 index 43c2004..0000000 --- a/gradle-1.0-Missing-method-in-PlexusLoggerAdapter.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java gradle-1.0-gil/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java ---- gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java 2011-10-25 05:52:58.000000000 +0200 -+++ gradle-1.0-gil/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java 2012-09-21 20:07:02.699911865 +0200 -@@ -98,4 +98,8 @@ - public String getName() { - return logger.getName(); - } -+ -+ public void setThreshold(int level) { -+ throw new UnsupportedOperationException("setThreshold"); -+ } - } diff --git a/gradle-1.0-No-spock-library-available.patch b/gradle-1.0-No-spock-library-available.patch deleted file mode 100644 index 75d03c3..0000000 --- a/gradle-1.0-No-spock-library-available.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nru gradle-1.0/buildSrc/build.gradle gradle-1.0-gil/buildSrc/build.gradle ---- gradle-1.0/buildSrc/build.gradle 2012-06-12 02:18:58.000000000 +0200 -+++ gradle-1.0-gil/buildSrc/build.gradle 2012-09-21 21:01:28.287836572 +0200 -@@ -31,7 +31,7 @@ - compile 'commons-lang:commons-lang:2.6@jar' - groovy localGroovy() - testCompile 'junit:junit:4.10@jar' -- testCompile 'org.spockframework:spock-core:0.6-groovy-1.8@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' -+// testCompile 'org.spockframework:spock-core:0.6-groovy-1.8@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' - - compile "org.pegdown:pegdown:1.1.0" - compile "org.jsoup:jsoup:1.6.3" -@@ -50,3 +50,11 @@ - apply from: '../gradle/compile.gradle' - apply from: '../gradle/codeQuality.gradle' - apply from: '../gradle/classycle.gradle' -+ -+compileTestGroovy { -+ exclude '**' -+} -+ -+test { -+ testReport = false -+} diff --git a/gradle-1.0-No-zipped-docbook-available.patch b/gradle-1.0-No-zipped-docbook-available.patch deleted file mode 100644 index 3064453..0000000 --- a/gradle-1.0-No-zipped-docbook-available.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nru gradle-1.0/subprojects/docs/docs.gradle gradle-1.0-gil/subprojects/docs/docs.gradle ---- gradle-1.0/subprojects/docs/docs.gradle 2012-06-12 02:18:58.000000000 +0200 -+++ gradle-1.0-gil/subprojects/docs/docs.gradle 2012-09-21 21:24:30.835535969 +0200 -@@ -39,7 +39,7 @@ - } - userGuideTask 'xslthl:xslthl:2.0.1@jar' - -- userGuideStyleSheets 'docbook:docbook-xsl:1.75.2@zip' -+// userGuideStyleSheets 'docbook:docbook-xsl:1.75.2@zip' - } - - ext { -@@ -105,10 +105,10 @@ - from(cssSrcDir) { - include '*.css' - } -- from(zipTree(configurations.userGuideStyleSheets.singleFile)) { -- // Remove the prefix -- eachFile { fcd -> fcd.path = fcd.path.replaceFirst('^docbook-xsl-[0-9\\.]+/', '') } -- } -+// from(zipTree(configurations.userGuideStyleSheets.singleFile)) { -+// // Remove the prefix -+// eachFile { fcd -> fcd.path = fcd.path.replaceFirst('^docbook-xsl-[0-9\\.]+/', '') } -+// } - } - - task samplesDocbook(type: AssembleSamplesDocTask) { diff --git a/gradle-1.0-POSIX-changes.patch b/gradle-1.0-POSIX-changes.patch deleted file mode 100644 index a746195..0000000 --- a/gradle-1.0-POSIX-changes.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -Nru gradle-1.0/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackPOSIX.java gradle-1.0-gil/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackPOSIX.java ---- gradle-1.0/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackPOSIX.java 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackPOSIX.java 2012-09-21 20:13:23.179556898 +0200 -@@ -18,6 +18,7 @@ - - import org.jruby.ext.posix.FileStat; - import org.jruby.ext.posix.Group; -+import org.jruby.ext.posix.LibC; - import org.jruby.ext.posix.POSIX; - import org.jruby.ext.posix.Passwd; - -@@ -27,6 +28,7 @@ - public class FallbackPOSIX implements POSIX { - - static final int ENOTSUP = 1; -+ private POSIX delegate; - - public int chmod(String filename, int mode) { - return 0; -@@ -223,4 +225,44 @@ - public void errno(int value) { - throw new UnsupportedOperationException("This operation is not supported."); - } -+ -+ public LibC libc() { -+ return delegate.libc(); -+ } -+ -+ public boolean isNative() { -+ return delegate.isNative(); -+ } -+ -+ public String getenv(String name) { -+ return delegate.getenv(name); -+ } -+ -+ public int setenv(String name, String value, int i) { -+ return delegate.setenv(name, value, i); -+ } -+ -+ public int unsetenv(String name) { -+ return delegate.unsetenv(name); -+ } -+ -+ public int exec(String cmd, String... args) { -+ return delegate.exec(cmd, args); -+ } -+ -+ public int exec(String cmd, String[] args, String[] env) { -+ return delegate.exec(cmd, args, env); -+ } -+ -+ public int execv(String cmd, String[] args) { -+ return delegate.execv(cmd, args); -+ } -+ -+ public int execve(String cmd, String[] args, String[] env) { -+ return delegate.execve(cmd, args, env); -+ } -+ -+ public FileStat allocateStat() { -+ return delegate.allocateStat(); -+ } - } -diff -Nru gradle-1.0/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java gradle-1.0-gil/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java ---- gradle-1.0/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java 2012-06-12 02:18:44.000000000 +0200 -+++ gradle-1.0-gil/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java 2012-09-21 20:13:23.180556837 +0200 -@@ -16,6 +16,8 @@ - - package org.gradle.internal.nativeplatform.filesystem; - -+import com.kenai.constantine.platform.Errno; -+ - import org.jruby.ext.posix.*; - - import java.io.File; -@@ -32,7 +34,8 @@ - private static class FallbackAwarePosixFactory{ - public static POSIX getPOSIX() { - POSIX posix = POSIXFactory.getPOSIX(new POSIXHandlerImpl(), true); -- if(posix instanceof JavaPOSIX || posix instanceof WindowsPOSIX){ -+ String name = posix.getClass().getSimpleName(); -+ if ("JavaPOSIX".equals(name) || "WindowsPOSIX".equals(name)) { - return new FallbackPOSIX(); - } - return posix; -@@ -40,7 +43,7 @@ - } - - private static class POSIXHandlerImpl implements POSIXHandler { -- public void error(POSIX.ERRORS error, String message) { -+ public void error(Errno error, String message) { - throw new UnsupportedOperationException(error + " - " + message); - } - diff --git a/gradle-1.0-Proper-path-to-jnidispatch.patch b/gradle-1.0-Proper-path-to-jnidispatch.patch deleted file mode 100644 index c1590f6..0000000 --- a/gradle-1.0-Proper-path-to-jnidispatch.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Nru gradle-1.0/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/JnaBootPathConfigurer.java gradle-1.0-gil/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/JnaBootPathConfigurer.java ---- gradle-1.0/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/JnaBootPathConfigurer.java 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/JnaBootPathConfigurer.java 2012-09-21 20:00:32.457854568 +0200 -@@ -45,31 +45,37 @@ - } - - public void configure() throws NativeIntegrationUnavailableException { -- File tmpDir = new File(storageDir, "jna"); -- tmpDir.mkdirs(); -- String jnaLibName = OperatingSystem.current().isMacOsX() ? "libjnidispatch.jnilib" : System.mapLibraryName("jnidispatch"); -- File libFile = new File(tmpDir, jnaLibName); -- if (!libFile.exists()) { -- String resourceName = "/com/sun/jna/" + OperatingSystem.current().getNativePrefix() + "/" + jnaLibName; -- try { -- InputStream lib = getClass().getResourceAsStream(resourceName); -- if (lib == null) { -- throw new NativeIntegrationUnavailableException(String.format("Could not locate JNA native library resource '%s'.", resourceName)); -- } -- try { -- FileOutputStream outputStream = new FileOutputStream(libFile); -- try { -- IOUtils.copy(lib, outputStream); -- } finally { -- outputStream.close(); -- } -- } finally { -- lib.close(); -- } -- } catch (IOException e) { -- throw new NativeIntegrationException(String.format("Could not create JNA native library '%s'.", libFile), e); -- } -+// File tmpDir = new File(storageDir, "jna"); -+// tmpDir.mkdirs(); -+// String jnaLibName = OperatingSystem.current().isMacOsX() ? "libjnidispatch.jnilib" : System.mapLibraryName("jnidispatch"); -+// File libFile = new File(tmpDir, jnaLibName); -+// if (!libFile.exists()) { -+// String resourceName = "/com/sun/jna/" + OperatingSystem.current().getNativePrefix() + "/" + jnaLibName; -+// try { -+// InputStream lib = getClass().getResourceAsStream(resourceName); -+// if (lib == null) { -+// throw new NativeIntegrationUnavailableException(String.format("Could not locate JNA native library resource '%s'.", resourceName)); -+// } -+// try { -+// FileOutputStream outputStream = new FileOutputStream(libFile); -+// try { -+// IOUtils.copy(lib, outputStream); -+// } finally { -+// outputStream.close(); -+// } -+// } finally { -+// lib.close(); -+// } -+// } catch (IOException e) { -+// throw new NativeIntegrationException(String.format("Could not create JNA native library '%s'.", libFile), e); -+// } -+// } -+ String bits = ""; -+ -+ if ("x86_64".equals(System.getProperty("os.arch"))) { -+ bits = "64"; - } -- System.setProperty("jna.boot.library.path", tmpDir.getAbsolutePath()); -+ -+ System.setProperty("jna.boot.library.path", "/usr/lib" + bits + "/jna/" + System.mapLibraryName("jnidispatch")); - } - } diff --git a/gradle-1.0-Set-the-libdir-to-usr-share-gradle.patch b/gradle-1.0-Set-the-libdir-to-usr-share-gradle.patch deleted file mode 100644 index 4b4db45..0000000 --- a/gradle-1.0-Set-the-libdir-to-usr-share-gradle.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nru gradle-1.0/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java gradle-1.0-gil/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java ---- gradle-1.0/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java 2012-09-21 20:58:06.219892254 +0200 -@@ -73,6 +73,10 @@ - - private static File findDistDir() { - File codeSource = ClasspathUtil.getClasspathForClass(DefaultModuleRegistry.class); -+ -+ if (codeSource.getAbsolutePath().startsWith("/usr/share/java/gradle")) -+ return new File("/usr/share/gradle"); -+ - if (codeSource.isFile()) { - // Loaded from a JAR - let's see if its in the lib directory, and there's a lib/plugins directory - File libDir = codeSource.getParentFile(); diff --git a/gradle-1.0-Use-Exception-instead-CloneNotSupportedException.patch b/gradle-1.0-Use-Exception-instead-CloneNotSupportedException.patch deleted file mode 100644 index 8c00446..0000000 --- a/gradle-1.0-Use-Exception-instead-CloneNotSupportedException.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/DefaultMavenPom.java gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/DefaultMavenPom.java ---- gradle-1.0/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/DefaultMavenPom.java 2011-10-25 05:52:58.000000000 +0200 -+++ gradle-1.0-gil/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/DefaultMavenPom.java 2012-09-21 20:19:22.772953441 +0200 -@@ -160,7 +160,7 @@ - DefaultMavenPom effectivePom = new DefaultMavenPom(null, this.scopeMappings, pomDependenciesConverter, fileResolver); - try { - effectivePom.setMavenProject((MavenProject) mavenProject.clone()); -- } catch (CloneNotSupportedException e) { -+ } catch (Exception e) { - throw new RuntimeException(e); - } - effectivePom.getDependencies().addAll(getGeneratedDependencies()); diff --git a/gradle-1.0-Use-local-available-libraries.patch b/gradle-1.0-Use-local-available-libraries.patch deleted file mode 100644 index 9c22a5b..0000000 --- a/gradle-1.0-Use-local-available-libraries.patch +++ /dev/null @@ -1,179 +0,0 @@ -diff -Nru gradle-1.0/build.gradle gradle-1.0-gil/build.gradle ---- gradle-1.0/build.gradle 2012-09-21 21:32:41.668531310 +0200 -+++ gradle-1.0-gil/build.gradle 2012-09-21 21:31:18.958114750 +0200 -@@ -46,7 +46,7 @@ - ant: dependencies.module('org.apache.ant:ant:1.8.2') { - dependency 'org.apache.ant:ant-launcher:1.8.2@jar' - }, -- asm: 'asm:asm-all:3.3.1@jar', -+ asm: 'asm:objectweb-asm/asm-all:3.3.1@jar', - commons_cli: 'commons-cli:commons-cli:1.2@jar', - commons_io: dependencies.module(versions.commons_io), - commons_lang: 'commons-lang:commons-lang:2.6@jar', -@@ -60,18 +60,18 @@ - } - - // Logging --libraries.slf4j_api = 'org.slf4j:slf4j-api:1.6.4@jar' --libraries.jcl_to_slf4j = dependencies.module('org.slf4j:jcl-over-slf4j:1.6.4') { -+libraries.slf4j_api = 'org.slf4j:slf4j/api:1.6.4@jar' -+libraries.jcl_to_slf4j = dependencies.module('org.slf4j:slf4j/jcl-over-slf4j:1.6.4') { - dependency libraries.slf4j_api - } --libraries.jul_to_slf4j = dependencies.module('org.slf4j:jul-to-slf4j:1.6.4') { -+libraries.jul_to_slf4j = dependencies.module('org.slf4j:slf4j/jul-to-slf4j:1.6.4') { - dependency libraries.slf4j_api - } --libraries.log4j_to_slf4j = dependencies.module('org.slf4j:log4j-over-slf4j:1.6.4') { -+libraries.log4j_to_slf4j = dependencies.module('org.slf4j:slf4j/log4j-over-slf4j:1.6.4') { - dependency libraries.slf4j_api - } --libraries.logback_core = 'ch.qos.logback:logback-core:1.0.0@jar' --libraries.logback_classic = dependencies.module('ch.qos.logback:logback-classic:1.0.0') { -+libraries.logback_core = 'ch.qos.logback:logback/logback-core:1.0.0@jar' -+libraries.logback_classic = dependencies.module('ch.qos.logback:logback/logback-classic:1.0.0') { - dependency libraries.logback_core - dependency libraries.slf4j_api - } -@@ -87,8 +87,8 @@ - dependency libraries.servlet_api - } - --libraries.commons_httpclient = dependencies.module('org.apache.httpcomponents:httpclient:4.1.2') { -- dependency "org.apache.httpcomponents:httpcore:4.1.2@jar" -+libraries.commons_httpclient = dependencies.module('org.apache.httpcomponents:httpcomponents/httpclient:4.1.2') { -+ dependency "org.apache.httpcomponents:httpcomponents/httpcore:4.1.2@jar" - dependency libraries.jcl_to_slf4j - dependency "commons-codec:commons-codec:1.4@jar" - dependency "org.samba.jcifs:jcifs:1.3.17" -@@ -99,14 +99,14 @@ - } - - libraries += [ -- ant_junit: 'org.apache.ant:ant-junit:1.8.2@jar', -- ant_antlr: 'org.apache.ant:ant-antlr:1.8.2@jar', -+ ant_junit: 'org.apache.ant:ant/ant-junit:1.8.2@jar', -+ ant_antlr: 'org.apache.ant:ant/ant-antlr:1.8.2@jar', - antlr: 'antlr:antlr:2.7.7@jar', - dom4j: 'dom4j:dom4j:1.6.1@jar', - guava: 'com.google.guava:guava:11.0.1@jar', - groovy: [ - 'org.codehaus.groovy:groovy:1.8.6@jar', -- 'asm:asm-all:3.3.1@jar', -+ 'asm:objectweb-asm/asm-all:3.3.1@jar', - 'antlr:antlr:2.7.7@jar', - 'commons-cli:commons-cli:1.2@jar' - ], -@@ -121,14 +121,14 @@ - libraries.spock = ['org.spockframework:spock-core:0.6-groovy-1.8@jar', - libraries.groovy, - 'org.objenesis:objenesis:1.2', -- 'cglib:cglib-nodep:2.2'] -+ 'cglib:cglib:2.2'] - libraries.jmock = ['org.jmock:jmock:2.5.1', - 'org.hamcrest:hamcrest-core:1.1', - 'org.hamcrest:hamcrest-library:1.1', - 'org.jmock:jmock-junit4:2.5.1', - 'org.jmock:jmock-legacy:2.5.1', - 'org.objenesis:objenesis:1.2', -- 'cglib:cglib-nodep:2.2'] -+ 'cglib:cglib:2.2'] - - allprojects { - group = 'org.gradle' -@@ -139,8 +139,10 @@ - } - - repositories { -- maven { url 'http://repo.gradle.org/gradle/libs' } -- maven { url 'http://repository.codehaus.org/' } -+ ivy { -+ artifactPattern "/usr/share/java/[module]-[revision].[ext]" -+ artifactPattern "/usr/share/java/[module].[ext]" -+ } - } - - configurations { -diff -Nru gradle-1.0/buildSrc/build.gradle gradle-1.0-gil/buildSrc/build.gradle ---- gradle-1.0/buildSrc/build.gradle 2012-09-21 21:32:41.682530533 +0200 -+++ gradle-1.0-gil/buildSrc/build.gradle 2012-09-21 21:31:18.959114695 +0200 -@@ -21,8 +21,10 @@ - apply plugin: 'eclipse' - - repositories { -- maven { url 'http://repo.gradle.org/gradle/libs' } -- mavenCentral() -+ ivy { -+ artifactPattern "/usr/share/java/[module]-[revision].[ext]" -+ artifactPattern "/usr/share/java/[module].[ext]" -+ } - } - - dependencies { -diff -Nru gradle-1.0/gradle/groovyProject.gradle gradle-1.0-gil/gradle/groovyProject.gradle ---- gradle-1.0/gradle/groovyProject.gradle 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/gradle/groovyProject.gradle 2012-09-21 21:31:18.960114640 +0200 -@@ -59,7 +59,7 @@ - @Input - Properties getProperties() { - def properties = new Properties() -- properties.runtime = project.configurations.runtime.fileCollection { it instanceof ExternalDependency }.collect {it.name}.join(',') -+ properties.runtime = project.configurations.runtime.fileCollection { it instanceof ExternalDependency }.collect {it.absolutePath.replaceFirst('/usr/share/java/', '')}.join(',') - properties.projects = project.configurations.runtime.allDependencies.withType(ProjectDependency).collect {it.dependencyProject.archivesBaseName}.join(',') - return properties - } -@@ -68,4 +68,4 @@ - def generate() { - manifestFile.withOutputStream { properties.save(it, 'module definition') } - } --} -\ Manca newline alla fine del file -+} -diff -Nru gradle-1.0/subprojects/core/core.gradle gradle-1.0-gil/subprojects/core/core.gradle ---- gradle-1.0/subprojects/core/core.gradle 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/core/core.gradle 2012-09-21 21:31:18.962114528 +0200 -@@ -54,7 +54,8 @@ - - integTestCompile project(":internalIntegTesting") - -- reports 'css3-pie:css3-pie:1.0beta3' -+// Not available in Fedora -+// reports 'css3-pie:css3-pie:1.0beta3' - } - - test { -@@ -94,4 +95,4 @@ - def generate() { - propertiesFile.withOutputStream { pluginProperties.save(it, 'plugin definitions') } - } --} -\ Manca newline alla fine del file -+} -diff -Nru gradle-1.0/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java gradle-1.0-gil/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java ---- gradle-1.0/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java 2012-09-21 21:32:41.674530978 +0200 -+++ gradle-1.0-gil/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java 2012-09-21 21:31:18.963114473 +0200 -@@ -257,6 +257,12 @@ - return jarFile; - } - } -+ // Last chance, look for libary in system-wide java directory -+ jarFile = new File("/usr/share/java/", name); -+ -+ if (jarFile.isFile()) { -+ return jarFile; -+ } - throw new IllegalArgumentException(String.format("Cannot find JAR '%s' required by module '%s' using classpath or distribution directory '%s'", name, module, distDir)); - } - -diff -Nru gradle-1.0/subprojects/core-impl/core-impl.gradle gradle-1.0-gil/subprojects/core-impl/core-impl.gradle ---- gradle-1.0/subprojects/core-impl/core-impl.gradle 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/core-impl/core-impl.gradle 2012-09-21 21:31:18.961114584 +0200 -@@ -11,6 +11,8 @@ - compile libraries.ivy - compile libraries.slf4j_api - compile libraries.maven_ant_tasks -+ // This is unbundled from maven-ant-tasks -+ compile "org.codehaus.plexus:plexus/container-default:1.0" - - testCompile libraries.junit - } diff --git a/gradle-1.0-Use-proper-system-environment-variables.patch b/gradle-1.0-Use-proper-system-environment-variables.patch deleted file mode 100644 index ccefbff..0000000 --- a/gradle-1.0-Use-proper-system-environment-variables.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nru gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultMavenFileLocations.java gradle-1.0-gil/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultMavenFileLocations.java ---- gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultMavenFileLocations.java 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultMavenFileLocations.java 2012-08-27 10:50:25.368165545 +0200 -@@ -31,7 +31,7 @@ - - @Nullable - public File getGlobalMavenDir() { -- String m2Home = System.getProperty("M2_HOME"); -+ String m2Home = System.getenv("M2_HOME"); - if (m2Home == null) { - return null; - } -diff -Nru gradle-1.0/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/standalone/Application.java gradle-1.0-gil/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/standalone/Application.java ---- gradle-1.0/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/standalone/Application.java 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/standalone/Application.java 2012-08-27 10:50:25.368165545 +0200 -@@ -307,7 +307,7 @@ - * @return the file that we save our settings to. - */ - private File getSettingsFile() { -- return new File(System.getProperty("user.dir"), "gradle-app" + SETTINGS_EXTENSION); -+ return new File(System.getProperty("user.home"), "gradle-app" + SETTINGS_EXTENSION); - } - - private class SettingsImportInteraction implements DOM4JSerializer.ImportInteraction { diff --git a/gradle-1.0-build.xml b/gradle-1.0-build.xml deleted file mode 100644 index 099e68c..0000000 --- a/gradle-1.0-build.xml +++ /dev/null @@ -1,1286 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${impl.title} API ${impl.version}]]> - Copyright © ${year}. All rights reserved]]> - - - - - - diff --git a/gradle-1.0-core-releases_xml.patch b/gradle-1.0-core-releases_xml.patch deleted file mode 100644 index 79eada3..0000000 --- a/gradle-1.0-core-releases_xml.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- subprojects/core/src/releases.xml 2012-06-12 02:20:50.000000000 +0200 -+++ subprojects/core/src/releases.xml-gil 2012-06-12 11:45:50.465001073 +0200 -@@ -1,6 +1,5 @@ - -- -- -+ - - - diff --git a/gradle-1.0-css3-pie-not-available.patch b/gradle-1.0-css3-pie-not-available.patch deleted file mode 100644 index 3d219f7..0000000 --- a/gradle-1.0-css3-pie-not-available.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru gradle-1.0/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReport.java gradle-1.0-gil/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReport.java ---- gradle-1.0/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReport.java 2011-09-07 06:39:20.000000000 +0200 -+++ gradle-1.0-gil/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReport.java 2012-09-21 20:09:55.857194219 +0200 -@@ -36,7 +36,7 @@ - public DefaultTestReport() { - htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/report.js")); - htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/base-style.css")); -- htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/css3-pie-1.0beta3.htc")); -+ // htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/css3-pie-1.0beta3.htc")); - htmlRenderer.requireResource(getClass().getResource("style.css")); - } - diff --git a/gradle-1.0-disable-tests.patch b/gradle-1.0-disable-tests.patch deleted file mode 100644 index 5cd01e0..0000000 --- a/gradle-1.0-disable-tests.patch +++ /dev/null @@ -1,178 +0,0 @@ -diff -Nru gradle-1.0/build.gradle gradle-1.0-gil/build.gradle ---- gradle-1.0/build.gradle 2012-08-26 13:16:12.318371919 +0200 -+++ gradle-1.0-gil/build.gradle 2012-08-26 13:11:40.061073094 +0200 -@@ -226,8 +226,8 @@ - plugins project(':coreImpl') - } - --evaluationDependsOn(':docs') --evaluationDependsOn(':integTest') -+//evaluationDependsOn(':docs') -+//evaluationDependsOn(':integTest') - - clean.dependsOn subprojects.collect { "$it.path:clean" } - -@@ -257,7 +257,7 @@ - from('src/toplevel') { - include 'media/**' - } -- from project(':docs').outputs.distDocs -+ //from project(':docs').outputs.distDocs - into('bin') { - from { project(':launcher').startScripts.outputs.files } - fileMode = 0755 -@@ -276,10 +276,10 @@ - from groovyProjects().collect {project -> project.sourceSets.main.allSource } - } - into('docs') { -- from project(':docs').outputs.docs -+ //from project(':docs').outputs.docs - } - into('samples') { -- from project(':docs').outputs.samples -+ //from project(':docs').outputs.samples - } - } - -@@ -450,7 +450,7 @@ - task release { - description = 'Builds, tests and uploads the release artifacts' - group = 'release' -- dependsOn releaseVersion, checkJavaVersion, testedTag, releaseArtifacts, testedDists, 'uploadAll' -+ dependsOn releaseVersion, checkJavaVersion, testedTag, releaseArtifacts - doLast { - releases.incrementNextVersion() - } -diff -Nru gradle-1.0/gradle/conventions-dsl.gradle gradle-1.0-gil/gradle/conventions-dsl.gradle ---- gradle-1.0/gradle/conventions-dsl.gradle 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/gradle/conventions-dsl.gradle 2012-08-26 13:11:40.064072941 +0200 -@@ -12,7 +12,7 @@ - - dependencies { - add(compileConfiguration, project(path: projectPath, configuration: "testFixturesUsageCompile")) -- add(compileConfiguration, project(':internalTesting')) -+ //add(compileConfiguration, project(':internalTesting')) - add(runtimeConfiguration, project(path: projectPath, configuration: "testFixturesUsageRuntime")) - } - } -diff -Nru gradle-1.0/gradle/idea.gradle gradle-1.0-gil/gradle/idea.gradle ---- gradle-1.0/gradle/idea.gradle 2012-06-12 02:18:44.000000000 +0200 -+++ gradle-1.0-gil/gradle/idea.gradle 2012-08-26 13:11:40.051073598 +0200 -@@ -13,7 +13,7 @@ - } - } - --evaluationDependsOn(':docs') -+//evaluationDependsOn(':docs') - - idea { - module { -diff -Nru gradle-1.0/gradle/integTest.gradle gradle-1.0-gil/gradle/integTest.gradle ---- gradle-1.0/gradle/integTest.gradle 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/gradle/integTest.gradle 2012-08-26 13:11:40.046073848 +0200 -@@ -14,7 +14,7 @@ - } - - dependencies { -- integTestCompile project(":internalIntegTesting") -+ //integTestCompile project(":internalIntegTesting") - } - - sourceSets { -@@ -47,7 +47,7 @@ - ext.integTestTasks = tasks.withType(Test).matching { it.name.toLowerCase().endsWith('integtest') } - - integTestTasks.all { -- dependsOn ':intTestImage', project(":docs").tasks.matching { it.name == "samples" } // lazy as doc not eval'd yet -+ //dependsOn ':intTestImage',, project(":docs").tasks.matching { it.name == "samples" } // lazy as doc not eval'd yet - testClassesDir = sourceSets.integTest.output.classesDir - classpath = sourceSets.integTest.runtimeClasspath - testSrcDirs = [] -diff -Nru gradle-1.0/gradle/publish.gradle gradle-1.0-gil/gradle/publish.gradle ---- gradle-1.0/gradle/publish.gradle 2012-08-26 13:16:12.251375284 +0200 -+++ gradle-1.0-gil/gradle/publish.gradle 2012-08-26 13:11:40.070072640 +0200 -@@ -25,7 +25,7 @@ - } - } - -- def localDeployer = install.repositories.mavenInstaller -+ //def localDeployer = install.repositories.mavenInstaller - - configure(localDeployer) { - pom.scopeMappings.mappings.clear() -@@ -42,7 +42,7 @@ - artifacts { - publishRuntime jar - publishRuntime sourceJar -- publishRuntime new org.gradle.api.internal.artifacts.publish.DefaultPublishArtifact(archivesBaseName, 'pom', 'pom', null, new Date(), generatePom.pomFile, generatePom) -+ //publishRuntime new org.gradle.api.internal.artifacts.publish.DefaultPublishArtifact(archivesBaseName, 'pom', 'pom', null, new Date(), generatePom.pomFile, generatePom) - } - - uploadArchives { -diff -Nru gradle-1.0/settings.gradle gradle-1.0-gil/settings.gradle ---- gradle-1.0/settings.gradle 2012-08-26 13:16:12.319371869 +0200 -+++ gradle-1.0-gil/settings.gradle 2012-08-26 13:11:39.986076875 +0200 -@@ -32,16 +32,16 @@ - include 'openApi' - include 'toolingApi' - include 'docs' --include 'integTest' -+//include 'integTest' - //include 'sonar' - //include 'signing' - include 'cpp' - include 'ear' - include 'native' --include 'internalTesting' --include 'internalIntegTesting' -+//include 'internalTesting' -+//include 'internalIntegTesting' - //include 'website' --include 'performance' -+//include 'performance' - - rootProject.name = 'gradle' - rootProject.children.each {project -> -diff -Nru gradle-1.0/subprojects/announce/announce.gradle gradle-1.0-gil/subprojects/announce/announce.gradle ---- gradle-1.0/subprojects/announce/announce.gradle 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/announce/announce.gradle 2012-08-26 13:11:40.015075412 +0200 -@@ -25,4 +25,4 @@ - sourceSets.main.groovy.exclude '**/jdk6/**' - } - --useTestFixtures() -+//useTestFixtures() -diff -Nru gradle-1.0/subprojects/antlr/antlr.gradle gradle-1.0-gil/subprojects/antlr/antlr.gradle ---- gradle-1.0/subprojects/antlr/antlr.gradle 2011-10-25 05:52:58.000000000 +0200 -+++ gradle-1.0-gil/subprojects/antlr/antlr.gradle 2012-08-26 13:11:40.019075211 +0200 -@@ -25,4 +25,4 @@ - compile libraries.antlr - } - --useTestFixtures() -+//useTestFixtures() -diff -Nru gradle-1.0/subprojects/base-services/base-services.gradle gradle-1.0-gil/subprojects/base-services/base-services.gradle ---- gradle-1.0/subprojects/base-services/base-services.gradle 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/base-services/base-services.gradle 2012-08-26 13:11:40.023075009 +0200 -@@ -12,4 +12,4 @@ - publishCompile libraries.slf4j_api - } - --useTestFixtures() -+//useTestFixtures() -diff -Nru gradle-1.0/subprojects/core/core.gradle gradle-1.0-gil/subprojects/core/core.gradle ---- gradle-1.0/subprojects/core/core.gradle 2012-08-26 13:16:12.314372119 +0200 -+++ gradle-1.0-gil/subprojects/core/core.gradle 2012-08-26 13:11:40.036074353 +0200 -@@ -49,10 +49,10 @@ - - testRuntime "xerces:xercesImpl:2.9.1" - -- testFixturesCompile project(":internalTesting") -+ //testFixturesCompile project(":internalTesting") - testFixturesRuntime project(':coreImpl') - -- integTestCompile project(":internalIntegTesting") -+ //integTestCompile project(":internalIntegTesting") - - // Not available in Fedora - // reports 'css3-pie:css3-pie:1.0beta3' diff --git a/gradle-1.0-docs.patch b/gradle-1.0-docs.patch deleted file mode 100644 index 49219f1..0000000 --- a/gradle-1.0-docs.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- subprojects/docs/docs.gradle 2012-08-26 13:49:03.647596397 +0200 -+++ subprojects/docs/docs.gradle-gil 2012-08-26 13:49:15.251017743 +0200 -@@ -63,7 +63,7 @@ - builtBy 'distDocs' - } - outputs.docs = files(docsDir) { -- builtBy 'javadoc', 'groovydoc', 'userguide', 'dslHtml', 'releaseNotes' -+ builtBy 'javadoc', 'groovydoc' - } - - tasks.withType(Docbook2Xhtml) { -@@ -247,7 +247,7 @@ - include 'org/gradle/testfixtures/**' - include 'org/gradle/tooling/**' - exclude '**/internal/**' -- options.links(javaApiUrl, groovyApiUrl, "http://maven.apache.org/ref/2.2.1/maven-core/apidocs", -+ options.links("file:///usr/share/javadoc/java", "file:///usr/share/javadoc/groovy", "http://maven.apache.org/ref/2.2.1/maven-core/apidocs", - "http://maven.apache.org/ref/2.2.1/maven-model/apidocs") - doFirst { - title = "Gradle API $version" diff --git a/gradle-1.0-ivy23.patch b/gradle-1.0-ivy23.patch deleted file mode 100644 index c0bd862..0000000 --- a/gradle-1.0-ivy23.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -Nru gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NoOpRepositoryCacheManager.java gradle-1.0-gil/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NoOpRepositoryCacheManager.java ---- gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NoOpRepositoryCacheManager.java 2012-02-26 19:51:24.000000000 +0100 -+++ gradle-1.0-gil/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NoOpRepositoryCacheManager.java 2013-04-10 02:48:28.828724434 +0200 -@@ -24,6 +24,8 @@ - import org.apache.ivy.core.report.DownloadStatus; - import org.apache.ivy.core.resolve.ResolvedModuleRevision; - import org.apache.ivy.plugins.repository.ArtifactResourceResolver; -+import org.apache.ivy.plugins.repository.Repository; -+import org.apache.ivy.plugins.repository.Resource; - import org.apache.ivy.plugins.repository.ResourceDownloader; - import org.apache.ivy.plugins.resolver.DependencyResolver; - import org.apache.ivy.plugins.resolver.util.ResolvedResource; -@@ -73,4 +75,13 @@ - - public void saveResolvedRevision(ModuleRevisionId dynamicMrid, String revision) { - } -+ -+ public ArtifactDownloadReport downloadRepositoryResource(Resource resource, -+ String name, -+ String type, -+ String extension, -+ CacheResourceOptions options, -+ Repository repository) { -+ throw new UnsupportedOperationException("This operation is not supported."); -+ } - } -diff -Nru gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/DownloadingRepositoryCacheManager.java gradle-1.0-gil/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/DownloadingRepositoryCacheManager.java ---- gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/DownloadingRepositoryCacheManager.java 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/DownloadingRepositoryCacheManager.java 2013-04-10 02:48:28.828724434 +0200 -@@ -18,16 +18,20 @@ - import org.apache.ivy.core.cache.ArtifactOrigin; - import org.apache.ivy.core.cache.CacheDownloadOptions; - import org.apache.ivy.core.cache.CacheMetadataOptions; -+import org.apache.ivy.core.cache.CacheResourceOptions; - import org.apache.ivy.core.cache.DownloadListener; - import org.apache.ivy.core.module.descriptor.Artifact; - import org.apache.ivy.core.module.descriptor.DependencyDescriptor; - import org.apache.ivy.core.module.descriptor.ModuleDescriptor; - import org.apache.ivy.core.module.id.ArtifactRevisionId; - import org.apache.ivy.core.report.ArtifactDownloadReport; -+ - import org.apache.ivy.core.report.DownloadStatus; - import org.apache.ivy.core.report.MetadataArtifactDownloadReport; - import org.apache.ivy.core.resolve.ResolvedModuleRevision; - import org.apache.ivy.plugins.repository.ArtifactResourceResolver; -+import org.apache.ivy.plugins.repository.Repository; -+import org.apache.ivy.plugins.repository.Resource; - import org.apache.ivy.plugins.repository.ResourceDownloader; - import org.apache.ivy.plugins.resolver.DependencyResolver; - import org.apache.ivy.plugins.resolver.util.ResolvedResource; -@@ -145,4 +149,12 @@ - return new ResolvedModuleRevision(resolver, resolver, md, madr); - } - -+ public ArtifactDownloadReport downloadRepositoryResource(Resource resource, -+ String name, -+ String type, -+ String extension, -+ CacheResourceOptions options, -+ Repository repository) { -+ throw new UnsupportedOperationException("This operation is not supported."); -+ } - } -diff -Nru gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/LocalFileRepositoryCacheManager.java gradle-1.0-gil/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/LocalFileRepositoryCacheManager.java ---- gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/LocalFileRepositoryCacheManager.java 2012-02-26 19:51:24.000000000 +0100 -+++ gradle-1.0-gil/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/LocalFileRepositoryCacheManager.java 2013-04-10 02:48:28.829724384 +0200 -@@ -18,6 +18,7 @@ - import org.apache.ivy.core.cache.ArtifactOrigin; - import org.apache.ivy.core.cache.CacheDownloadOptions; - import org.apache.ivy.core.cache.CacheMetadataOptions; -+import org.apache.ivy.core.cache.CacheResourceOptions; - import org.apache.ivy.core.module.descriptor.Artifact; - import org.apache.ivy.core.module.descriptor.DependencyDescriptor; - import org.apache.ivy.core.module.descriptor.ModuleDescriptor; -@@ -26,6 +27,8 @@ - import org.apache.ivy.core.report.MetadataArtifactDownloadReport; - import org.apache.ivy.core.resolve.ResolvedModuleRevision; - import org.apache.ivy.plugins.repository.ArtifactResourceResolver; -+import org.apache.ivy.plugins.repository.Repository; -+import org.apache.ivy.plugins.repository.Resource; - import org.apache.ivy.plugins.repository.ResourceDownloader; - import org.apache.ivy.plugins.resolver.DependencyResolver; - import org.apache.ivy.plugins.resolver.util.ResolvedResource; -@@ -85,4 +88,13 @@ - ModuleDescriptor descriptor = parseModuleDescriptor(resolver, moduleArtifact, options, file, resolvedResource.getResource()); - return new ResolvedModuleRevision(resolver, resolver, descriptor, report); - } -+ -+ public ArtifactDownloadReport downloadRepositoryResource(Resource resource, -+ String name, -+ String type, -+ String extension, -+ CacheResourceOptions options, -+ Repository repository) { -+ throw new UnsupportedOperationException("This operation is not supported."); -+ } - } diff --git a/gradle-1.0-jnr-ffi.patch b/gradle-1.0-jnr-ffi.patch deleted file mode 100644 index 68432de..0000000 --- a/gradle-1.0-jnr-ffi.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- subprojects/native/native.gradle 2013-04-24 12:06:23.039260557 +0200 -+++ subprojects/native/native.gradle-gil 2013-04-24 12:07:18.311037407 +0200 -@@ -14,6 +14,7 @@ - dependency libraries.jna - dependency 'org.jruby.extras:constantine:0.7' - dependency 'org.jruby.extras:jaffl:0.7' -+ dependency 'com.github.jnr:jnr-ffi:0.7.10' - } - compile module('org.fusesource.jansi:jansi:1.2.1') { - dependency libraries.jna diff --git a/gradle-1.0-jnr-posix2.patch b/gradle-1.0-jnr-posix2.patch deleted file mode 100644 index 00922f3..0000000 --- a/gradle-1.0-jnr-posix2.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -Nru gradle-1.0/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/ComposableFilePermissionHandler.java gradle-1.0-gil/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/ComposableFilePermissionHandler.java ---- gradle-1.0/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/ComposableFilePermissionHandler.java 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/ComposableFilePermissionHandler.java 2013-04-10 02:46:18.632299295 +0200 -@@ -16,7 +16,7 @@ - - package org.gradle.internal.nativeplatform.filesystem; - --import org.jruby.ext.posix.POSIX; -+import jnr.posix.POSIX; - - import java.io.File; - import java.io.IOException; -diff -Nru gradle-1.0/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackFileStat.java gradle-1.0-gil/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackFileStat.java ---- gradle-1.0/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackFileStat.java 2012-04-25 01:27:12.000000000 +0200 -+++ gradle-1.0-gil/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackFileStat.java 2013-04-10 02:46:18.632299295 +0200 -@@ -16,7 +16,7 @@ - - package org.gradle.internal.nativeplatform.filesystem; - --import org.jruby.ext.posix.FileStat; -+import jnr.posix.FileStat; - - import java.io.File; - -diff -Nru gradle-1.0/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackPOSIX.java gradle-1.0-gil/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackPOSIX.java ---- gradle-1.0/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackPOSIX.java 2013-04-10 02:47:20.990150252 +0200 -+++ gradle-1.0-gil/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackPOSIX.java 2013-04-10 02:46:18.633299244 +0200 -@@ -16,14 +16,18 @@ - - package org.gradle.internal.nativeplatform.filesystem; - --import org.jruby.ext.posix.FileStat; --import org.jruby.ext.posix.Group; --import org.jruby.ext.posix.LibC; --import org.jruby.ext.posix.POSIX; --import org.jruby.ext.posix.Passwd; -+import jnr.posix.FileStat; -+import jnr.posix.Group; -+import jnr.posix.LibC; -+import jnr.posix.POSIX; -+import jnr.posix.Passwd; -+import jnr.posix.SpawnFileAction; -+import jnr.posix.Times; -+import jnr.posix.util.ProcessMaker; - - import java.io.FileDescriptor; - import java.io.IOException; -+import java.util.Collection; - - public class FallbackPOSIX implements POSIX { - -@@ -265,4 +269,51 @@ - public FileStat allocateStat() { - return delegate.allocateStat(); - } -+ -+ public FileStat fstat(int descriptor) { -+ throw new UnsupportedOperationException("This operation is not supported."); -+ } -+ -+ public int fstat(FileDescriptor descriptor, FileStat stat) { -+ throw new UnsupportedOperationException("This operation is not supported."); -+ } -+ -+ public int fstat(int fd, FileStat stat) { -+ throw new UnsupportedOperationException("This operation is not supported."); -+ } -+ -+ public int lstat(String path, FileStat stat) { -+ throw new UnsupportedOperationException("This operation is not supported."); -+ } -+ -+ public ProcessMaker newProcessMaker() { -+ throw new UnsupportedOperationException("This operation is not supported."); -+ } -+ -+ public ProcessMaker newProcessMaker(String... command) { -+ throw new UnsupportedOperationException("This operation is not supported."); -+ } -+ -+ public long posix_spawnp(String path, -+ Collection fileActions, -+ Collection argv, -+ Collection envp) { -+ throw new UnsupportedOperationException("This operation is not supported."); -+ } -+ -+ public int rmdir(String path) { -+ throw new UnsupportedOperationException("This operation is not supported."); -+ } -+ -+ public int stat(String path, FileStat stat) { -+ throw new UnsupportedOperationException("This operation is not supported."); -+ } -+ -+ public long sysconf(jnr.constants.platform.Sysconf name) { -+ throw new UnsupportedOperationException("This operation is not supported."); -+ } -+ -+ public Times times() { -+ throw new UnsupportedOperationException("This operation is not supported."); -+ } - } -diff -Nru gradle-1.0/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java gradle-1.0-gil/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java ---- gradle-1.0/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java 2013-04-10 02:47:20.991150201 +0200 -+++ gradle-1.0-gil/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java 2013-04-10 02:46:18.633299244 +0200 -@@ -18,7 +18,7 @@ - - import com.kenai.constantine.platform.Errno; - --import org.jruby.ext.posix.*; -+import jnr.posix.*; - - import java.io.File; - import java.io.InputStream; -@@ -81,6 +81,10 @@ - public PrintStream getErrorStream() { - return System.err; - } -+ -+ public void error(jnr.constants.platform.Errno error, String extraData) { -+ throw new UnsupportedOperationException(error + " - " + extraData); -+ } - } - - } diff --git a/gradle-1.0-printStackTrace.patch b/gradle-1.0-printStackTrace.patch deleted file mode 100644 index 25369cd..0000000 --- a/gradle-1.0-printStackTrace.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- subprojects/core/src/main/groovy/org/gradle/BuildExceptionReporter.java 2012-04-25 01:27:12.000000000 +0200 -+++ subprojects/core/src/main/groovy/org/gradle/BuildExceptionReporter.java-gil 2013-04-14 16:05:36.725908920 +0200 -@@ -66,11 +66,13 @@ - FailureDetails details = new FailureDetails(failure); - if (failure instanceof GradleException) { - reportBuildFailure((GradleException) failure, details); -+ failure.printStackTrace(); - } else { - reportInternalError(details); - } - - write(details); -+ //failure.printStackTrace(); - } - - protected void write(FailureDetails details) { diff --git a/gradle-1.0-script.patch b/gradle-1.0-script.patch deleted file mode 100644 index c723e5f..0000000 --- a/gradle-1.0-script.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gradle.sh 2012-06-12 11:40:51.209973425 +0200 -+++ gradle.sh-gil 2012-06-12 11:40:57.305973988 +0200 -@@ -61,11 +61,8 @@ - fi - done - SAVED="`pwd`" --cd "`dirname \"$PRG\"`/" --APP_HOME="`pwd -P`" --cd "$SAVED" -- --CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar -+APP_HOME=$GRADLE_HOME -+CLASSPATH=$APP_HOME/lib/gradle-launcher-1.0.jar - - # Determine the Java command to use to start the JVM. - if [ -n "$JAVA_HOME" ] ; then -@@ -161,4 +158,4 @@ - eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS - JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - --exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" -+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.launcher.GradleMain "$@" diff --git a/gradle-1.0-wrapper b/gradle-1.0-wrapper deleted file mode 100644 index 1ceafff..0000000 --- a/gradle-1.0-wrapper +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# Gradle 1.0 wrapper script -# gil -export JAVA_HOME=/usr/lib/jvm/java -export GRADLE_HOME=/usr/share/gradle - -sh /usr/share/gradle/bin/gradle "$@" \ No newline at end of file diff --git a/gradle.desktop b/gradle.desktop deleted file mode 100644 index 8ce5b58..0000000 --- a/gradle.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Name=Gradle -GenericName=Groovy based build system (IDE) -Icon=gradle -Exec=gradle -gui -Terminal=false -Categories=Development;Java;IDE; -StartupNotify=true \ No newline at end of file diff --git a/gradle.spec b/gradle.spec deleted file mode 100644 index af6e939..0000000 --- a/gradle.spec +++ /dev/null @@ -1,694 +0,0 @@ - -%global namedreltag %{nil} -%global namedversion %{version}%{?namedreltag} -%global nameddottag %(echo %{?namedreltag} | tr - . ) -%global bootstrap 0 - -# TODO grails-core.jar http://repo1.maven.org/maven2/org/grails/grails-core/1.3.7/grails-core-1.3.7.jar -# https://github.com/grails/grails-core/ - -# sonar plugin -# gradle/lib/plugins/gradle-sonar-1.0-milestone-9.jar -# gradle/lib/plugins/sonar-batch-bootstrapper-2.9.jar -# maven plugin -# gradle/lib/plugins/pmaven-common-0.8-20100325.jar -# gradle/lib/plugins/pmaven-groovy-0.8-20100325.jar -# jetty 6.x plugin -# gradle/lib/plugins/core-3.1.1.jar -# gradle/lib/plugins/geronimo-annotation_1.0_spec-1.0.jar -# gradle/lib/plugins/gradle-jetty-1.0-milestone-9.jar -# gradle/lib/plugins/jetty-6.1.25.jar -# gradle/lib/plugins/jetty-annotations-6.1.25.jar -# gradle/lib/plugins/jetty-naming-6.1.25.jar -# gradle/lib/plugins/jetty-plus-6.1.25.jar -# gradle/lib/plugins/jetty-util-6.1.25.jar -# gradle/lib/plugins/jsp-2.1-6.1.14.jar -# gradle/lib/plugins/jsp-api-2.1-6.1.14.jar -# gradle/lib/plugins/servlet-api-2.5-20081211.jar - -# FIXME http://issues.gradle.org/browse/GRADLE-2210 - -Name: gradle -Version: 1.0 -Release: 19%{?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-%{namedversion}-src.zip -Source3: gradle-%{namedversion}-wrapper -Source4: gradle-%{namedversion}-build.xml -Source5: gradle.desktop - -# Tanks to C. de Wolf, A. Grimm, J. Hernandez, M. Goldmann, M. Izdebski for their contribution -# mgoldmann -# On Fedora we have the jnidispatch.so file in a well known location, so we use it directly from there -Patch0: gradle-%{namedversion}-Proper-path-to-jnidispatch.patch -# unavailable deps polyglot-maven -Patch1: gradle-%{namedversion}-Disabled-polyglot-maven-support.patch -# fix for maven plugin -Patch2: gradle-%{namedversion}-Missing-method-in-PlexusLoggerAdapter.patch -# jhernand unavailable file -Patch3: gradle-%{namedversion}-css3-pie-not-available.patch -# jhernand use jnr-posix instead of jna-posix -Patch4: gradle-%{namedversion}-POSIX-changes.patch - -Patch5: gradle-%{namedversion}-script.patch -# fix setting.xml in non boostrap mode -Patch6: gradle-%{namedversion}-core-releases_xml.patch -# mgoldmann -Patch7: gradle-%{namedversion}-Use-Exception-instead-CloneNotSupportedException.patch -# jhernand -# fix user home for gradle applications -Patch8: gradle-%{namedversion}-Use-proper-system-environment-variables.patch -# mgoldmann -# fix for http://issues.gradle.org/browse/GRADLE-2210 -Patch9: gradle-%{namedversion}-Maven-3-support.patch -# 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 -Patch10: gradle-%{namedversion}-Fix-classpath-after-splitting-groovy-all-into-multip.patch -# Related to PATCH10 - we need to use the deps (asm, antlr) directly, not bundled versions -Patch11: gradle-%{namedversion}-Change-groovy-all-references-to-valid-package-names.patch -# mgoldmann -# Checkstyle requires antlr, it was provided by groovy-all, but we removed it -# We cannot have two antlr libraries in classpath when executing checkstyle -Patch12: gradle-%{namedversion}-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 -Patch13: gradle-%{namedversion}-Add-proper-codenarc-dependencies.patch -# disable this modules for unavailable build deps -# depend on maven2 -Patch14: gradle-%{namedversion}-Disable-maven-plugin.patch -# depend on gradle-maven module -Patch15: gradle-%{namedversion}-Disable-signing-plugin.patch -# disable. require sonar http://www.sonarsource.org/ -Patch16: gradle-%{namedversion}-Disable-sonar-plugin.patch -# jhernand -# change jna-posix with jnr-posix and add jnr-constant and jaffl -Patch17: gradle-%{namedversion}-Change-dependency-from-jna-to-jnr-for-native.patch -# mgoldmann -# Since we operate on symlinks Java is fooled by it and we need to specify the patch to gradle home manually -Patch18: gradle-%{namedversion}-Set-the-libdir-to-usr-share-gradle.patch -# TODO remove this patch when spock-core is available in rawhide -Patch19: gradle-%{namedversion}-No-spock-library-available.patch -# fix gradle checkstyle deps -Patch20: gradle-%{namedversion}-Add-missing-dependencies-when-using-clean-checkstyle.patch -# TODO remove this patch when codenarc is available in rawhide -Patch21: gradle-%{namedversion}-Disable-codenarc-plugin-since-CodeNarc-is-not-avaial.patch -# remove docbook-xml@zip references -Patch22: gradle-%{namedversion}-No-zipped-docbook-available.patch -# disable require jets3t (not available for now... see https://bugzilla.redhat.com/show_bug.cgi?id=847109 ) -Patch23: gradle-%{namedversion}-Disable-website-module.patch -# fix the location of the build deps -Patch24: gradle-%{namedversion}-Use-local-available-libraries.patch -# remove jetty plugin references, prevent gradle error: unavailable module, gradle-jetty -Patch25: gradle-%{namedversion}-Disable-jetty-plugin.patch -# remove not required timestamp from artifacts version -Patch26: gradle-%{namedversion}-Fix-version-remove-timestamp.patch -# unavailable deps require jmock 2.5.1 -# disable also the releaseArtifacts, docs and samples tasks (require gradle maven plugin) -Patch27: gradle-%{namedversion}-disable-tests.patch -# workaround -# disable userguide and dslHtml tasks (unavailable deps: docbook:docbook-xsl:1.75.2@zip) -# docs depend on test tasks -Patch28: gradle-%{namedversion}-docs.patch -# build fix for jnr-posix 2.4.0 -Patch29: gradle-1.0-jnr-posix2.patch -# build fix for ivy 2.3.0 -Patch30: gradle-1.0-ivy23.patch - -Patch31: gradle-1.0-printStackTrace.patch -# jnr-posix 2.x depend on jnr-ffi 0.7.x caused -# java.lang.NoClassDefFoundError: jnr/ffi/Struct -Patch32: gradle-1.0-jnr-ffi.patch - -# Build requirements (alphabetical): -BuildRequires: aether-api -BuildRequires: aether-util -BuildRequires: ant -BuildRequires: ant-antlr -BuildRequires: antlr -BuildRequires: antlr-tool -BuildRequires: apache-commons-beanutils -BuildRequires: apache-commons-cli -BuildRequires: apache-commons-codec -BuildRequires: apache-commons-collections -BuildRequires: apache-commons-io -BuildRequires: apache-commons-lang -BuildRequires: apache-ivy -# require bnd ant task -BuildRequires: aqute-bnd -BuildRequires: aqute-bndlib -BuildRequires: beust-jcommander -BuildRequires: bouncycastle -BuildRequires: bouncycastle-pg -BuildRequires: bsh -BuildRequires: checkstyle -BuildRequires: desktop-file-utils -BuildRequires: dom4j -BuildRequires: findbugs -BuildRequires: findbugs-bcel -BuildRequires: git -BuildRequires: groovy >= 1.8.6 -BuildRequires: groovy-javadoc >= 1.8.6 -BuildRequires: guava -BuildRequires: hamcrest -BuildRequires: httpcomponents-client -BuildRequires: httpcomponents-core -BuildRequires: jaffl -BuildRequires: jansi -BuildRequires: java-devel -BuildRequires: java-javadoc -BuildRequires: jaxen -BuildRequires: jcifs -BuildRequires: jcip-annotations -BuildRequires: jna -BuildRequires: jnr-constants -BuildRequires: jnr-posix >= 1.1.8 -BuildRequires: jnr-ffi -BuildRequires: jpackage-utils -BuildRequires: jsch -BuildRequires: junit -BuildRequires: logback >= 1.0.1 -BuildRequires: maven -BuildRequires: objectweb-asm -BuildRequires: plexus-classworlds -BuildRequires: plexus-component-api -BuildRequires: plexus-containers-component-annotations -BuildRequires: plexus-container-default -BuildRequires: plexus-interpolation -BuildRequires: plexus-utils -# unavailable build/requires deps -# FIXME BuildRequires: polyglot-maven https://bugzilla.redhat.com/show_bug.cgi?id=855331 -BuildRequires: slf4j -BuildRequires: snakeyaml -BuildRequires: testng - -%if !%bootstrap -BuildRequires: gradle -BuildRequires: cglib -BuildRequires: classycle -BuildRequires: codenarc -BuildRequires: flyingsaucer -BuildRequires: jmock -BuildRequires: jsoup -BuildRequires: nekohtml -BuildRequires: objenesis -BuildRequires: pegdown -BuildRequires: spock-core -BuildRequires: xalan-j2 -BuildRequires: xerces-j2 -BuildRequires: xmlunit -# unavailable docs deps -# TODO BuildRequires: xslthl https://bugzilla.redhat.com/show_bug.cgi?id=844179 -%endif -# work in progress BuildRequires: sonar https://bugzilla.redhat.com/show_bug.cgi?id=848096 - -Requires: aether-api -Requires: aether-util -Requires: ant -Requires: ant-antlr -Requires: antlr -Requires: antlr-tool -Requires: apache-commons-beanutils -Requires: apache-commons-cli -Requires: apache-commons-codec -Requires: apache-commons-collections -Requires: apache-commons-io -Requires: apache-commons-lang -Requires: apache-ivy -Requires: aqute-bnd -Requires: aqute-bndlib -Requires: beust-jcommander -Requires: bouncycastle -Requires: bouncycastle-pg -# Requires: bsh2 -Requires: bsh -Requires: checkstyle -Requires: dom4j -Requires: findbugs -Requires: findbugs-bcel -Requires: groovy -Requires: guava -Requires: hamcrest -Requires: httpcomponents-client -Requires: httpcomponents-core -Requires: jaffl -Requires: jansi -Requires: jaxen -Requires: jcifs -Requires: jcip-annotations -Requires: jna -Requires: jnr-constants -Requires: jnr-posix -Requires: jnr-ffi -Requires: jsch -Requires: junit -Requires: logback -Requires: maven - -# BuildRequires: bsh2 already packaged -BuildRequires: maven-ant-tasks -# BuildRequires: maven-artifact-manager -# BuildRequires: maven-error-diagnostics -# BuildRequires: maven-model -# BuildRequires: maven-project -# BuildRequires: maven-wagon -Requires: maven-ant-tasks -# Requires: maven-artifact-manager -# Requires: maven-error-diagnostics -# Requires: maven-model -# Requires: maven-project -# Requires: maven-wagon - -Requires: objectweb-asm -Requires: plexus-classworlds -Requires: plexus-component-api -Requires: plexus-containers-component-annotations -Requires: plexus-container-default -Requires: plexus-interpolation -Requires: plexus-utils -Requires: slf4j -Requires: snakeyaml -Requires: testng - -Requires: java-devel >= 1:1.6.0 -Requires: jpackage-utils -BuildArch: noarch - -%description -Gradle is a build system written in Groovy. It uses Groovy -also as the language for its build scripts. It has a powerful -multi-project build support. It has a layer on top of Ivy -that provides a build-by-convention integration for Ivy. It -gives you always the choice between the flexibility of Ant -and the convenience of a build-by-convention behavior. - -%package javadoc -Group: Documentation -Summary: Javadoc for %{name} -Requires: jpackage-utils - -%description javadoc -This package contains javadoc for %{name}. - -%prep -%setup -q -n %{name}-%{namedversion} -# cleanup -find . -name '*.jar' -delete -find . -name '*.class' -delete - -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%if %bootstrap -# gradle bin is generate during the non bootstrap build (task assemble only...?) -cat gradlew >> gradle.sh -%patch5 -p0 -# setting.xml is generate during the non bootstrap build -%patch6 -p0 -%endif -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p0 - -cp -p %{SOURCE4} build.xml -cp -p %{SOURCE5} . - -# fix non ASCII chars -for s in subprojects/core/src/main/groovy/org/gradle/api/Named.java \ - subprojects/core/src/main/groovy/org/gradle/api/internal/ExtensibleDynamicObject.java \ - subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DslObject.java \ - subprojects/core/src/main/groovy/org/gradle/api/plugins/ExtensionAware.java \ - subprojects/core/src/main/groovy/org/gradle/api/plugins/ExtensionContainer.java \ - subprojects/core/src/main/groovy/org/gradle/api/plugins/ExtraPropertiesExtension.java \ - subprojects/core/src/main/groovy/org/gradle/initialization/GradleLauncherAction.java \ - subprojects/core/src/main/groovy/org/gradle/process/internal/JvmOptions.java \ - subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResource.java \ - subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/DefaultCacheAwareExternalResourceAccessor.java \ - subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ExternalResourceAccessor.java \ - subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/metadata/ExternalResourceMetaData.java \ - subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LocallyAvailableResourceCandidates.java \ - subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DaemonClientInputForwarder.java \ - subprojects/launcher/src/main/java/org/gradle/launcher/daemon/protocol/Failure.java \ - subprojects/launcher/src/main/java/org/gradle/launcher/daemon/registry/EmbeddedDaemonRegistry.java \ - subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/DaemonStateCoordinator.java \ - subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/BuildCommandOnly.java \ - subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/DaemonCommandAction.java \ - subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/DaemonCommandExecution.java \ - subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/exec/ExecuteBuild.java \ - subprojects/plugins/src/main/groovy/org/gradle/api/reporting/Reporting.java;do - native2ascii -encoding UTF8 ${s} ${s} -done - -%if %{?fedora} > 18 -%patch29 -p1 -#sed -i "s|org.jruby.ext.posix|jnr.posix|" \ -# subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/FallbackPOSIXTest.groovy \ -# subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/ComposableFilePermissionHandlerTest.groovy \ -# subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/ComposableFilePermissionHandlerTest.groovy -%patch30 -p1 -%patch32 -p0 -%endif - -%patch31 -p0 -# print the stack trace even when failure is not instance of GradleException -sed -i "s|//failure.printStackTrace();|failure.printStackTrace();|" subprojects/core/src/main/groovy/org/gradle/BuildExceptionReporter.java -%build - -%if %bootstrap - ant dist javadoc -%else - -# TODO maven signing -# java/docs and test suite for unavailable deps require jmock, jets3t, docbook-xml@zip, xslthl,... -# fix deps proper name -sed -i "s|xercesImpl:2.9.1|xerces-j2:2.9.1|" subprojects/core/core.gradle -sed -i "s|cglib-nodep|cglib|" buildSrc/build.gradle -sed -i "s|bndlib|aqute-bnd|" subprojects/osgi/osgi.gradle -sed -i "s|constantine|jnr-constants|" subprojects/native/native.gradle - -# groovydoc (more complete than javadoc) task could derail the compilation (requires groovy-all.jar) docs:userguide -gradle --full-stacktrace --debug assemble javadoc \ - -g $PWD/gradlehome -b $PWD/build.gradle -%endif - -%install - -mkdir -p %{buildroot}%{_datadir}/%{name}/{bin,lib,lib/plugins,media} -mkdir -p %{buildroot}%{_javadir}/%{name} - -# TODO maven signing -%if %bootstrap - - cp -pr src/toplevel/media/* %{buildroot}%{_datadir}/%{name}/media/ - cp -p src/toplevel/LICENSE %{buildroot}%{_datadir}/%{name}/ - cp -p src/toplevel/NOTICE %{buildroot}%{_datadir}/%{name}/ - cp -p src/toplevel/changelog.txt %{buildroot}%{_datadir}/%{name}/ - cp -p src/toplevel/LICENSE . - cp -p src/toplevel/NOTICE . - install -pm 755 %{name}.sh %{buildroot}%{_datadir}/%{name}/bin/%{name} -# WARNING in newer release there are new artifacts, please update these lists - -# gradle-launcher-%%{namedversion}.jar is special and cannot be moved, -# because the launcher inspects its own _dereferenced_ file path to determine where to find other jars. -# The others can be in javadir - install -pm 644 dist/lib/%{name}-launcher-%{namedversion}.jar %{buildroot}%{_datadir}/%{name}/lib/%{name}-launcher-%{namedversion}.jar - - for m in base-services cli core native open-api tooling-api ui wrapper; do - install -pm 644 dist/lib/%{name}-${m}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${m}.jar - ln -sf %{_javadir}/%{name}/%{name}-${m}.jar %{buildroot}%{_datadir}/%{name}/lib/%{name}-${m}-%{namedversion}.jar - done - - for m in announce antlr code-quality core-impl cpp ear ide osgi plugins scala; do - install -pm 644 dist/lib/plugins/%{name}-${m}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${m}.jar - ln -sf %{_javadir}/%{name}/%{name}-${m}.jar %{buildroot}%{_datadir}/%{name}/lib/plugins/%{name}-${m}-%{namedversion}.jar - done - -%else -mkdir -p gradlehome -( - cd gradlehome - rm -rf * - unzip ../build/distributions/%{name}-%{namedversion}-all.zip - rm -rf src - find %{name}-%{namedversion} -name "*.bat" -delete - ( - cd %{name}-%{namedversion} - sed -i "s|# Attempt to set APP_HOME|export JAVA_HOME=/usr/lib/jvm/java|" bin/%{name} - sed -i 's|APP_HOME="`pwd -P`"|export APP_HOME=$GRADLE_HOME|' bin/%{name} - install -pm 755 bin/%{name} %{buildroot}%{_datadir}/%{name}/bin/ - - cp -pr media/* %{buildroot}%{_datadir}/%{name}/media/ - cp -p LICENSE %{buildroot}%{_datadir}/%{name}/ - cp -p NOTICE %{buildroot}%{_datadir}/%{name}/ - cp -p changelog.txt %{buildroot}%{_datadir}/%{name}/ -# WARNING in newer release there are new artifacts, please update these lists - -# gradle-launcher-%%{namedversion}.jar is special and cannot be moved, -# because the launcher inspects its own _dereferenced_ file path to determine where to find other jars. -# The others can be in javadir - install -pm 644 lib/%{name}-launcher-%{namedversion}.jar %{buildroot}%{_datadir}/%{name}/lib/%{name}-launcher-%{namedversion}.jar - - for m in base-services cli core native open-api tooling-api ui wrapper; do - install -pm 644 lib/%{name}-${m}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${m}.jar - ln -sf %{_javadir}/%{name}/%{name}-${m}.jar %{buildroot}%{_datadir}/%{name}/lib/%{name}-${m}-%{namedversion}.jar - done - - for m in announce antlr code-quality core-impl cpp ear ide osgi plugins scala; do - install -pm 644 lib/plugins/%{name}-${m}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${m}.jar - ln -sf %{_javadir}/%{name}/%{name}-${m}.jar %{buildroot}%{_datadir}/%{name}/lib/plugins/%{name}-${m}-%{namedversion}.jar - done - cp -p LICENSE ../../ - cp -p NOTICE ../../ - ) -) - -%endif - -# TODO once the tests task is fixed... change with the proper dir (docs/) -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -pr subprojects/docs/build/docs/*doc*/* %{buildroot}%{_javadocdir}/%{name} - - -ln -sf %{_javadir}/ant.jar %{buildroot}%{_datadir}/%{name}/lib/ant-1.8.2.jar -ln -sf $(build-classpath ant-launcher) %{buildroot}%{_datadir}/%{name}/lib/ant-launcher-1.8.2.jar -# groovy deps -ln -sf $(build-classpath antlr) %{buildroot}%{_datadir}/%{name}/lib/antlr-2.7.7.jar -ln -sf $(build-classpath objectweb-asm/asm-all) %{buildroot}%{_datadir}/%{name}/lib/asm-all-3.3.1.jar -ln -sf $(build-classpath commons-cli) %{buildroot}%{_datadir}/%{name}/lib/commons-cli-1.2.jar - -ln -sf $(build-classpath commons-collections) %{buildroot}%{_datadir}/%{name}/lib/commons-collections-3.2.1.jar -ln -sf $(build-classpath commons-io) %{buildroot}%{_datadir}/%{name}/lib/commons-io-1.4.jar -ln -sf $(build-classpath commons-lang) %{buildroot}%{_datadir}/%{name}/lib/commons-lang-2.6.jar -ln -sf $(build-classpath constantine) %{buildroot}%{_datadir}/%{name}/lib/constantine-0.7.jar -ln -sf $(build-classpath dom4j) %{buildroot}%{_datadir}/%{name}/lib/dom4j-1.6.1.jar -ln -sf $(build-classpath groovy) %{buildroot}%{_datadir}/%{name}/lib/groovy-all-1.8.6.jar -ln -sf $(build-classpath groovy) %{buildroot}%{_datadir}/%{name}/lib/groovy-1.8.6.jar -ln -sf $(build-classpath guava) %{buildroot}%{_datadir}/%{name}/lib/guava-11.0.1.jar -ln -sf $(build-classpath ivy) %{buildroot}%{_datadir}/%{name}/lib/ivy-2.2.0.jar -ln -sf $(build-classpath jansi) %{buildroot}%{_datadir}/%{name}/lib/jansi-1.2.1.jar -ln -sf $(build-classpath jaxen) %{buildroot}%{_datadir}/%{name}/lib/jaxen-1.1.jar -ln -sf $(build-classpath jcip-annotations) %{buildroot}%{_datadir}/%{name}/lib/jcip-annotations-1.0.jar -ln -sf $(build-classpath jna) %{buildroot}%{_datadir}/%{name}/lib/jna-3.2.7.jar -ln -sf $(build-classpath jnr-constants) %{buildroot}%{_datadir}/%{name}/lib/jnr-constants.jar -ln -sf $(build-classpath jnr-posix) %{buildroot}%{_datadir}/%{name}/lib/jnr-posix-1.0.3.jar -%if %{?fedora} > 18 -ln -sf $(build-classpath jnr-ffi) %{buildroot}%{_datadir}/%{name}/lib/jnr-ffi.jar -ln -sf $(build-classpath plexus-component-api/plexus-component-api) %{buildroot}%{_datadir}/%{name}/lib/plugins/plexus-component-api.jar -ln -sf $(build-classpath plexus-containers/plexus-component-annotations) %{buildroot}%{_datadir}/%{name}/lib/plugins/plexus-component-annotations-1.5.2.jar -%else -ln -sf $(build-classpath plexus/plexus-component-api) %{buildroot}%{_datadir}/%{name}/lib/plugins/plexus-component-api.jar -ln -sf $(build-classpath plexus/containers-component-annotations) %{buildroot}%{_datadir}/%{name}/lib/plugins/plexus-component-annotations-1.5.2.jar -%endif -# gradle -gui Starting external process java.lang.NoClassDefFoundError: com/kenai/jaffl/struct/Struct -ln -sf $(build-classpath jaffl) %{buildroot}%{_datadir}/%{name}/lib/jaffl.jar -ln -sf $(build-classpath jsch) %{buildroot}%{_datadir}/%{name}/lib/jsch-0.1.46.jar -ln -sf $(build-classpath logback/logback-classic) %{buildroot}%{_datadir}/%{name}/lib/logback-classic-1.0.0.jar -ln -sf $(build-classpath logback/logback-core) %{buildroot}%{_datadir}/%{name}/lib/logback-core-1.0.0.jar -ln -sf $(build-classpath slf4j/api) %{buildroot}%{_datadir}/%{name}/lib/slf4j-api-1.6.4.jar -ln -sf $(build-classpath slf4j/jcl-over-slf4j) %{buildroot}%{_datadir}/%{name}/lib/jcl-over-slf4j-1.6.4.jar -ln -sf $(build-classpath slf4j/jul-to-slf4j) %{buildroot}%{_datadir}/%{name}/lib/jul-to-slf4j-1.6.4.jar -ln -sf $(build-classpath slf4j/log4j-over-slf4j) %{buildroot}%{_datadir}/%{name}/lib/log4j-over-slf4j-1.6.4.jar - -ln -sf $(build-classpath ant/ant-antlr) %{buildroot}%{_datadir}/%{name}/lib/plugins/ant-antlr-1.8.2.jar -ln -sf $(build-classpath antlr) %{buildroot}%{_datadir}/%{name}/lib/plugins/antlr-2.7.7.jar -ln -sf $(build-classpath bcpg) %{buildroot}%{_datadir}/%{name}/lib/plugins/bcpg-jdk15-1.46.jar -ln -sf $(build-classpath bcprov) %{buildroot}%{_datadir}/%{name}/lib/plugins/bcprov-jdk15-1.46.jar -ln -sf $(build-classpath bsh) %{buildroot}%{_datadir}/%{name}/lib/plugins/bsh-2.0b4.jar -# bsh2/bsh -ln -sf $(build-classpath commons-beanutils) %{buildroot}%{_datadir}/%{name}/lib/plugins/commons-beanutils.jar -ln -sf $(build-classpath commons-cli) %{buildroot}%{_datadir}/%{name}/lib/plugins/commons-cli-1.2.jar -ln -sf $(build-classpath commons-codec) %{buildroot}%{_datadir}/%{name}/lib/plugins/commons-codec-1.4.jar -ln -sf $(build-classpath hamcrest/core) %{buildroot}%{_datadir}/%{name}/lib/plugins/hamcrest-core-1.1.jar -ln -sf $(build-classpath httpcomponents/httpclient) %{buildroot}%{_datadir}/%{name}/lib/plugins/httpclient-4.1.2.jar -ln -sf $(build-classpath httpcomponents/httpcore) %{buildroot}%{_datadir}/%{name}/lib/plugins/httpcore-4.1.2.jar -ln -sf $(build-classpath jcifs) %{buildroot}%{_datadir}/%{name}/lib/plugins/jcifs-1.3.17.jar -ln -sf $(build-classpath beust-jcommander) %{buildroot}%{_datadir}/%{name}/lib/plugins/jcommander-1.12.jar -ln -sf $(build-classpath aqute-bnd) %{buildroot}%{_datadir}/%{name}/lib/plugins/bndlib-1.50.0.jar -ln -sf $(build-classpath junit) %{buildroot}%{_datadir}/%{name}/lib/plugins/junit-4.10.jar -ln -sf $(build-classpath checkstyle) %{buildroot}%{_datadir}/%{name}/lib/plugins/checkstyle.jar -ln -sf $(build-classpath maven-ant-tasks) %{buildroot}%{_datadir}/%{name}/lib/plugins/maven-ant-tasks-2.1.3.jar -ln -sf $(build-classpath maven/maven-artifact) %{buildroot}%{_datadir}/%{name}/lib/plugins/maven-artifact.jar -ln -sf $(build-classpath maven/maven-compat) %{buildroot}%{_datadir}/%{name}/lib/plugins/maven-compat.jar -ln -sf $(build-classpath maven/maven-core) %{buildroot}%{_datadir}/%{name}/lib/plugins/maven-core.jar -# java.lang.ClassNotFoundException: org.sonatype.aether.* aether-api.jar,aether-util.jar -ln -sf $(build-classpath aether/api) %{buildroot}%{_datadir}/%{name}/lib/plugins/aether-api.jar -ln -sf $(build-classpath aether/util) %{buildroot}%{_datadir}/%{name}/lib/plugins/aether-util.jar -ln -sf $(build-classpath maven/maven-model) %{buildroot}%{_datadir}/%{name}/lib/plugins/maven-model.jar -ln -sf $(build-classpath maven/maven-settings) %{buildroot}%{_datadir}/%{name}/lib/plugins/maven-settings.jar -ln -sf $(build-classpath maven/maven-settings-builder) %{buildroot}%{_datadir}/%{name}/lib/plugins/maven-settings-builder.jar -ln -sf $(build-classpath plexus/container-default) %{buildroot}%{_datadir}/%{name}/lib/plugins/plexus-container-default.jar -ln -sf $(build-classpath plexus/classworlds) %{buildroot}%{_datadir}/%{name}/lib/plugins/plexus-classworlds.jar -ln -sf $(build-classpath plexus/interpolation) %{buildroot}%{_datadir}/%{name}/lib/plugins/plexus-interpolation.jar -ln -sf $(build-classpath plexus/utils) %{buildroot}%{_datadir}/%{name}/lib/plugins/plexus-utils.jar -ln -sf $(build-classpath snakeyaml) %{buildroot}%{_datadir}/%{name}/lib/plugins/snakeyaml-1.6.jar -ln -sf $(build-classpath testng) %{buildroot}%{_datadir}/%{name}/lib/plugins/testng-6.3.1.jar - -mkdir -p %{buildroot}%{_bindir} -install -pm 755 %{SOURCE3} %{buildroot}%{_bindir}/%{name} -( - cd %{buildroot}%{_datadir}/%{name}/media - for png in 16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512;do - mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${png}/apps - ln -sf ../../../../%{name}/media/%{name}-icon-${png}.png %{buildroot}%{_datadir}/icons/hicolor/${png}/apps/%{name}.png - done -) -desktop-file-validate %{name}.desktop -mkdir -p %{buildroot}%{_datadir}/applications -desktop-file-install --vendor="" \ - --dir=%{buildroot}%{_datadir}/applications %{name}.desktop - -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - -%files -%{_bindir}/%{name} -%{_javadir}/%{name} -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/bin -%{_datadir}/%{name}/bin/%{name} -%{_datadir}/%{name}/lib -%{_datadir}/%{name}/media -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*x*/apps/%{name}.png -%doc %{_datadir}/%{name}/LICENSE -%doc %{_datadir}/%{name}/NOTICE -%doc %{_datadir}/%{name}/changelog.txt - -%files javadoc -%{_javadocdir}/%{name} -%doc LICENSE NOTICE - -%changelog -* Sat Aug 03 2013 Fedora Release Engineering - 1.0-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu May 02 2013 gil cattaneo 1.0-18 -- fix rhbz#958158 migrate from aether to its subpackages - -* Thu Apr 25 2013 gil cattaneo 1.0-17 -- fix some broken symlinks -- bootstrap mode - -* Thu Apr 25 2013 gil cattaneo 1.0-16 -- try rebuild in non bootstrap mode - -* Mon Apr 22 2013 gil cattaneo 1.0-15 -- added missing jnr-ffi - -* Mon Apr 22 2013 gil cattaneo 1.0-14 -- print the stack trace even when failure is not instance of GradleException - -* Tue Apr 16 2013 gil cattaneo 1.0-13 -- force full details for build failure PATCH31 -- bootstrap mode - -* Tue Apr 16 2013 gil cattaneo 1.0-12 -- rebuilt non bootstrap mode - -* Wed Apr 10 2013 gil cattaneo 1.0-11 -- build fix for new jnr-posix and apache-ivy -- bootstrap mode - -* Tue Mar 05 2013 gil cattaneo 1.0-10 -- added missing requires jaffl - -* Thu Feb 14 2013 Fedora Release Engineering - 1.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Oct 15 2012 gil cattaneo 1.0-8 -- rebuild after bootstrap - -* Fri Sep 21 2012 gil cattaneo 1.0-7 -- Revert symlinks in %%_javadir, exception for gradle-launcher (see 809950#c43). thanks to A. Grimm - -* Fri Sep 21 2012 gil cattaneo 1.0-6 -- Revert symlinks from %%_datadir/gradle to %%_javadir/gradle - -* Fri Sep 21 2012 gil cattaneo 1.0-5 -- Removed bundled jars -- Fixed unowned directories -- Used symlinks in %%_datadir/gradle - -* Sun Aug 26 2012 gil cattaneo 1.0-4 -- used task assemble in non bootstrap mode -- fixed javadoc build -- fixed incorrectly modifies the getUserHome() method (RHBZ #809950#c24) -- removed libicns-utils support - -* Fri Aug 10 2012 gil cattaneo 1.0-3 -- Added some missing build/requires -- Cleaned up spec file - -* Mon Jul 16 2012 gil cattaneo 1.0-2 -- Changed plexus-container-default with plexus-containers-container-default -- Disabled signing plugin (depend on GRADLE-2210) -- Added BR classycle - -* Tue Jun 12 2012 gil cattaneo 1.0-1 -- Update to 1.0 - -* Thu May 31 2012 gil cattaneo 1.0-0.10.rc.3 -- Add maven 3 support patch from Marek Goldmann - -* Thu May 03 2012 gil cattaneo 1.0-0.9.rc.3 -- Update to 1.0-rc-3 - -* Wed May 02 2012 gil cattaneo 1.0-0.8.rc.2 -- Rebuilt with guava 11.0.2 support -- Remove guava-libraries references - -* Sat Apr 28 2012 gil cattaneo 1.0-0.7.rc.2 -- Rebuilt with guava-libraries support - -* Fri Apr 27 2012 gil cattaneo 1.0-0.6.rc.2 -- Update to 1.0-rc-2 - -* Mon Apr 23 2012 gil cattaneo 1.0-0.5.rc.1 -- edit Release tag - -* Thu Apr 19 2012 gil cattaneo 1.0-0.4.rc.1 -- Applied PATCH18 remove some mvn2 references - -* Fri Apr 13 2012 gil cattaneo 1.0-0.3.rc.1 -- Update to 1.0-rc-1 -- Disable maven plugin see GRADLE-2210 -- Added desktop file - -* Thu Apr 05 2012 gil cattaneo 1.0-0.2.milestone.9 -- Added changelog -- Built apis documentation - -* Sun Mar 25 2012 gil cattaneo 1.0-0.1.milestone.9 -- Initial rpm \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index 84a6612..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -c7385c3c88fbc1e8e2b87fbe19d51ccc gradle-1.0-src.zip