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 a2bb69080f6639e75949ba1154e840abc5cb4d65 Author: Miguel Landaeta <[email protected]> Date: Tue Nov 23 21:07:15 2010 -0430 prepare 0.9~rc3-1 release --- build.gradle | 60 +++-- buildSrc/build.gradle | 11 +- .../main/groovy/org/gradle/build/Version.groovy | 2 +- debian/bootstrap.sh | 4 +- debian/changelog | 4 +- debian/control | 22 +- debian/gradle.links | 1 + debian/orig-tar.sh | 6 +- debian/patches/01_use_debian_jars.diff | 258 ++++++++++----------- debian/patches/02_logback.diff | 10 +- debian/patches/05_polyglot_maven.diff | 35 ++- debian/patches/10_fix_version.diff | 12 +- debian/patches/21_docs.diff | 75 +++--- debian/patches/22_checkstyle.diff | 32 +++ debian/patches/series | 1 + debian/rules | 2 +- .../gradle-code-quality/code-quality.gradle | 6 +- subprojects/gradle-core/core.gradle | 30 ++- .../maven/pombuilder/CustomModelBuilder.java | 10 +- .../logging/internal/Slf4jLoggingConfigurer.java | 2 +- subprojects/gradle-docs/docs.gradle | 13 +- subprojects/gradle-jetty/jetty.gradle | 10 +- subprojects/gradle-plugins/plugins.gradle | 2 +- 23 files changed, 321 insertions(+), 287 deletions(-) diff --git a/build.gradle b/build.gradle index 3ef888f..c6034cc 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.5@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 @@ -241,7 +247,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 @@ -267,14 +273,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 @@ -384,7 +392,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' @@ -460,7 +469,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 } task wrapper(type: Wrapper, dependsOn: binZip) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index b8ada1f..05d3ca9 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -13,12 +13,17 @@ * 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' 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,10 +32,12 @@ dependencies { groovy localGroovy() } +/* 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') diff --git a/buildSrc/src/main/groovy/org/gradle/build/Version.groovy b/buildSrc/src/main/groovy/org/gradle/build/Version.groovy index 9fa1938..07b8d69 100644 --- a/buildSrc/src/main/groovy/org/gradle/build/Version.groovy +++ b/buildSrc/src/main/groovy/org/gradle/build/Version.groovy @@ -31,7 +31,7 @@ class Version { project.gradle.taskGraph.whenReady {graph -> if (!graph.hasTask(':releaseVersion')) { - this.versionNumber += "-" + getTimestamp() + //this.versionNumber += "-" + getTimestamp() release = false } else { release = true diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index dec089d..2115a7e 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-1-bin.zip"; +URL="http://dist.codehaus.org/gradle/gradle-0.9-rc-3-bin.zip"; ZIP="$(basename $URL)" DIR="$(echo $ZIP | sed 's/-bin\.zip$//')" -VERSION="0.9~rc1-0.1" +VERSION="0.9~rc3-0.1" wget $URL -O $ZIP unzip $ZIP diff --git a/debian/changelog b/debian/changelog index 516723f..0f1e524 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -gradle (0.9~rc1-1) UNRELEASED; urgency=low +gradle (0.9~rc3-1) UNRELEASED; urgency=low * Initial release. (Closes: #587832). - -- Miguel Landaeta <[email protected]> Tue, 23 Nov 2010 20:20:53 -0430 + -- Miguel Landaeta <[email protected]> Tue, 23 Nov 2010 19:07:15 -0430 diff --git a/debian/control b/debian/control index ca20adf..d0d0401 100644 --- a/debian/control +++ b/debian/control @@ -7,14 +7,15 @@ Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper, gradle, quilt, libgradle-code-quality-java, libgradle-eclipse-java, libgradle-idea-java, libgradle-wrapper-java, libgradle-scala-java, unzip, ant, ant-optional, libantlr-java, libasm3-java, libcommons-cli-java, libcommons-io-java, - libdom4j-java, libgoogle-collections-java (>= 1.0), groovy, ivy, libjaxen-java, - libjoptsimple-java, libslf4j-java, liblogback-java, junit4, libxmlunit-java, - libcommons-httpclient-java, libcommons-codec-java, 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 + libdom4j-java, libgoogle-collections-java (>= 1.0), groovy (>= 1.7.4), ivy, + libjaxen-java, libjoptsimple-java, libslf4j-java, liblogback-java, junit4, + libxmlunit-java, libcommons-httpclient-java, libcommons-codec-java, + 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 Standards-Version: 3.9.1 Homepage: http://gradle.org/ Vcs-Git: git://git.debian.org/git/pkg-java/gradle.git @@ -22,9 +23,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-java/gradle.git Package: gradle Architecture: all -Depends: default-jre-headless, groovy, ant, ant-optional, - libgradle-core-java (= ${binary:Version}), - libgradle-plugins-java (= ${binary:Version}), libantlr-java, libasm3-java, +Depends: default-jre-headless, groovy (>= 1.7.4), ant, ant-optional, + libgradle-core-java, libgradle-plugins-java, 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, diff --git a/debian/gradle.links b/debian/gradle.links index ccd0427..e1ef4e5 100644 --- a/debian/gradle.links +++ b/debian/gradle.links @@ -58,3 +58,4 @@ usr/share/java/jsp-api-2.1.jar usr/share/gradle/lib/plugins/js usr/share/java/junit4.jar usr/share/gradle/lib/plugins/junit4.jar usr/share/java/servlet-api-2.5.jar usr/share/gradle/lib/plugins/servlet-api-2.5.jar usr/share/java/testng.jar usr/share/gradle/lib/plugins/testng.jar +usr/share/java/xalan2.jar usr/share/gradle/lib/plugins/xalan2.jar diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 0b5db03..c0ad5a7 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -10,9 +10,9 @@ tarball=$3 TAR=${package}_${version}.orig.tar.gz DIR=${package}-${version}.orig -unzip $tarball -d $DIR +unzip $tarball GZIP=--best tar --numeric --group 0 --owner 0 -c -v -z -f $TAR \ - --anchored -X debian/orig-tar.excludes $DIR + --anchored -X debian/orig-tar.excludes ${package}-* -rm -rf $tarball $DIR +rm -rf $tarball $DIR ${package}-* diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff index 2889a21..7300c54 100644 --- a/debian/patches/01_use_debian_jars.diff +++ b/debian/patches/01_use_debian_jars.diff @@ -1,21 +1,19 @@ Description: Build Gradle using libraries available in Debian Author: Miguel Landaeta <[email protected]> Forwarded: not-needed -Last-Update: 2010-08-23 +Last-Update: 2010-11-23 -Index: b/build.gradle -=================================================================== ---- a/build.gradle 2010-08-22 16:17:01.000000000 -0430 -+++ b/build.gradle 2010-08-23 19:18:29.000000000 -0430 -@@ -17,6 +17,7 @@ - import java.text.SimpleDateFormat +--- gradle-0.9~rc3.orig/build.gradle ++++ gradle-0.9~rc3/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 - -@@ -41,35 +42,36 @@ +@@ -44,35 +45,36 @@ startScriptsDir = new File("$buildDir/st archivesBaseName = 'gradle' libraries = [ @@ -39,10 +37,9 @@ Index: b/build.gradle + 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.3@jar', -- ivy: 'org.apache.ivy:ivy:2.2.0-rc1@jar', +- groovy: 'org.codehaus.groovy:groovy-all:1.7.5@jar', +- ivy: 'org.apache.ivy:ivy:2.2.0@jar', - jaxen: 'jaxen:jaxen:1.1@jar', -- jopt_simple: 'net.sf.jopt-simple:jopt-simple:3.2@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', @@ -53,7 +50,6 @@ Index: b/build.gradle + 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', -+ jopt_simple: 'net.sf.jopt-simple:joptsimple:3.1@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', @@ -66,12 +62,14 @@ Index: b/build.gradle 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.22@jar", "org.mortbay.jetty:jetty-util:6.1.22@jar", +-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"] ++ "javax.servlet:servlet-api:2.5@jar"] allprojects { -@@ -81,7 +83,11 @@ + group = 'org.gradle' +@@ -83,7 +85,11 @@ allprojects { } repositories { @@ -84,88 +82,30 @@ Index: b/build.gradle } version = this.version -Index: b/subprojects/gradle-osgi/osgi.gradle -=================================================================== ---- a/subprojects/gradle-osgi/osgi.gradle 2010-08-22 16:17:01.000000000 -0430 -+++ b/subprojects/gradle-osgi/osgi.gradle 2010-08-23 19:18:29.000000000 -0430 -@@ -13,10 +13,6 @@ +--- gradle-0.9~rc3.orig/buildSrc/build.gradle ++++ gradle-0.9~rc3/buildSrc/build.gradle +@@ -13,12 +13,17 @@ * 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 @@ - 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') -Index: b/subprojects/gradle-wrapper/wrapper.gradle -=================================================================== ---- a/subprojects/gradle-wrapper/wrapper.gradle 2010-08-22 16:17:01.000000000 -0430 -+++ b/subprojects/gradle-wrapper/wrapper.gradle 2010-08-23 19:18:29.000000000 -0430 -@@ -19,7 +19,7 @@ - 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') -Index: b/subprojects/gradle-jetty/jetty.gradle -=================================================================== ---- a/subprojects/gradle-jetty/jetty.gradle 2010-08-22 16:17:01.000000000 -0430 -+++ b/subprojects/gradle-jetty/jetty.gradle 2010-08-23 19:18:29.000000000 -0430 -@@ -21,13 +21,11 @@ - - compile libraries.slf4j_api, - libraries.jetty_depends, -- "org.mortbay.jetty:jetty-plus:6.1.22@jar" -+ "org.mortbay.jetty:jetty-plus:6.1.24@jar" ++import org.apache.ivy.plugins.resolver.FileSystemResolver -- 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.22@jar", -- "org.mortbay.jetty:jetty-annotations:6.1.22@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" + apply plugin: 'groovy' + apply plugin: 'code-quality' - testCompile project(path: ':core', configuration: 'testFixtures') - testRuntime project(path: ':core', configuration: 'testFixturesRuntime') -Index: b/subprojects/gradle-code-quality/code-quality.gradle -=================================================================== ---- a/subprojects/gradle-code-quality/code-quality.gradle 2010-08-22 16:17:01.000000000 -0430 -+++ b/subprojects/gradle-code-quality/code-quality.gradle 2010-08-23 19:18:29.000000000 -0430 -@@ -23,10 +23,10 @@ - compile libraries.slf4j_api - - runtime libraries.log4j_to_slf4j, -- "org.gmetrics:GMetrics:0.2@jar" -+ "org.gmetrics:GMetrics:0.3@jar" + 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]" ++ } + } -- def BEAN_UTILS = ["commons-beanutils:commons-beanutils-core:1.7.0@jar", "commons-collections:commons-collections:2.0@jar", libraries.jcl_to_slf4j] -- runtime "checkstyle:checkstyle:5.1@jar", -+ def BEAN_UTILS = ["commons-beanutils:commons-beanutils:1.8.3@jar", "commons-collections:commons-collections:2.1.1@jar", libraries.jcl_to_slf4j] -+ runtime "checkstyle:checkstyle:4.4@jar", - libraries.antlr, - libraries.jcl_to_slf4j, - libraries.google_collections, -Index: b/subprojects/gradle-core/core.gradle -=================================================================== ---- a/subprojects/gradle-core/core.gradle 2010-08-22 16:17:01.000000000 -0430 -+++ b/subprojects/gradle-core/core.gradle 2010-08-23 19:18:29.000000000 -0430 -@@ -48,32 +48,41 @@ + dependencies { +--- gradle-0.9~rc3.orig/subprojects/gradle-core/core.gradle ++++ gradle-0.9~rc3/subprojects/gradle-core/core.gradle +@@ -36,31 +36,40 @@ configurations { dependencies { groovy libraries.groovy_depends @@ -174,8 +114,7 @@ Index: b/subprojects/gradle-core/core.gradle compile libraries.ivy, "com.jcraft:jsch:0.1.42@jar", 'com.jcraft:jzlib:1.0.7@jar' - compile libraries.jopt_simple, - libraries.ant, + compile libraries.ant, libraries.ant_nodeps, + libraries.ant_trax, libraries.logback_classic, @@ -190,7 +129,7 @@ Index: b/subprojects/gradle-core/core.gradle - "commons-collections:commons-collections:3.2.1@jar", + "commons-collections:commons-collections3:3.2.1@jar", "slide:webdavlib:2.0@jar", -- "org.apache.maven:maven-ant-tasks:2.1.0@jar", +- "org.apache.maven:maven-ant-tasks:2.1.1@jar", + "org.apache.maven:maven-ant-tasks:2.0.10@jar", libraries.asm_all, - 'org.fusesource.jansi:jansi:1.2.1', @@ -215,44 +154,9 @@ Index: b/subprojects/gradle-core/core.gradle runtime libraries.log4j_to_slf4j, libraries.jcl_to_slf4j -Index: b/buildSrc/build.gradle -=================================================================== ---- a/buildSrc/build.gradle 2010-08-22 16:17:01.000000000 -0430 -+++ b/buildSrc/build.gradle 2010-08-23 19:18:29.000000000 -0430 -@@ -13,20 +13,25 @@ - * 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' - - 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 { -- compile 'com.svnkit:svnkit:1.1.6', 'com.svnkit:svnkit-javahl:1.1.6' -+ compile 'com.svnkit:svnkit:1.3.3', 'com.svnkit:svnkit-javahl:1.3.3' - compile gradleApi() - // todo Actually it should be only groovy, but without junit we get a strange error. We need to understand this. - groovy localGroovy() -- testCompile "junit:junit:4.7" -+ testCompile "junit:junit4:4.8.2" - } - - checkstyleConfigDir = "$rootDir/../config/checkstyle" -Index: b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java -=================================================================== ---- a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java 2010-08-22 16:17:01.000000000 -0430 -+++ b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java 2010-08-23 19:18:29.000000000 -0430 -@@ -60,7 +60,7 @@ +--- 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 +@@ -60,7 +60,7 @@ public abstract class AbstractClassPathP protected static List<Pattern> toPatterns(String... patternStrings) { List<Pattern> patterns = new ArrayList<Pattern>(); for (String patternString : patternStrings) { @@ -261,3 +165,91 @@ Index: b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/Abstrac } return patterns; } +--- gradle-0.9~rc3.orig/subprojects/gradle-osgi/osgi.gradle ++++ gradle-0.9~rc3/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') +--- gradle-0.9~rc3.orig/subprojects/gradle-jetty/jetty.gradle ++++ gradle-0.9~rc3/subprojects/gradle-jetty/jetty.gradle +@@ -21,13 +21,11 @@ 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" ++ 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" + + 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 +@@ -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 +@@ -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", + 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') +--- gradle-0.9~rc3.orig/subprojects/gradle-wrapper/wrapper.gradle ++++ gradle-0.9~rc3/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') +--- gradle-0.9~rc3.orig/subprojects/gradle-plugins/plugins.gradle ++++ gradle-0.9~rc3/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/debian/patches/02_logback.diff b/debian/patches/02_logback.diff index 22ce699..0ebb62e 100644 --- a/debian/patches/02_logback.diff +++ b/debian/patches/02_logback.diff @@ -1,13 +1,11 @@ Description: Logback compatibility Author: Miguel Landaeta <[email protected]> Forwarded: no -Last-Update: 2010-08-23 +Last-Update: 2010-11-23 -Index: b/subprojects/gradle-core/src/main/groovy/org/gradle/logging/Slf4jLoggingConfigurer.java -=================================================================== ---- a/subprojects/gradle-core/src/main/groovy/org/gradle/logging/Slf4jLoggingConfigurer.java 2010-08-22 16:17:01.000000000 -0430 -+++ b/subprojects/gradle-core/src/main/groovy/org/gradle/logging/Slf4jLoggingConfigurer.java 2010-08-23 19:18:30.000000000 -0430 -@@ -156,7 +156,7 @@ +--- gradle-0.9~rc3.orig/subprojects/gradle-core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java ++++ gradle-0.9~rc3/subprojects/gradle-core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java +@@ -135,7 +135,7 @@ public class Slf4jLoggingConfigurer impl levelFilter.setContext(lc); levelFilter.setOnMatch(onMatch); levelFilter.setOnMismatch(onMismatch); diff --git a/debian/patches/05_polyglot_maven.diff b/debian/patches/05_polyglot_maven.diff index 1c9c840..f8b5ab6 100644 --- a/debian/patches/05_polyglot_maven.diff +++ b/debian/patches/05_polyglot_maven.diff @@ -2,13 +2,11 @@ Description: Disable Polyglot Maven features Polyglot Maven is not packaged in Debian yet. Author: Miguel Landaeta <[email protected]> Forwarded: not-needed -Last-Update: 2010-08-27 +Last-Update: 2010-11-23 -Index: b/subprojects/gradle-core/core.gradle -=================================================================== ---- a/subprojects/gradle-core/core.gradle 2010-08-23 16:18:30.000000000 -0430 -+++ b/subprojects/gradle-core/core.gradle 2010-08-23 16:18:31.000000000 -0430 -@@ -69,8 +69,6 @@ +--- gradle-0.9~rc3.orig/subprojects/gradle-core/core.gradle ++++ gradle-0.9~rc3/subprojects/gradle-core/core.gradle +@@ -56,8 +56,6 @@ dependencies { libraries.asm_all, 'org.fusesource.jansi:jansi:1.4', 'org.jruby.ext.posix:jna-posix:1.0.1', @@ -17,11 +15,9 @@ Index: b/subprojects/gradle-core/core.gradle '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', -Index: b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java -=================================================================== ---- a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java 2010-08-23 16:17:00.000000000 -0430 -+++ b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java 2010-08-23 16:18:31.000000000 -0430 -@@ -19,9 +19,11 @@ +--- gradle-0.9~rc3.orig/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java ++++ gradle-0.9~rc3/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; @@ -33,21 +29,20 @@ Index: b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifac import java.lang.reflect.Field; import java.util.Map; -@@ -29,10 +31,12 @@ +@@ -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 { - private Model model; public CustomModelBuilder(Model model) { + /* - this.model = model; ExecuteManager executeManager = new ExecuteManagerImpl(); setProp(executeManager.getClass(), executeManager, "log", -@@ -49,6 +53,8 @@ + new PlexusLoggerAdapter(LoggerFactory.getLogger(ExecuteManagerImpl.class))); +@@ -47,6 +51,8 @@ public class CustomModelBuilder extends factories.remove("project"); ModelFactory modelFactory = new ModelFactory(model); registerFactory(modelFactory.getName(), null, modelFactory); @@ -56,18 +51,16 @@ Index: b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifac } public static void setProp(Class c, Object obj, String fieldName, Object value) { -@@ -80,4 +86,4 @@ +@@ -78,4 +84,4 @@ public class CustomModelBuilder extends throw new RuntimeException(e); } } -} \ No newline at end of file +} -Index: b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java -=================================================================== ---- a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java 2010-08-23 16:17:00.000000000 -0430 -+++ b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java 2010-08-23 16:18:31.000000000 -0430 -@@ -17,27 +17,31 @@ +--- gradle-0.9~rc3.orig/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java ++++ gradle-0.9~rc3/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.artifact import groovy.util.FactoryBuilderSupport; import org.apache.maven.model.Model; diff --git a/debian/patches/10_fix_version.diff b/debian/patches/10_fix_version.diff index be41e74..f950a95 100644 --- a/debian/patches/10_fix_version.diff +++ b/debian/patches/10_fix_version.diff @@ -1,16 +1,14 @@ Description: Remove build timestamp from the version string Author: Miguel Landaeta <[email protected]> Forwarded: not-needed -Last-Update: 2010-08-23 +Last-Update: 2010-11-23 -Index: b/build.gradle -=================================================================== ---- a/build.gradle 2010-08-22 16:18:29.000000000 -0430 -+++ b/build.gradle 2010-08-23 19:18:31.000000000 -0430 -@@ -428,7 +428,7 @@ +--- 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(':release')) { + if (!graph.hasTask(':releaseVersion')) { - this.versionNumber += "-" + getTimestamp() + //this.versionNumber += "-" + getTimestamp() release = false diff --git a/debian/patches/21_docs.diff b/debian/patches/21_docs.diff index b02e4a4..64a5cde 100644 --- a/debian/patches/21_docs.diff +++ b/debian/patches/21_docs.diff @@ -3,11 +3,11 @@ Description: Generate javadocs and groovydocs only using DocBook and other libraries available in Debian. Author: Miguel Landaeta <[email protected]> Forwarded: not-needed -Last-Update: 2010-08-27 +Last-Update: 2010-11-23 ---- gradle-0.9~rc1.orig/build.gradle -+++ gradle-0.9~rc1/build.gradle -@@ -198,7 +198,7 @@ zipRootFolder = "$archivesBaseName-${-> +--- gradle-0.9~rc3.orig/build.gradle ++++ gradle-0.9~rc3/build.gradle +@@ -247,7 +247,7 @@ zipRootFolder = "$archivesBaseName-${-> binDistImage = copySpec { from 'src/toplevel' @@ -16,7 +16,7 @@ Last-Update: 2010-08-27 into('bin') { from startScriptsDir fileMode = 0755 -@@ -224,14 +224,16 @@ allDistImage = copySpec { +@@ -273,14 +273,16 @@ allDistImage = copySpec { } } @@ -35,39 +35,29 @@ Last-Update: 2010-08-27 classifier = 'bin' into(zipRootFolder) { with binDistImage -@@ -277,7 +279,8 @@ task intTestImage(type: Sync) { - } - } +@@ -390,7 +392,8 @@ def guessMaxForks() { --task integTest(type: Test, dependsOn: [intTestImage, binZip, allZip, srcZip, ':docs:userguideDocbook']) { -+//task integTest(type: Test, dependsOn: [intTestImage, binZip, allZip, srcZip, ':docs:userguideDocbook']) { -+task integTest(type: Test, dependsOn: [intTestImage, binZip, allZip, srcZip]) { - integTestUserDir = file('intTestHomeDir') - systemProperties['integTest.srcDir'] = file('src').absolutePath - systemProperties['integTest.userGuideInfoDir'] = project(':docs').docbookSrc -@@ -325,7 +328,8 @@ def guessMaxForks() { - - task testedDists(dependsOn: [assemble, check, integTest]) + 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') { - dependsOn binZip.taskDependencies -@@ -363,7 +367,8 @@ gradle.taskGraph.whenReady {graph -> - task developerBuild(dependsOn: [clean, testedDists]) - task ciBuild(dependsOn: [clean, testedDists]) + task install(type: Install) { + description = 'Installs the minimal distribution into directory $gradle_installPath' +@@ -466,7 +469,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 + } --task release(dependsOn: [uploadDists, ':docs:uploadDocs']) << { -+//task release(dependsOn: [uploadDists, ':docs:uploadDocs']) << { -+task release(dependsOn: [uploadDists]) << { - // Update the version properties in gradle.properties - // Properties props = new Properties() - // File propsFile = file('gradle.properties') ---- gradle-0.9~rc1.orig/subprojects/gradle-docs/docs.gradle -+++ gradle-0.9~rc1/subprojects/gradle-docs/docs.gradle -@@ -26,6 +26,7 @@ configurations { + 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 +@@ -28,6 +28,7 @@ configurations { userGuideTask } @@ -75,7 +65,7 @@ Last-Update: 2010-08-27 dependencies { ftpAntTask module("org.apache.ant:ant-commons-net:1.7.0") { module("commons-net:commons-net:1.4.1") { -@@ -41,6 +42,7 @@ dependencies { +@@ -43,6 +44,7 @@ dependencies { userGuideStyleSheets 'docbook:docbook-xsl:1.75.2@zip' } @@ -83,7 +73,7 @@ Last-Update: 2010-08-27 RemoteLocations remoteLocations = new RemoteLocations(version: version) -@@ -91,10 +93,11 @@ task userguideStyleSheets(type: Copy) { +@@ -98,10 +100,10 @@ task userguideStyleSheets(type: Copy) { from(cssSrcDir) { include '*.css' } @@ -91,7 +81,6 @@ Last-Update: 2010-08-27 - // 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\\.]+/', '') } @@ -99,13 +88,13 @@ Last-Update: 2010-08-27 } task samplesDocbook(type: AssembleSamplesDocTask) { -@@ -251,7 +254,8 @@ task websiteDocs(type: Docbook2Xhtml, de - - task userguide(dependsOn: [userguideHtml, userguideSingleHtml, userguidePdf], description: 'Generates the userguide') - --task docs(dependsOn: [javadoc, groovydoc, userguide, distDocs, samplesDocs]) -+//task docs(dependsOn: [javadoc, groovydoc, userguide, distDocs, samplesDocs]) -+task docs(dependsOn: [javadoc, groovydoc]) +@@ -325,7 +327,8 @@ task userguide { + } - task uploadDocs(dependsOn: docs) << { - ftp(action: 'mkdir', remotedir: remoteLocations.docsRemoteDir) + 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/debian/patches/22_checkstyle.diff b/debian/patches/22_checkstyle.diff new file mode 100644 index 0000000..33f0b1e --- /dev/null +++ b/debian/patches/22_checkstyle.diff @@ -0,0 +1,32 @@ +Description: Disable checkstyle features + There is a conflict due to classpath issues with Checkstyle and ANTLR. + While I debug this problem, checkstyle checks over Gradle source code are not + performed. +Author: Miguel Landaeta <[email protected]> +Forwarded: no +Last-Update: 2010-11-23 + +--- gradle-0.9~rc3.orig/buildSrc/build.gradle ++++ gradle-0.9~rc3/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' + + repositories { + add(new FileSystemResolver()) { +@@ -32,10 +32,12 @@ dependencies { + groovy localGroovy() + } + ++/* + 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') diff --git a/debian/patches/series b/debian/patches/series index 2979159..9338e48 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 05_polyglot_maven.diff 10_fix_version.diff 21_docs.diff +22_checkstyle.diff diff --git a/debian/rules b/debian/rules index f036fee..10378eb 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ override_dh_auto_build: override_dh_auto_clean: dh_auto_clean -gradle clean -g $(CURDIR)/.gradlehome - -rm -rf .gradle buildSrc/.gradle buildSrc/build .gradlehome + -rm -rf .gradle buildSrc/.gradle buildSrc/build .gradlehome build override_dh_link: dh_link diff --git a/subprojects/gradle-code-quality/code-quality.gradle b/subprojects/gradle-code-quality/code-quality.gradle index 6b4f755..ff6ca8a 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 @@ -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", 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/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/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 343b7f6..b898da2 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) @@ -98,10 +100,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) { @@ -325,7 +327,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 d48c65f..352da06 100644 --- a/subprojects/gradle-jetty/jetty.gradle +++ b/subprojects/gradle-jetty/jetty.gradle @@ -21,13 +21,11 @@ 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" + 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" 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 -- 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
