This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle-1.12.
commit db77cefdf37646319b9c0476bb19ec66da4ad509 Author: Miguel Landaeta <[email protected]> Date: Tue Dec 21 20:31:11 2010 -0430 prepare 0.9-1 release --- build.gradle | 60 ++++++++++-------- buildSrc/build.gradle | 19 ++++-- .../main/groovy/org/gradle/build/Version.groovy | 2 +- debian/bootstrap.sh | 4 +- debian/changelog | 4 +- debian/control | 15 +++-- debian/orig-tar.sh | 6 +- debian/patches/01_use_debian_jars.diff | 74 +++++++++++++--------- debian/patches/10_fix_version.diff | 20 +++--- debian/patches/21_docs.diff | 30 ++++----- debian/patches/22_checkstyle.diff | 23 +++---- debian/rules | 9 ++- debian/watch | 3 +- .../gradle-code-quality/code-quality.gradle | 4 +- subprojects/gradle-core/core.gradle | 30 +++++---- .../api/internal/AbstractClassPathProvider.java | 2 +- .../maven/pombuilder/CustomModelBuilder.java | 10 ++- .../publish/maven/pombuilder/ModelFactory.java | 12 ++-- .../maven/pombuilder/PlexusLoggerAdapter.java | 4 ++ .../artifacts/repositories/WebdavRepository.java | 4 +- .../logging/internal/Slf4jLoggingConfigurer.java | 2 +- subprojects/gradle-docs/docs.gradle | 13 ++-- subprojects/gradle-jetty/jetty.gradle | 12 ++-- subprojects/gradle-osgi/osgi.gradle | 6 +- subprojects/gradle-plugins/plugins.gradle | 2 +- subprojects/gradle-wrapper/wrapper.gradle | 2 +- 26 files changed, 209 insertions(+), 163 deletions(-) diff --git a/build.gradle b/build.gradle index d3a3b33..7dc94c0 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,7 @@ import java.util.jar.Attributes import org.gradle.api.artifacts.repositories.WebdavResolver +import org.apache.ivy.plugins.resolver.FileSystemResolver import org.gradle.api.internal.artifacts.dependencies.DefaultSelfResolvingDependency import org.gradle.build.samples.WrapperProjectCreator @@ -44,35 +45,36 @@ startScriptsDir = new File("$buildDir/startScripts") archivesBaseName = 'gradle' libraries = [ - ant: 'org.apache.ant:ant:1.8.1@jar', - ant_junit: 'org.apache.ant:ant-junit:1.8.1@jar', - ant_launcher: 'org.apache.ant:ant-launcher:1.8.1@jar', - ant_nodeps: 'org.apache.ant:ant-nodeps:1.8.1@jar', - ant_antlr: 'org.apache.ant:ant-antlr:1.8.1@jar', + ant: 'org.apache.ant:ant:1.8.0@jar', + ant_junit: 'org.apache.ant:ant-junit:1.8.0@jar', + ant_launcher: 'org.apache.ant:ant-launcher:1.8.0@jar', + ant_nodeps: 'org.apache.ant:ant-nodeps:1.8.0@jar', + ant_trax: 'org.apache.ant:ant-trax:1.8.0@jar', + ant_antlr: 'org.apache.ant:ant-antlr:1.8.0@jar', antlr: 'antlr:antlr:2.7.7@jar', - asm_all: 'asm:asm-all:3.2@jar', + asm_all: 'asm:asm3-all:3.2@jar', commons_cli: 'commons-cli:commons-cli:1.2@jar', commons_io: 'commons-io:commons-io:1.4@jar', - commons_lang: 'commons-lang:commons-lang:2.5@jar', + commons_lang: 'commons-lang:commons-lang:2.4@jar', dom4j: 'dom4j:dom4j:1.6.1@jar', google_collections: 'com.google.collections:google-collections:1.0@jar', - groovy: 'org.codehaus.groovy:groovy-all:1.7.6@jar', - ivy: 'org.apache.ivy:ivy:2.2.0@jar', - jaxen: 'jaxen:jaxen:1.1@jar', - slf4j_api: 'org.slf4j:slf4j-api:1.6.1@jar', - jcl_to_slf4j: 'org.slf4j:jcl-over-slf4j:1.6.1@jar', - jul_to_slf4j: 'org.slf4j:jul-to-slf4j:1.6.1@jar', - log4j_to_slf4j: 'org.slf4j:log4j-over-slf4j:1.6.1@jar', - logback_classic: 'ch.qos.logback:logback-classic:0.9.24@jar', - logback_core: 'ch.qos.logback:logback-core:0.9.24@jar', - junit: 'junit:junit:4.8.1', + groovy: 'org.codehaus.groovy:groovy-all:1.7.4@jar', + ivy: 'org.apache.ivy:ivy:2.1.0@jar', + jaxen: 'jaxen:jaxen:1.1.2@jar', + slf4j_api: 'org.slf4j:slf4j-api:1.5.11@jar', + jcl_to_slf4j: 'org.slf4j:jcl-over-slf4j:1.5.11@jar', + jul_to_slf4j: 'org.slf4j:jul-to-slf4j:1.5.11@jar', + log4j_to_slf4j: 'org.slf4j:log4j-over-slf4j:1.5.11@jar', + logback_classic: 'ch.qos.logback:logback-classic:0.9.18@jar', + logback_core: 'ch.qos.logback:logback-core:0.9.18@jar', + junit: 'junit:junit4:4.8.2', xmlunit: 'xmlunit:xmlunit:1.3', ] libraries.spock = ['org.spockframework:spock-core:0.4-groovy-1.7@jar', libraries.groovy, 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'] libraries.groovy_depends = [libraries.groovy, libraries.commons_cli] -libraries.jetty_depends = ["org.mortbay.jetty:jetty:6.1.25@jar", "org.mortbay.jetty:jetty-util:6.1.25@jar", - "org.mortbay.jetty:servlet-api:2.5-20081211@jar"] +libraries.jetty_depends = ["org.mortbay.jetty:jetty:6.1.24@jar", "org.mortbay.jetty:jetty-util:6.1.24@jar", + "javax.servlet:servlet-api:2.5@jar"] allprojects { group = 'org.gradle' @@ -83,7 +85,11 @@ allprojects { } repositories { - mavenRepo(urls: 'http://gradle.artifactoryonline.com/gradle/libs') + add(new FileSystemResolver()) { + name = 'repo' + addArtifactPattern "/usr/share/java/[module]-[revision].[ext]" + addArtifactPattern "/usr/share/java/[module].[ext]" + } } version = this.version @@ -226,7 +232,7 @@ zipRootFolder = "$archivesBaseName-${-> version}" binDistImage = copySpec { from 'src/toplevel' - from project(':docs').distDocs.destFile + //from project(':docs').distDocs.destFile into('bin') { from startScriptsDir fileMode = 0755 @@ -252,14 +258,16 @@ allDistImage = copySpec { } } -task allZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:docs', 'docs:samples']) { +//task allZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:docs', 'docs:samples']) { +task allZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:docs']) { classifier = 'all' into(zipRootFolder) { with allDistImage } } -task binZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:distDocs']) { +//task binZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:distDocs']) { +task binZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:docs']) { classifier = 'bin' into(zipRootFolder) { with binDistImage @@ -369,7 +377,8 @@ def guessMaxForks() { task testedDists(dependsOn: [assemble, check, integTest, embeddedIntegTest, 'openApi:integTest', ':ui:integTest']) -task nightlyBuild(dependsOn: [clean, testedDists, ':docs:uploadDocs']) +//task nightlyBuild(dependsOn: [clean, testedDists, ':docs:uploadDocs']) +task nightlyBuild(dependsOn: [clean, testedDists]) task install(type: Install) { description = 'Installs the minimal distribution into directory $gradle_installPath' @@ -445,7 +454,8 @@ task releaseArtifacts { task release { description = 'Builds, tests and uploads the release artifacts' group = 'release' - dependsOn releaseVersion, tag, releaseArtifacts, testedDists, ':docs:uploadDocs' + //dependsOn releaseVersion, tag, releaseArtifacts, testedDists, ':docs:uploadDocs' + dependsOn releaseVersion, tag, releaseArtifacts, testedDists } task wrapper(type: Wrapper, dependsOn: binZip) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index cb1b1b7..3c4dfbd 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -13,13 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import org.apache.ivy.plugins.resolver.FileSystemResolver apply plugin: 'groovy' -apply plugin: 'code-quality' +//apply plugin: 'code-quality' apply plugin: 'idea' repositories { - mavenRepo(urls: 'http://gradle.artifactoryonline.com/gradle/libs') + add(new FileSystemResolver()) { + name = 'repo' + addArtifactPattern "/usr/share/java/[module]-[revision].[ext]" + addArtifactPattern "/usr/share/java/[module].[ext]" + } } dependencies { @@ -27,7 +32,13 @@ dependencies { compile 'com.google.collections:google-collections:1.0@jar' groovy localGroovy() testCompile 'junit:junit:4.8.1@jar' - testCompile 'org.spockframework:spock-core:0.4-groovy-1.7@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' + //testCompile 'org.spockframework:spock-core:0.4-groovy-1.7@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' } -apply from: '../gradle/codeQuality.gradle' +// All tests for this subproject are disabled becuase they depend on Spock +// Framework and that software is not available in Debian yet. +compileTestGroovy { + exclude '**' +} + +//apply from: '../gradle/codeQuality.gradle' diff --git a/buildSrc/src/main/groovy/org/gradle/build/Version.groovy b/buildSrc/src/main/groovy/org/gradle/build/Version.groovy index b48fa0c..e8fa392 100644 --- a/buildSrc/src/main/groovy/org/gradle/build/Version.groovy +++ b/buildSrc/src/main/groovy/org/gradle/build/Version.groovy @@ -48,7 +48,7 @@ class Version { if (graph.hasTask(':releaseVersion')) { release = true } else { - this.versionNumber += "-" + getTimestamp() + //this.versionNumber += "-" + getTimestamp() release = false } } diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index 2115a7e..1c8cfed 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -2,10 +2,10 @@ set -e -URL="http://dist.codehaus.org/gradle/gradle-0.9-rc-3-bin.zip"; +URL="http://gradle.artifactoryonline.com/gradle/distributions/gradle-0.9-bin.zip"; ZIP="$(basename $URL)" DIR="$(echo $ZIP | sed 's/-bin\.zip$//')" -VERSION="0.9~rc3-0.1" +VERSION="0.9-0bootstrap1" wget $URL -O $ZIP unzip $ZIP diff --git a/debian/changelog b/debian/changelog index 0f1e524..27894ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -gradle (0.9~rc3-1) UNRELEASED; urgency=low +gradle (0.9-1) UNRELEASED; urgency=low * Initial release. (Closes: #587832). - -- Miguel Landaeta <[email protected]> Tue, 23 Nov 2010 19:07:15 -0430 + -- Miguel Landaeta <[email protected]> Tue, 21 Dec 2010 20:29:24 -0430 diff --git a/debian/control b/debian/control index d0d0401..e5cd003 100644 --- a/debian/control +++ b/debian/control @@ -13,9 +13,9 @@ Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper, gradle, quilt, libjsch-java, libjzlib-java, testng, libcommons-collections3-java, libmaven-ant-tasks-java, libjansi-java, libjna-posix-java, libplexus-containers-java, libmaven2-core-java, libplexus-component-api-java, - libwagon-java, libcodenarc-groovy-java, checkstyle, libcommons-beanutils-java, - libsvnkit-java, bnd, libservlet2.5-java, libjetty-java, libjetty-extra-java, - libxalan2-java + libwagon-java, libcodenarc-groovy-java, checkstyle (>= 5.1), + libcommons-beanutils-java, libsvnkit-java, bnd, libservlet2.5-java, + libjetty-java, libjetty-extra-java, libxalan2-java Standards-Version: 3.9.1 Homepage: http://gradle.org/ Vcs-Git: git://git.debian.org/git/pkg-java/gradle.git @@ -24,7 +24,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-java/gradle.git Package: gradle Architecture: all Depends: default-jre-headless, groovy (>= 1.7.4), ant, ant-optional, - libgradle-core-java, libgradle-plugins-java, libantlr-java, libasm3-java, + libgradle-core-java (= ${binary:Version}), + libgradle-plugins-java (= ${binary:Version}), libantlr-java, libasm3-java, libcommons-cli-java, libcommons-io-java, libdom4j-java, libgoogle-collections-java (>= 1.0), ivy, libjaxen-java, libjoptsimple-java, libslf4j-java, liblogback-java, junit4, libxmlunit-java, @@ -32,8 +33,8 @@ Depends: default-jre-headless, groovy (>= 1.7.4), ant, ant-optional, testng, libcommons-collections3-java, libmaven-ant-tasks-java, libjansi-java, libjna-posix-java, libplexus-containers-java, libmaven2-core-java, libplexus-component-api-java, libwagon-java, libcodenarc-groovy-java, - checkstyle, libcommons-beanutils-java, libsvnkit-java, bnd, libservlet2.5-java, - libjetty-java, libjetty-extra-java, ${misc:Depends} + checkstyle (>= 5.1), libcommons-beanutils-java, libsvnkit-java, bnd, + libservlet2.5-java, libjetty-java, libjetty-extra-java, ${misc:Depends} Recommends: libgradle-announce-java (= ${binary:Version}), libgradle-antlr-java (= ${binary:Version}), libgradle-code-quality-java (= ${binary:Version}), @@ -104,7 +105,7 @@ Description: Groovy based build system - ANTLR plugin Package: libgradle-code-quality-java Architecture: all Depends: libgradle-core-java (= ${binary:Version}), ${misc:Depends} -Suggests: libcodenarc-groovy-java, checkstyle +Suggests: libcodenarc-groovy-java, checkstyle (>= 5.1) Description: Groovy based build system - Code quality plugin Gradle is a build system written in Groovy. It uses Groovy also as the language for its build scripts. It has a powerful diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index c0ad5a7..6255c4f 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -8,11 +8,11 @@ package=`dpkg-parsechangelog | sed -n 's/^Source: //p'` version=$2 tarball=$3 TAR=${package}_${version}.orig.tar.gz -DIR=${package}-${version}.orig +DIR=${package}-${version} unzip $tarball GZIP=--best tar --numeric --group 0 --owner 0 -c -v -z -f $TAR \ - --anchored -X debian/orig-tar.excludes ${package}-* + --anchored -X debian/orig-tar.excludes $DIR -rm -rf $tarball $DIR ${package}-* +rm -rf $tarball $DIR diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff index 7300c54..a24e6a8 100644 --- a/debian/patches/01_use_debian_jars.diff +++ b/debian/patches/01_use_debian_jars.diff @@ -1,10 +1,10 @@ Description: Build Gradle using libraries available in Debian Author: Miguel Landaeta <[email protected]> -Forwarded: not-needed -Last-Update: 2010-11-23 +Forwarded: no +Last-Update: 2010-12-21 ---- gradle-0.9~rc3.orig/build.gradle -+++ gradle-0.9~rc3/build.gradle +--- gradle-0.9.orig/build.gradle ++++ gradle-0.9/build.gradle @@ -16,6 +16,7 @@ import java.util.jar.Attributes @@ -37,7 +37,7 @@ Last-Update: 2010-11-23 + commons_lang: 'commons-lang:commons-lang:2.4@jar', dom4j: 'dom4j:dom4j:1.6.1@jar', google_collections: 'com.google.collections:google-collections:1.0@jar', -- groovy: 'org.codehaus.groovy:groovy-all:1.7.5@jar', +- groovy: 'org.codehaus.groovy:groovy-all:1.7.6@jar', - ivy: 'org.apache.ivy:ivy:2.2.0@jar', - jaxen: 'jaxen:jaxen:1.1@jar', - slf4j_api: 'org.slf4j:slf4j-api:1.6.1@jar', @@ -82,9 +82,9 @@ Last-Update: 2010-11-23 } version = this.version ---- gradle-0.9~rc3.orig/buildSrc/build.gradle -+++ gradle-0.9~rc3/buildSrc/build.gradle -@@ -13,12 +13,17 @@ +--- gradle-0.9.orig/buildSrc/build.gradle ++++ gradle-0.9/buildSrc/build.gradle +@@ -13,13 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ @@ -92,6 +92,7 @@ Last-Update: 2010-11-23 apply plugin: 'groovy' apply plugin: 'code-quality' + apply plugin: 'idea' repositories { - mavenRepo(urls: 'http://gradle.artifactoryonline.com/gradle/libs') @@ -103,8 +104,23 @@ Last-Update: 2010-11-23 } dependencies { ---- gradle-0.9~rc3.orig/subprojects/gradle-core/core.gradle -+++ gradle-0.9~rc3/subprojects/gradle-core/core.gradle +@@ -27,7 +32,13 @@ dependencies { + compile 'com.google.collections:google-collections:1.0@jar' + groovy localGroovy() + testCompile 'junit:junit:4.8.1@jar' +- testCompile 'org.spockframework:spock-core:0.4-groovy-1.7@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' ++ //testCompile 'org.spockframework:spock-core:0.4-groovy-1.7@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' ++} ++ ++// All tests for this subproject are disabled becuase they depend on Spock ++// Framework and that software is not available in Debian yet. ++compileTestGroovy { ++ exclude '**' + } + + apply from: '../gradle/codeQuality.gradle' +--- gradle-0.9.orig/subprojects/gradle-core/core.gradle ++++ gradle-0.9/subprojects/gradle-core/core.gradle @@ -36,31 +36,40 @@ configurations { dependencies { groovy libraries.groovy_depends @@ -154,8 +170,8 @@ Last-Update: 2010-11-23 runtime libraries.log4j_to_slf4j, libraries.jcl_to_slf4j ---- gradle-0.9~rc3.orig/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java -+++ gradle-0.9~rc3/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java +--- gradle-0.9.orig/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java ++++ gradle-0.9/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java @@ -60,7 +60,7 @@ public abstract class AbstractClassPathP protected static List<Pattern> toPatterns(String... patternStrings) { List<Pattern> patterns = new ArrayList<Pattern>(); @@ -165,8 +181,8 @@ Last-Update: 2010-11-23 } return patterns; } ---- gradle-0.9~rc3.orig/subprojects/gradle-osgi/osgi.gradle -+++ gradle-0.9~rc3/subprojects/gradle-osgi/osgi.gradle +--- gradle-0.9.orig/subprojects/gradle-osgi/osgi.gradle ++++ gradle-0.9/subprojects/gradle-osgi/osgi.gradle @@ -13,10 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. @@ -187,9 +203,9 @@ Last-Update: 2010-11-23 testCompile project(path: ':core', configuration: 'testFixtures') testRuntime project(path: ':core', configuration: 'testFixturesRuntime') ---- gradle-0.9~rc3.orig/subprojects/gradle-jetty/jetty.gradle -+++ gradle-0.9~rc3/subprojects/gradle-jetty/jetty.gradle -@@ -21,13 +21,11 @@ dependencies { +--- gradle-0.9.orig/subprojects/gradle-jetty/jetty.gradle ++++ gradle-0.9/subprojects/gradle-jetty/jetty.gradle +@@ -21,14 +21,12 @@ dependencies { compile libraries.slf4j_api, libraries.jetty_depends, @@ -200,15 +216,17 @@ Last-Update: 2010-11-23 - "org.mortbay.jetty:jsp-2.1:6.1.14@jar", - "org.eclipse.jdt:core:3.1.1@jar", - "org.mortbay.jetty:jetty-naming:6.1.25@jar", -- "org.mortbay.jetty:jetty-annotations:6.1.25@jar" +- "org.mortbay.jetty:jetty-annotations:6.1.25@jar", +- "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0@jar" + runtime "org.mortbay.jetty:jsp-api:2.1@jar", + "org.mortbay.jetty:jetty-naming:6.1.24@jar", + "org.mortbay.jetty:jetty-annotations:6.1.24@jar" ++// "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0@jar" testCompile project(path: ':core', configuration: 'testFixtures') testRuntime project(path: ':core', configuration: 'testFixturesRuntime') ---- gradle-0.9~rc3.orig/subprojects/gradle-code-quality/code-quality.gradle -+++ gradle-0.9~rc3/subprojects/gradle-code-quality/code-quality.gradle +--- gradle-0.9.orig/subprojects/gradle-code-quality/code-quality.gradle ++++ gradle-0.9/subprojects/gradle-code-quality/code-quality.gradle @@ -19,7 +19,7 @@ dependencies { compile project(':core') compile project(':plugins') @@ -218,12 +236,8 @@ Last-Update: 2010-11-23 compile libraries.slf4j_api // CodeNarc dependencies -@@ -27,10 +27,10 @@ dependencies { - "org.gmetrics:GMetrics:0.3@jar" - - // Checkstyle dependencies -- runtime "com.puppycrawl.tools:checkstyle:5.3@jar", -+ runtime "com.puppycrawl.tools:checkstyle:4.4@jar", +@@ -30,7 +30,7 @@ dependencies { + runtime "com.puppycrawl.tools:checkstyle:5.3@jar", libraries.google_collections, libraries.antlr, - "commons-beanutils:commons-beanutils-core:1.8.3@jar" @@ -231,8 +245,8 @@ Last-Update: 2010-11-23 testCompile project(path: ':core', configuration: 'testFixtures') testRuntime project(path: ':core', configuration: 'testFixturesRuntime') ---- gradle-0.9~rc3.orig/subprojects/gradle-wrapper/wrapper.gradle -+++ gradle-0.9~rc3/subprojects/gradle-wrapper/wrapper.gradle +--- gradle-0.9.orig/subprojects/gradle-wrapper/wrapper.gradle ++++ gradle-0.9/subprojects/gradle-wrapper/wrapper.gradle @@ -19,7 +19,7 @@ dependencies { groovy libraries.groovy_depends compile project(':core') @@ -242,8 +256,8 @@ Last-Update: 2010-11-23 testCompile project(path: ':core', configuration: 'testFixtures') testRuntime project(path: ':core', configuration: 'testFixturesRuntime') ---- gradle-0.9~rc3.orig/subprojects/gradle-plugins/plugins.gradle -+++ gradle-0.9~rc3/subprojects/gradle-plugins/plugins.gradle +--- gradle-0.9.orig/subprojects/gradle-plugins/plugins.gradle ++++ gradle-0.9/subprojects/gradle-plugins/plugins.gradle @@ -33,7 +33,7 @@ dependencies { // This is for the ant junit task. Without it, we get file locking problems with some jvms because the default diff --git a/debian/patches/10_fix_version.diff b/debian/patches/10_fix_version.diff index f950a95..ffd4729 100644 --- a/debian/patches/10_fix_version.diff +++ b/debian/patches/10_fix_version.diff @@ -1,16 +1,16 @@ Description: Remove build timestamp from the version string Author: Miguel Landaeta <[email protected]> -Forwarded: not-needed -Last-Update: 2010-11-23 +Forwarded: no +Last-Update: 2010-12-20 ---- gradle-0.9~rc3.orig/buildSrc/src/main/groovy/org/gradle/build/Version.groovy -+++ gradle-0.9~rc3/buildSrc/src/main/groovy/org/gradle/build/Version.groovy -@@ -31,7 +31,7 @@ class Version { - - project.gradle.taskGraph.whenReady {graph -> - if (!graph.hasTask(':releaseVersion')) { +--- gradle-0.9.orig/buildSrc/src/main/groovy/org/gradle/build/Version.groovy ++++ gradle-0.9/buildSrc/src/main/groovy/org/gradle/build/Version.groovy +@@ -48,7 +48,7 @@ class Version { + if (graph.hasTask(':releaseVersion')) { + release = true + } else { - this.versionNumber += "-" + getTimestamp() + //this.versionNumber += "-" + getTimestamp() release = false - } else { - release = true + } + } diff --git a/debian/patches/21_docs.diff b/debian/patches/21_docs.diff index 64a5cde..428dfee 100644 --- a/debian/patches/21_docs.diff +++ b/debian/patches/21_docs.diff @@ -2,12 +2,12 @@ Description: Generate javadocs and groovydocs only I still have to figure out how to build the rest of the documentation using DocBook and other libraries available in Debian. Author: Miguel Landaeta <[email protected]> -Forwarded: not-needed -Last-Update: 2010-11-23 +Forwarded: no +Last-Update: 2010-12-20 ---- gradle-0.9~rc3.orig/build.gradle -+++ gradle-0.9~rc3/build.gradle -@@ -247,7 +247,7 @@ zipRootFolder = "$archivesBaseName-${-> +--- gradle-0.9.orig/build.gradle ++++ gradle-0.9/build.gradle +@@ -232,7 +232,7 @@ zipRootFolder = "$archivesBaseName-${-> binDistImage = copySpec { from 'src/toplevel' @@ -16,7 +16,7 @@ Last-Update: 2010-11-23 into('bin') { from startScriptsDir fileMode = 0755 -@@ -273,14 +273,16 @@ allDistImage = copySpec { +@@ -258,14 +258,16 @@ allDistImage = copySpec { } } @@ -35,7 +35,7 @@ Last-Update: 2010-11-23 classifier = 'bin' into(zipRootFolder) { with binDistImage -@@ -390,7 +392,8 @@ def guessMaxForks() { +@@ -375,7 +377,8 @@ def guessMaxForks() { task testedDists(dependsOn: [assemble, check, integTest, embeddedIntegTest, 'openApi:integTest', ':ui:integTest']) @@ -45,18 +45,18 @@ Last-Update: 2010-11-23 task install(type: Install) { description = 'Installs the minimal distribution into directory $gradle_installPath' -@@ -466,7 +469,8 @@ task releaseArtifacts { +@@ -451,7 +454,8 @@ task releaseArtifacts { task release { description = 'Builds, tests and uploads the release artifacts' group = 'release' -- dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadDists, ':docs:uploadDocs' -+ //dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadDists, ':docs:uploadDocs' -+ dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadDists +- dependsOn releaseVersion, tag, releaseArtifacts, testedDists, ':docs:uploadDocs' ++ //dependsOn releaseVersion, tag, releaseArtifacts, testedDists, ':docs:uploadDocs' ++ dependsOn releaseVersion, tag, releaseArtifacts, testedDists } task wrapper(type: Wrapper, dependsOn: binZip) ---- gradle-0.9~rc3.orig/subprojects/gradle-docs/docs.gradle -+++ gradle-0.9~rc3/subprojects/gradle-docs/docs.gradle +--- gradle-0.9.orig/subprojects/gradle-docs/docs.gradle ++++ gradle-0.9/subprojects/gradle-docs/docs.gradle @@ -28,6 +28,7 @@ configurations { userGuideTask } @@ -73,7 +73,7 @@ Last-Update: 2010-11-23 RemoteLocations remoteLocations = new RemoteLocations(version: version) -@@ -98,10 +100,10 @@ task userguideStyleSheets(type: Copy) { +@@ -100,10 +102,10 @@ task userguideStyleSheets(type: Copy) { from(cssSrcDir) { include '*.css' } @@ -88,7 +88,7 @@ Last-Update: 2010-11-23 } task samplesDocbook(type: AssembleSamplesDocTask) { -@@ -325,7 +327,8 @@ task userguide { +@@ -336,7 +338,8 @@ task userguide { } task docs { diff --git a/debian/patches/22_checkstyle.diff b/debian/patches/22_checkstyle.diff index 33f0b1e..6a511f0 100644 --- a/debian/patches/22_checkstyle.diff +++ b/debian/patches/22_checkstyle.diff @@ -4,29 +4,22 @@ Description: Disable checkstyle features performed. Author: Miguel Landaeta <[email protected]> Forwarded: no -Last-Update: 2010-11-23 +Last-Update: 2010-12-21 ---- gradle-0.9~rc3.orig/buildSrc/build.gradle -+++ gradle-0.9~rc3/buildSrc/build.gradle +--- gradle-0.9.orig/buildSrc/build.gradle ++++ gradle-0.9/buildSrc/build.gradle @@ -16,7 +16,7 @@ import org.apache.ivy.plugins.resolver.FileSystemResolver apply plugin: 'groovy' -apply plugin: 'code-quality' +//apply plugin: 'code-quality' + apply plugin: 'idea' repositories { - add(new FileSystemResolver()) { -@@ -32,10 +32,12 @@ dependencies { - groovy localGroovy() +@@ -41,4 +41,4 @@ compileTestGroovy { + exclude '**' } -+/* - checkstyleConfigDir = "$rootDir/../config/checkstyle" - checkstyleConfigFileName = new File(checkstyleConfigDir, 'checkstyle.xml') - codeNarcConfigFileName = "$rootDir/../config/codenarc.xml" - checkstyleProperties.checkstyleConfigDir = checkstyleConfigDir -+*/ - - task ide(type: Sync) { - into file('lib') +-apply from: '../gradle/codeQuality.gradle' ++//apply from: '../gradle/codeQuality.gradle' diff --git a/debian/rules b/debian/rules index 10378eb..55a6a47 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^Version: \(.\+\)-.\+$$/\1/') -UPSTREAM_VERSION := $(shell echo $(VERSION) | sed 's/~rc/-rc-/') JARS := announce antlr code-quality eclipse idea jetty maven osgi plugins scala wrapper export JAVA_HOME=/usr/lib/jvm/default-java @@ -25,20 +24,20 @@ override_dh_link: # plugins symlinks cd debian/gradle/usr/share/gradle/lib/plugins && \ for j in $(JARS); do \ - ln -s ../../../java/gradle-$$j.jar gradle-$$j-$(UPSTREAM_VERSION).jar; \ + ln -s ../../../java/gradle-$$j.jar gradle-$$j-$(VERSION).jar; \ done ; # core jar symlink cd debian/gradle/usr/share/gradle/lib && \ - ln -s ../../java/gradle-core.jar gradle-core-$(UPSTREAM_VERSION).jar + ln -s ../../java/gradle-core.jar gradle-core-$(VERSION).jar override_jh_depends: # jh_depends crashes when checking jar symlinks, should I file a bug? override_jh_installlibs: - jh_installlibs --upstream-version=$(UPSTREAM_VERSION) + jh_installlibs --upstream-version=$(VERSION) override_jh_installjavadoc: - jh_installjavadoc -pgradle-doc build/distributions/all/gradle-$(UPSTREAM_VERSION)/docs/javadoc + jh_installjavadoc -pgradle-doc build/distributions/all/gradle-$(VERSION)/docs/javadoc get-orig-source: cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ diff --git a/debian/watch b/debian/watch index 6faf6da..98d153f 100644 --- a/debian/watch +++ b/debian/watch @@ -1,5 +1,4 @@ version=3 -opts=uversionmangle=s/-rc-([0-9])+/~rc$1/ \ http://gradle.org/downloads.html \ -http://dist.codehaus.org/gradle/gradle-([\w\.-]+)-src\.zip \ +http://gradle.artifactoryonline.com/gradle/distributions/gradle-([\w\.-]+)-src.zip \ debian debian/orig-tar.sh diff --git a/subprojects/gradle-code-quality/code-quality.gradle b/subprojects/gradle-code-quality/code-quality.gradle index 6b4f755..dc93ddd 100644 --- a/subprojects/gradle-code-quality/code-quality.gradle +++ b/subprojects/gradle-code-quality/code-quality.gradle @@ -19,7 +19,7 @@ dependencies { compile project(':core') compile project(':plugins') - compile "org.codenarc:CodeNarc:0.11@jar" + compile "org.codenarc:CodeNarc:0.9@jar" compile libraries.slf4j_api // CodeNarc dependencies @@ -30,7 +30,7 @@ dependencies { runtime "com.puppycrawl.tools:checkstyle:5.3@jar", libraries.google_collections, libraries.antlr, - "commons-beanutils:commons-beanutils-core:1.8.3@jar" + "commons-beanutils:commons-beanutils:1.8.3@jar" testCompile project(path: ':core', configuration: 'testFixtures') testRuntime project(path: ':core', configuration: 'testFixturesRuntime') diff --git a/subprojects/gradle-core/core.gradle b/subprojects/gradle-core/core.gradle index e55befa..ef8bfe9 100644 --- a/subprojects/gradle-core/core.gradle +++ b/subprojects/gradle-core/core.gradle @@ -36,31 +36,37 @@ configurations { dependencies { groovy libraries.groovy_depends - compile "commons-httpclient:commons-httpclient:3.0@jar", "commons-codec:commons-codec:1.2@jar", libraries.jcl_to_slf4j + compile "commons-httpclient:commons-httpclient:3.1@jar", "commons-codec:commons-codec:1.4@jar", libraries.jcl_to_slf4j compile libraries.ivy, "com.jcraft:jsch:0.1.42@jar", 'com.jcraft:jzlib:1.0.7@jar' compile libraries.ant, libraries.ant_nodeps, + libraries.ant_trax, libraries.logback_classic, libraries.logback_core, libraries.slf4j_api, libraries.jul_to_slf4j, libraries.commons_io, libraries.commons_lang, - "commons-codec:commons-codec:1.2@jar", + "commons-codec:commons-codec:1.4@jar", libraries.google_collections, - "commons-collections:commons-collections:3.2.1@jar", - "slide:webdavlib:2.0@jar", - "org.apache.maven:maven-ant-tasks:2.1.1@jar", + "commons-collections:commons-collections3:3.2.1@jar", + "org.apache.maven:maven-ant-tasks:2.0.10@jar", libraries.asm_all, - 'org.fusesource.jansi:jansi:1.2.1', - 'org.jruby.ext.posix:jna-posix:1.0.3', - 'org.sonatype.pmaven:pmaven-common:0.8-20100325@jar', - 'org.sonatype.pmaven:pmaven-groovy:0.8-20100325@jar', - 'org.codehaus.plexus:plexus-component-annotations:1.5.2' - - runtime 'net.java.dev.jna:jna:3.2.2' + 'org.fusesource.jansi:jansi:1.4', + 'org.jruby.ext.posix:jna-posix:1.0.1', + 'org.codehaus.plexus:plexus-component-annotations:1.0-beta-3.0.7', + 'org.codehaus.plexus:plexus-component-api:1.0-alpha-22', + 'org.apache.maven:maven-model:2.2.1', + 'org.apache.maven:maven-settings:2.2.1', + 'org.apache.maven:maven-project:2.2.1', + 'org.apache.maven:maven-artifact:2.2.1', + 'org.apache.maven:maven-artifact-manager:2.2.1', + 'org.apache.maven:maven-settings:2.2.1', + 'org.apache.maven.wagon:wagon-provider-api:1.0-beta-6' + + runtime 'net.java.dev.jna:jna:3.2.4' runtime libraries.log4j_to_slf4j, libraries.jcl_to_slf4j diff --git a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java index d0b8461..3a498b6 100644 --- a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java +++ b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java @@ -60,7 +60,7 @@ public abstract class AbstractClassPathProvider implements ClassPathProvider, Gr protected static List<Pattern> toPatterns(String... patternStrings) { List<Pattern> patterns = new ArrayList<Pattern>(); for (String patternString : patternStrings) { - patterns.add(Pattern.compile(patternString + "-.+")); + patterns.add(Pattern.compile(patternString + "-?.*")); } return patterns; } diff --git a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java index 8c9ad18..ee50e93 100644 --- a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java +++ b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java @@ -19,9 +19,11 @@ import groovy.util.FactoryBuilderSupport; 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; +*/ import java.lang.reflect.Field; import java.util.Map; @@ -29,9 +31,11 @@ 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))); @@ -47,6 +51,8 @@ public class CustomModelBuilder extends ModelBuilder { 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) { @@ -78,4 +84,4 @@ public class CustomModelBuilder extends ModelBuilder { throw new RuntimeException(e); } } -} \ No newline at end of file +} diff --git a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java index 49b0f10..6a6cfbc 100644 --- a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java +++ b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java @@ -17,27 +17,31 @@ package org.gradle.api.internal.artifacts.publish.maven.pombuilder; 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; } -} \ No newline at end of file +} diff --git a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java index 26dbb71..0cabd69 100644 --- a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java +++ b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java @@ -98,4 +98,8 @@ public class PlexusLoggerAdapter implements Logger { public String getName() { return logger.getName(); } + + public void setThreshold(int level) { + throw new UnsupportedOperationException("setThreshold"); + } } diff --git a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java index d395a96..67ad723 100644 --- a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java +++ b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java @@ -17,7 +17,6 @@ package org.gradle.api.internal.artifacts.repositories; import org.apache.commons.httpclient.HttpsURL; import org.apache.ivy.plugins.repository.url.URLRepository; -import org.apache.webdav.lib.WebdavResource; import java.io.File; import java.io.IOException; @@ -52,9 +51,12 @@ public class WebdavRepository extends URLRepository { String destinationFileName = destination.substring(fileNameStart + 1); HttpsURL hrl = new HttpsURL(baseUrl); hrl.setUserinfo(user, userPassword); + /* WebdavResource wdr = new WebdavResource(hrl); wdr.putMethod(wdr.getPath() + '/' + destinationFileName, source); wdr.close(); + */ + throw new UnsupportedOperationException("put"); } // Alternative implementation with httpclient only. Unfortunately this is slower. diff --git a/subprojects/gradle-core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java b/subprojects/gradle-core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java index 97bc3dc..130ef61 100644 --- a/subprojects/gradle-core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java +++ b/subprojects/gradle-core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java @@ -135,7 +135,7 @@ public class Slf4jLoggingConfigurer implements LoggingConfigurer { levelFilter.setContext(lc); levelFilter.setOnMatch(onMatch); levelFilter.setOnMismatch(onMismatch); - levelFilter.setLevel(level); + levelFilter.setLevel(level.toString()); levelFilter.start(); return levelFilter; } diff --git a/subprojects/gradle-docs/docs.gradle b/subprojects/gradle-docs/docs.gradle index f38c369..3f40347 100644 --- a/subprojects/gradle-docs/docs.gradle +++ b/subprojects/gradle-docs/docs.gradle @@ -28,6 +28,7 @@ configurations { userGuideTask } +/* dependencies { ftpAntTask module("org.apache.ant:ant-commons-net:1.7.0") { module("commons-net:commons-net:1.4.1") { @@ -43,6 +44,7 @@ dependencies { userGuideStyleSheets 'docbook:docbook-xsl:1.75.2@zip' } +*/ RemoteLocations remoteLocations = new RemoteLocations(version: version) @@ -100,10 +102,10 @@ task userguideStyleSheets(type: Copy) { 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) { @@ -336,7 +338,8 @@ task userguide { } task docs { - dependsOn javadoc, groovydoc, userguide, distDocs, samplesDocs, dslHtml +// dependsOn javadoc, groovydoc, userguide, distDocs, samplesDocs, dslHtml + dependsOn javadoc, groovydoc description = 'Generates all documentation' group = 'documentation' } diff --git a/subprojects/gradle-jetty/jetty.gradle b/subprojects/gradle-jetty/jetty.gradle index 6b72d0c..36045b0 100644 --- a/subprojects/gradle-jetty/jetty.gradle +++ b/subprojects/gradle-jetty/jetty.gradle @@ -21,14 +21,12 @@ dependencies { compile libraries.slf4j_api, libraries.jetty_depends, - "org.mortbay.jetty:jetty-plus:6.1.25@jar" + "org.mortbay.jetty:jetty-plus:6.1.24@jar" - runtime "org.mortbay.jetty:jsp-api-2.1:6.1.14@jar", - "org.mortbay.jetty:jsp-2.1:6.1.14@jar", - "org.eclipse.jdt:core:3.1.1@jar", - "org.mortbay.jetty:jetty-naming:6.1.25@jar", - "org.mortbay.jetty:jetty-annotations:6.1.25@jar", - "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0@jar" + runtime "org.mortbay.jetty:jsp-api:2.1@jar", + "org.mortbay.jetty:jetty-naming:6.1.24@jar", + "org.mortbay.jetty:jetty-annotations:6.1.24@jar" +// "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0@jar" testCompile project(path: ':core', configuration: 'testFixtures') testRuntime project(path: ':core', configuration: 'testFixturesRuntime') diff --git a/subprojects/gradle-osgi/osgi.gradle b/subprojects/gradle-osgi/osgi.gradle index bd6713b..dd27cac 100644 --- a/subprojects/gradle-osgi/osgi.gradle +++ b/subprojects/gradle-osgi/osgi.gradle @@ -13,10 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -repositories { - mavenRepo urls: 'http://www.aQute.biz/repo' -} - dependencies { groovy libraries.groovy_depends @@ -24,7 +20,7 @@ dependencies { compile project(':plugins') compile libraries.slf4j_api - compile 'biz.aQute:bndlib:0.0.384@jar' + compile 'biz.aQute:bnd:0.0.384@jar' testCompile project(path: ':core', configuration: 'testFixtures') testRuntime project(path: ':core', configuration: 'testFixturesRuntime') diff --git a/subprojects/gradle-plugins/plugins.gradle b/subprojects/gradle-plugins/plugins.gradle index c8dda61..89fc04b 100644 --- a/subprojects/gradle-plugins/plugins.gradle +++ b/subprojects/gradle-plugins/plugins.gradle @@ -33,7 +33,7 @@ dependencies { // This is for the ant junit task. Without it, we get file locking problems with some jvms because the default // transformer does not close files - runtime 'xalan:xalan:2.7.1' + runtime 'xalan:xalan2:2.7.1' testCompile libraries.xmlunit diff --git a/subprojects/gradle-wrapper/wrapper.gradle b/subprojects/gradle-wrapper/wrapper.gradle index 9ca7d06..c162b8d 100644 --- a/subprojects/gradle-wrapper/wrapper.gradle +++ b/subprojects/gradle-wrapper/wrapper.gradle @@ -19,7 +19,7 @@ dependencies { groovy libraries.groovy_depends compile project(':core') - compile libraries.commons_io, libraries.ant, libraries.ant_nodeps + compile libraries.commons_io, libraries.ant, libraries.ant_nodeps, libraries.ant_trax testCompile project(path: ':core', configuration: 'testFixtures') testRuntime project(path: ':core', configuration: 'testFixturesRuntime') -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
