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 59bdfdfb97a106e9fe51eebd9a401937a0becff4 Author: Miguel Landaeta <[email protected]> Date: Tue Mar 22 23:11:31 2011 -0430 prepare 0.9.2-1 release --- build.gradle | 52 +++++--- buildSrc/build.gradle | 21 ++- .../main/groovy/org/gradle/build/Version.groovy | 2 +- debian/bootstrap.sh | 4 +- debian/changelog | 10 ++ debian/control | 3 +- debian/copyright | 4 +- debian/gradle.install | 9 +- debian/libgradle-wrapper-java.jlibs | 2 +- debian/patches/01_use_debian_jars.diff | 142 +++++++++++---------- debian/patches/02_logback.diff | 4 +- debian/patches/03_plexus.diff | 6 +- debian/patches/04_webdavlib.diff | 8 +- debian/patches/05_polyglot_maven.diff | 12 +- debian/patches/21_docs.diff | 26 ++-- debian/patches/22_checkstyle.diff | 12 +- debian/rules | 8 +- debian/watch | 4 +- subprojects/code-quality/code-quality.gradle | 4 +- subprojects/core/core.gradle | 31 +++-- .../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/docs/docs.gradle | 13 +- subprojects/jetty/jetty.gradle | 12 +- subprojects/osgi/osgi.gradle | 6 +- subprojects/plugins/plugins.gradle | 2 +- subprojects/wrapper/wrapper.gradle | 2 +- 31 files changed, 245 insertions(+), 188 deletions(-) diff --git a/build.gradle b/build.gradle index a93198e..48a5497 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,28 +45,29 @@ 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', + groovy: 'org.codehaus.groovy:groovy-all:1.7.9@jar', ivy: 'org.apache.ivy:ivy:2.2.0@jar', - jaxen: 'jaxen:jaxen:1.1@jar', + jaxen: 'jaxen:jaxen:1.1.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', 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', + logback_classic: 'ch.qos.logback:logback-classic:0.9.28@jar', + logback_core: 'ch.qos.logback:logback-core:0.9.28@jar', + junit: 'junit:junit4:4.8.2', xmlunit: 'xmlunit:xmlunit:1.3', ] @@ -82,9 +84,9 @@ libraries.jmock = ['org.jmock:jmock:2.5.1@jar', 'org.objenesis:objenesis:1.2', 'cglib:cglib-nodep:2.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' @@ -95,7 +97,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 @@ -359,7 +365,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 @@ -385,14 +391,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 @@ -502,7 +510,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' @@ -577,7 +586,8 @@ task releaseArtifacts { task release { description = 'Builds, tests and uploads the release artifacts' group = 'release' - dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadArchives, uploadDists, ':docs:uploadDocs' + //dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadArchives, uploadDists, ':docs:uploadDocs' + dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadDists } task wrapper(type: Wrapper) { diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index f7e8b24..7706d03 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -13,14 +13,19 @@ * 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' apply plugin: 'eclipse' 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 { @@ -28,8 +33,14 @@ 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.5-groovy-1.7@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' + //testCompile 'org.spockframework:spock-core:0.5-groovy-1.7@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' } -apply from: '../gradle/compile.gradle' -apply from: '../gradle/codeQuality.gradle' +// All tests for this subproject are disabled because they depend on Spock +// Framework and that software is not available in Debian yet. +compileTestGroovy { + exclude '**' +} + +//apply from: '../gradle/compile.gradle' +//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 5631deb..5398bb1 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 76e2b0e..f0b4017 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -2,10 +2,10 @@ set -e -URL="http://gradle.artifactoryonline.com/gradle/distributions/gradle-0.9.1-bin.zip"; +URL="http://repo.gradle.org/gradle/distributions/gradle-0.9.2-bin.zip"; ZIP="$(basename $URL)" DIR="$(echo $ZIP | sed 's/-bin\.zip$//')" -VERSION="0.9.1-0bootstrap1" +VERSION="0.9.2-0bootstrap1" wget $URL -O $ZIP unzip $ZIP diff --git a/debian/changelog b/debian/changelog index 020feec..0a946e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +gradle (0.9.2-1) UNRELEASED; urgency=low + + * New upstream release. + * Refresh patches. + * Add Build-Depends on libgradle-maven-java. + * Update watch file. + * Update copyright dates. + + -- Miguel Landaeta <[email protected]> Tue, 22 Mar 2011 23:10:13 -0430 + gradle (0.9.1-1) experimental; urgency=low * Initial release. (Closes: #587832). diff --git a/debian/control b/debian/control index 477d503..04f8a23 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,8 @@ Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper, gradle, quilt, libplexus-containers-java, libmaven2-core-java, libplexus-component-api-java, libplexus-utils-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 + libservlet2.5-java, libjetty-java, libjetty-extra-java, libxalan2-java, + libgradle-maven-java Standards-Version: 3.9.1 Homepage: http://gradle.org/ Vcs-Git: git://git.debian.org/git/pkg-java/gradle.git diff --git a/debian/copyright b/debian/copyright index 0d2c8d4..edca866 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ The sources where downloaded from http://dist.codehaus.org/gradle/gradle-0.9-rc-1-src.zip. Files: * -Copyright: © 2007-2010, The original author or authors. +Copyright: © 2007-2011, The original author or authors. Authors: Hans Dockter (Founder and Project Lead), Steve Appling, Steven Devijver, @@ -19,7 +19,7 @@ License: Apache-2.0 /usr/share/common-licenses/Apache-2.0 on Debian systems. Files: debian/* -Copyright: © 2010-2011 Miguel Landaeta <[email protected]> +Copyright: © 2010-2011, Miguel Landaeta <[email protected]> License: Apache-2.0 The full text of the Apache 2.0 license is distributed in /usr/share/common-licenses/Apache-2.0 on Debian systems. diff --git a/debian/gradle.install b/debian/gradle.install index 9f12b80..83f6e53 100644 --- a/debian/gradle.install +++ b/debian/gradle.install @@ -1,5 +1,6 @@ -build/distributions/bin/gradle-*/bin/gradle usr/share/gradle/bin +build/distributions/bin/gradle-*/bin/gradle usr/share/gradle/bin -build/distributions/bin/gradle-*/lib/gradle-launcher-*.jar usr/share/gradle/lib -build/distributions/bin/gradle-*/lib/gradle-open-api-*.jar usr/share/gradle/lib -build/distributions/bin/gradle-*/lib/gradle-ui-*.jar usr/share/gradle/lib +build/distributions/bin/gradle-*/lib/gradle-launcher-*.jar usr/share/gradle/lib +build/distributions/bin/gradle-*/lib/gradle-open-api-*.jar usr/share/gradle/lib +build/distributions/bin/gradle-*/lib/gradle-tooling-api-*.jar usr/share/gradle/lib +build/distributions/bin/gradle-*/lib/gradle-ui-*.jar usr/share/gradle/lib diff --git a/debian/libgradle-wrapper-java.jlibs b/debian/libgradle-wrapper-java.jlibs index db57067..379fc06 100644 --- a/debian/libgradle-wrapper-java.jlibs +++ b/debian/libgradle-wrapper-java.jlibs @@ -1 +1 @@ -build/distributions/bin/gradle-*/lib/plugins/gradle-wrapper-*.jar +build/distributions/bin/gradle-*/lib/gradle-wrapper-*.jar diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff index 95332f6..944afc9 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: no -Last-Update: 2011-01-03 +Last-Update: 2011-03-22 ---- gradle-0.9.1.orig/build.gradle -+++ gradle-0.9.1/build.gradle +--- gradle-0.9.2.orig/build.gradle ++++ gradle-0.9.2/build.gradle @@ -16,6 +16,7 @@ import java.util.jar.Attributes @@ -13,7 +13,7 @@ Last-Update: 2011-01-03 import org.gradle.api.internal.artifacts.dependencies.DefaultSelfResolvingDependency import org.gradle.build.samples.WrapperProjectCreator -@@ -44,35 +45,36 @@ startScriptsDir = new File("$buildDir/st +@@ -44,28 +45,29 @@ startScriptsDir = new File("$buildDir/st archivesBaseName = 'gradle' libraries = [ @@ -38,38 +38,37 @@ Last-Update: 2011-01-03 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', ++ groovy: 'org.codehaus.groovy:groovy-all:1.7.9@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', ++ jaxen: 'jaxen:jaxen:1.1.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', + 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', ++ logback_classic: 'ch.qos.logback:logback-classic:0.9.28@jar', ++ logback_core: 'ch.qos.logback:logback-core:0.9.28@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'] +@@ -82,9 +84,9 @@ libraries.jmock = ['org.jmock:jmock:2.5. + 'org.objenesis:objenesis:1.2', + 'cglib:cglib-nodep:2.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", +-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", ++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 { +@@ -95,7 +97,11 @@ allprojects { } repositories { @@ -82,9 +81,9 @@ Last-Update: 2011-01-03 } version = this.version ---- gradle-0.9.1.orig/buildSrc/build.gradle -+++ gradle-0.9.1/buildSrc/build.gradle -@@ -13,13 +13,18 @@ +--- gradle-0.9.2.orig/buildSrc/build.gradle ++++ gradle-0.9.2/buildSrc/build.gradle +@@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ @@ -92,7 +91,8 @@ Last-Update: 2011-01-03 apply plugin: 'groovy' apply plugin: 'code-quality' - apply plugin: 'idea' +@@ -20,7 +21,11 @@ apply plugin: 'idea' + apply plugin: 'eclipse' repositories { - mavenRepo(urls: 'http://gradle.artifactoryonline.com/gradle/libs') @@ -104,29 +104,31 @@ Last-Update: 2011-01-03 } dependencies { -@@ -27,7 +32,13 @@ dependencies { +@@ -28,8 +33,14 @@ 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 '**' +- testCompile 'org.spockframework:spock-core:0.5-groovy-1.7@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' ++ //testCompile 'org.spockframework:spock-core:0.5-groovy-1.7@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2' } +-apply from: '../gradle/compile.gradle' ++// All tests for this subproject are disabled because they depend on Spock ++// Framework and that software is not available in Debian yet. ++compileTestGroovy { ++ exclude '**' ++} ++ ++//apply from: '../gradle/compile.gradle' apply from: '../gradle/codeQuality.gradle' ---- gradle-0.9.1.orig/subprojects/gradle-core/core.gradle -+++ gradle-0.9.1/subprojects/gradle-core/core.gradle +--- gradle-0.9.2.orig/subprojects/core/core.gradle ++++ gradle-0.9.2/subprojects/core/core.gradle @@ -36,31 +36,41 @@ 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 "commons-httpclient:commons-httpclient:3.0@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' @@ -171,8 +173,8 @@ Last-Update: 2011-01-03 runtime libraries.log4j_to_slf4j, libraries.jcl_to_slf4j ---- gradle-0.9.1.orig/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java -+++ gradle-0.9.1/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java +--- gradle-0.9.2.orig/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java ++++ gradle-0.9.2/subprojects/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>(); @@ -182,8 +184,19 @@ Last-Update: 2011-01-03 } return patterns; } ---- gradle-0.9.1.orig/subprojects/gradle-osgi/osgi.gradle -+++ gradle-0.9.1/subprojects/gradle-osgi/osgi.gradle +--- gradle-0.9.2.orig/subprojects/wrapper/wrapper.gradle ++++ gradle-0.9.2/subprojects/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.2.orig/subprojects/osgi/osgi.gradle ++++ gradle-0.9.2/subprojects/osgi/osgi.gradle @@ -13,10 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. @@ -204,8 +217,19 @@ Last-Update: 2011-01-03 testCompile project(path: ':core', configuration: 'testFixtures') testRuntime project(path: ':core', configuration: 'testFixturesRuntime') ---- gradle-0.9.1.orig/subprojects/gradle-jetty/jetty.gradle -+++ gradle-0.9.1/subprojects/gradle-jetty/jetty.gradle +--- gradle-0.9.2.orig/subprojects/plugins/plugins.gradle ++++ gradle-0.9.2/subprojects/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 + +--- gradle-0.9.2.orig/subprojects/jetty/jetty.gradle ++++ gradle-0.9.2/subprojects/jetty/jetty.gradle @@ -21,14 +21,12 @@ dependencies { compile libraries.slf4j_api, @@ -226,14 +250,14 @@ Last-Update: 2011-01-03 testCompile project(path: ':core', configuration: 'testFixtures') testRuntime project(path: ':core', configuration: 'testFixturesRuntime') ---- gradle-0.9.1.orig/subprojects/gradle-code-quality/code-quality.gradle -+++ gradle-0.9.1/subprojects/gradle-code-quality/code-quality.gradle +--- gradle-0.9.2.orig/subprojects/code-quality/code-quality.gradle ++++ gradle-0.9.2/subprojects/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 "org.codenarc:CodeNarc:0.12@jar" ++ compile "org.codenarc:CodeNarc:0.11@jar" compile libraries.slf4j_api // CodeNarc dependencies @@ -246,25 +270,3 @@ Last-Update: 2011-01-03 testCompile project(path: ':core', configuration: 'testFixtures') testRuntime project(path: ':core', configuration: 'testFixturesRuntime') ---- gradle-0.9.1.orig/subprojects/gradle-wrapper/wrapper.gradle -+++ gradle-0.9.1/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.1.orig/subprojects/gradle-plugins/plugins.gradle -+++ gradle-0.9.1/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 0ebb62e..37dbf8b 100644 --- a/debian/patches/02_logback.diff +++ b/debian/patches/02_logback.diff @@ -3,8 +3,8 @@ Author: Miguel Landaeta <[email protected]> Forwarded: no Last-Update: 2010-11-23 ---- 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 +--- gradle-0.9.2.orig/subprojects/core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java ++++ gradle-0.9.2/subprojects/core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java @@ -135,7 +135,7 @@ public class Slf4jLoggingConfigurer impl levelFilter.setContext(lc); levelFilter.setOnMatch(onMatch); diff --git a/debian/patches/03_plexus.diff b/debian/patches/03_plexus.diff index 15ebaf5..c2a93b6 100644 --- a/debian/patches/03_plexus.diff +++ b/debian/patches/03_plexus.diff @@ -3,10 +3,10 @@ Author: Miguel Landaeta <[email protected]> Forwarded: no Last-Update: 2010-08-23 -Index: b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java +Index: b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java =================================================================== ---- a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java 2010-08-22 16:17:01.000000000 -0430 -+++ b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java 2010-08-23 19:18:30.000000000 -0430 +--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java 2010-08-22 16:17:01.000000000 -0430 ++++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java 2010-08-23 19:18:30.000000000 -0430 @@ -98,4 +98,8 @@ public String getName() { return logger.getName(); diff --git a/debian/patches/04_webdavlib.diff b/debian/patches/04_webdavlib.diff index 584da85..6f2acad 100644 --- a/debian/patches/04_webdavlib.diff +++ b/debian/patches/04_webdavlib.diff @@ -6,8 +6,8 @@ Author: Miguel Landaeta <[email protected]> Forwarded: not-needed Last-Update: 2011-01-03 ---- gradle-0.9.1.orig/subprojects/gradle-core/core.gradle -+++ gradle-0.9.1/subprojects/gradle-core/core.gradle +--- gradle-0.9.1.orig/subprojects/core/core.gradle ++++ gradle-0.9.1/subprojects/core/core.gradle @@ -52,7 +52,6 @@ dependencies { "commons-codec:commons-codec:1.4@jar", libraries.google_collections, @@ -16,8 +16,8 @@ Last-Update: 2011-01-03 "org.apache.maven:maven-ant-tasks:2.0.10@jar", libraries.asm_all, 'org.fusesource.jansi:jansi:1.4', ---- gradle-0.9.1.orig/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java -+++ gradle-0.9.1/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java +--- gradle-0.9.1.orig/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java ++++ gradle-0.9.1/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java @@ -17,7 +17,6 @@ package org.gradle.api.internal.artifact import org.apache.commons.httpclient.HttpsURL; diff --git a/debian/patches/05_polyglot_maven.diff b/debian/patches/05_polyglot_maven.diff index 8aa76c3..7b3f2a4 100644 --- a/debian/patches/05_polyglot_maven.diff +++ b/debian/patches/05_polyglot_maven.diff @@ -4,8 +4,8 @@ Author: Miguel Landaeta <[email protected]> Forwarded: not-needed Last-Update: 2011-01-03 ---- gradle-0.9.1.orig/subprojects/gradle-core/core.gradle -+++ gradle-0.9.1/subprojects/gradle-core/core.gradle +--- gradle-0.9.1.orig/subprojects/core/core.gradle ++++ gradle-0.9.1/subprojects/core/core.gradle @@ -56,8 +56,6 @@ dependencies { libraries.asm_all, 'org.fusesource.jansi:jansi:1.4', @@ -15,8 +15,8 @@ Last-Update: 2011-01-03 'org.codehaus.plexus:plexus-component-annotations:1.0-beta-3.0.7', 'org.codehaus.plexus:plexus-component-api:1.0-alpha-22', 'org.codehaus.plexus:plexus-utils:1.5.15', ---- gradle-0.9.1.orig/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java -+++ gradle-0.9.1/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java +--- gradle-0.9.1.orig/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java ++++ gradle-0.9.1/subprojects/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; @@ -58,8 +58,8 @@ Last-Update: 2011-01-03 -} \ No newline at end of file +} ---- gradle-0.9.1.orig/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java -+++ gradle-0.9.1/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java +--- gradle-0.9.1.orig/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java ++++ gradle-0.9.1/subprojects/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; diff --git a/debian/patches/21_docs.diff b/debian/patches/21_docs.diff index 3b1003e..3adfc4c 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: no -Last-Update: 2010-01-04 +Last-Update: 2011-03-22 ---- gradle-0.9.1.orig/build.gradle -+++ gradle-0.9.1/build.gradle -@@ -232,7 +232,7 @@ zipRootFolder = "$archivesBaseName-${-> +--- gradle-0.9.2.orig/build.gradle ++++ gradle-0.9.2/build.gradle +@@ -365,7 +365,7 @@ zipRootFolder = "$archivesBaseName-${-> binDistImage = copySpec { from 'src/toplevel' @@ -16,7 +16,7 @@ Last-Update: 2010-01-04 into('bin') { from startScriptsDir fileMode = 0755 -@@ -258,14 +258,16 @@ allDistImage = copySpec { +@@ -391,14 +391,16 @@ allDistImage = copySpec { } } @@ -35,7 +35,7 @@ Last-Update: 2010-01-04 classifier = 'bin' into(zipRootFolder) { with binDistImage -@@ -375,7 +377,8 @@ def guessMaxForks() { +@@ -508,7 +510,8 @@ def guessMaxForks() { task testedDists(dependsOn: [assemble, check, integTest, embeddedIntegTest, 'openApi:integTest', ':ui:integTest']) @@ -45,18 +45,18 @@ Last-Update: 2010-01-04 task install(type: Install) { description = 'Installs the minimal distribution into directory $gradle_installPath' -@@ -450,7 +453,8 @@ task releaseArtifacts { +@@ -583,7 +586,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, uploadArchives, uploadDists, ':docs:uploadDocs' ++ //dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadArchives, uploadDists, ':docs:uploadDocs' + dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadDists } task wrapper(type: Wrapper) { ---- gradle-0.9.1.orig/subprojects/gradle-docs/docs.gradle -+++ gradle-0.9.1/subprojects/gradle-docs/docs.gradle +--- gradle-0.9.2.orig/subprojects/docs/docs.gradle ++++ gradle-0.9.2/subprojects/docs/docs.gradle @@ -28,6 +28,7 @@ configurations { userGuideTask } @@ -88,12 +88,12 @@ Last-Update: 2010-01-04 } task samplesDocbook(type: AssembleSamplesDocTask) { -@@ -336,7 +338,8 @@ task userguide { +@@ -337,7 +339,8 @@ task userguide { } task docs { - dependsOn javadoc, groovydoc, userguide, distDocs, samplesDocs, dslHtml -+// 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 index 6a511f0..a5848fe 100644 --- a/debian/patches/22_checkstyle.diff +++ b/debian/patches/22_checkstyle.diff @@ -4,10 +4,10 @@ Description: Disable checkstyle features performed. Author: Miguel Landaeta <[email protected]> Forwarded: no -Last-Update: 2010-12-21 +Last-Update: 2011-03-22 ---- gradle-0.9.orig/buildSrc/build.gradle -+++ gradle-0.9/buildSrc/build.gradle +--- gradle-0.9.2.orig/buildSrc/build.gradle ++++ gradle-0.9.2/buildSrc/build.gradle @@ -16,7 +16,7 @@ import org.apache.ivy.plugins.resolver.FileSystemResolver @@ -15,11 +15,11 @@ Last-Update: 2010-12-21 -apply plugin: 'code-quality' +//apply plugin: 'code-quality' apply plugin: 'idea' + apply plugin: 'eclipse' - repositories { -@@ -41,4 +41,4 @@ compileTestGroovy { - exclude '**' +@@ -43,4 +43,4 @@ compileTestGroovy { } + //apply from: '../gradle/compile.gradle' -apply from: '../gradle/codeQuality.gradle' +//apply from: '../gradle/codeQuality.gradle' diff --git a/debian/rules b/debian/rules index 55a6a47..6ae80ba 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^Version: \(.\+\)-.\+$$/\1/') -JARS := announce antlr code-quality eclipse idea jetty maven osgi plugins scala wrapper +JARS := announce antlr code-quality eclipse idea jetty maven osgi plugins scala export JAVA_HOME=/usr/lib/jvm/default-java %: @@ -26,9 +26,11 @@ override_dh_link: for j in $(JARS); do \ ln -s ../../../java/gradle-$$j.jar gradle-$$j-$(VERSION).jar; \ done ; - # core jar symlink + # core and wrapper jars symlinks cd debian/gradle/usr/share/gradle/lib && \ - ln -s ../../java/gradle-core.jar gradle-core-$(VERSION).jar + for j in core wrapper; do \ + ln -s ../../java/gradle-$$j.jar gradle-$$j-$(VERSION).jar; \ + done ; override_jh_depends: # jh_depends crashes when checking jar symlinks, should I file a bug? diff --git a/debian/watch b/debian/watch index 98d153f..d145489 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=3 -http://gradle.org/downloads.html \ -http://gradle.artifactoryonline.com/gradle/distributions/gradle-([\w\.-]+)-src.zip \ +http://repo.gradle.org/gradle/distributions/ \ +http://repo.gradle.org/gradle/distributions/gradle-([\w\.-]+)-src.zip debian debian/orig-tar.sh diff --git a/subprojects/code-quality/code-quality.gradle b/subprojects/code-quality/code-quality.gradle index b433c56..3bdf458 100644 --- a/subprojects/code-quality/code-quality.gradle +++ b/subprojects/code-quality/code-quality.gradle @@ -19,7 +19,7 @@ dependencies { compile project(':core') compile project(':plugins') - compile "org.codenarc:CodeNarc:0.12@jar" + compile "org.codenarc:CodeNarc:0.11@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/core/core.gradle b/subprojects/core/core.gradle index 7473e3c..83e0d2f 100644 --- a/subprojects/core/core.gradle +++ b/subprojects/core/core.gradle @@ -36,31 +36,38 @@ 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.0@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.codehaus.plexus:plexus-utils:1.5.15', + '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/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java index d0b8461..3a498b6 100644 --- a/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java +++ b/subprojects/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/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java index 8c9ad18..ee50e93 100644 --- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java +++ b/subprojects/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/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java index 49b0f10..6a6cfbc 100644 --- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java +++ b/subprojects/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/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java index 26dbb71..0cabd69 100644 --- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java +++ b/subprojects/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/core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java index d395a96..67ad723 100644 --- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java +++ b/subprojects/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/core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java b/subprojects/core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java index 97bc3dc..130ef61 100644 --- a/subprojects/core/src/main/groovy/org/gradle/logging/internal/Slf4jLoggingConfigurer.java +++ b/subprojects/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/docs/docs.gradle b/subprojects/docs/docs.gradle index a4a86d9..0b4651f 100644 --- a/subprojects/docs/docs.gradle +++ b/subprojects/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) { @@ -337,7 +339,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/jetty/jetty.gradle b/subprojects/jetty/jetty.gradle index 6b72d0c..36045b0 100644 --- a/subprojects/jetty/jetty.gradle +++ b/subprojects/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/osgi/osgi.gradle b/subprojects/osgi/osgi.gradle index bd6713b..dd27cac 100644 --- a/subprojects/osgi/osgi.gradle +++ b/subprojects/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/plugins/plugins.gradle b/subprojects/plugins/plugins.gradle index c8dda61..89fc04b 100644 --- a/subprojects/plugins/plugins.gradle +++ b/subprojects/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/wrapper/wrapper.gradle b/subprojects/wrapper/wrapper.gradle index eefd65e..83315d2 100644 --- a/subprojects/wrapper/wrapper.gradle +++ b/subprojects/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
