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 ce6eaf3a8f2f82cf519c9f75ab4fc71dbf313d94 Author: Miguel Landaeta <[email protected]> Date: Mon Nov 22 20:40:44 2010 -0430 initial debianization --- build.gradle | 65 ++--- buildSrc/build.gradle | 11 +- debian/bootstrap.sh | 41 ++++ debian/changelog | 5 + debian/compat | 1 + debian/control | 259 ++++++++++++++++++++ debian/copyright | 25 ++ debian/gradle-doc.docs | 1 + debian/gradle.install | 5 + debian/gradle.links | 60 +++++ debian/gradle.manpages | 1 + debian/gradle.pod | 137 +++++++++++ debian/gradle.sed | 4 + debian/libgradle-announce-java.jlibs | 1 + debian/libgradle-antlr-java.jlibs | 1 + debian/libgradle-code-quality-java.jlibs | 1 + debian/libgradle-core-java.jlibs | 1 + debian/libgradle-eclipse-java.jlibs | 1 + debian/libgradle-idea-java.jlibs | 1 + debian/libgradle-jetty-java.jlibs | 1 + debian/libgradle-maven-java.jlibs | 1 + debian/libgradle-osgi-java.jlibs | 1 + debian/libgradle-plugins-java.jlibs | 1 + debian/libgradle-scala-java.jlibs | 1 + debian/libgradle-wrapper-java.jlibs | 1 + debian/orig-tar.excludes | 3 + debian/orig-tar.sh | 18 ++ debian/patches/01_use_debian_jars.diff | 263 +++++++++++++++++++++ debian/patches/02_logback.diff | 18 ++ debian/patches/03_plexus.diff | 18 ++ debian/patches/04_webdavlib.diff | 45 ++++ debian/patches/05_polyglot_maven.diff | 106 +++++++++ debian/patches/10_fix_version.diff | 18 ++ debian/patches/21_docs.diff | 111 +++++++++ debian/patches/series | 7 + debian/rules | 57 +++++ debian/source/format | 1 + debian/watch | 5 + .../gradle-code-quality/code-quality.gradle | 6 +- subprojects/gradle-core/core.gradle | 30 ++- .../api/internal/AbstractClassPathProvider.java | 2 +- .../maven/pombuilder/CustomModelBuilder.java | 10 +- .../publish/maven/pombuilder/ModelFactory.java | 12 +- .../maven/pombuilder/PlexusLoggerAdapter.java | 4 + .../artifacts/repositories/WebdavRepository.java | 4 +- .../org/gradle/logging/Slf4jLoggingConfigurer.java | 2 +- subprojects/gradle-docs/docs.gradle | 14 +- subprojects/gradle-jetty/jetty.gradle | 10 +- subprojects/gradle-osgi/osgi.gradle | 6 +- subprojects/gradle-wrapper/wrapper.gradle | 2 +- 50 files changed, 1328 insertions(+), 71 deletions(-) diff --git a/build.gradle b/build.gradle index 9f8abf7..194bb23 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,7 @@ import java.text.SimpleDateFormat import java.util.jar.Attributes import org.gradle.api.artifacts.repositories.WebdavResolver +import org.apache.ivy.plugins.resolver.FileSystemResolver import org.gradle.build.samples.WrapperProjectCreator @@ -41,35 +42,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.3@jar', - ivy: 'org.apache.ivy:ivy:2.2.0-rc1@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', - 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', + 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', + 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.22@jar", "org.mortbay.jetty:jetty-util:6.1.22@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 { @@ -81,7 +83,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 @@ -192,7 +198,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 @@ -218,14 +224,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 @@ -271,7 +279,8 @@ task intTestImage(type: Sync) { } } -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 @@ -319,7 +328,8 @@ def guessMaxForks() { task testedDists(dependsOn: [assemble, check, 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 @@ -357,7 +367,8 @@ gradle.taskGraph.whenReady {graph -> task developerBuild(dependsOn: [clean, testedDists]) task ciBuild(dependsOn: [clean, testedDists]) -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') @@ -422,7 +433,7 @@ class Version { project.gradle.taskGraph.whenReady {graph -> if (!graph.hasTask(':release')) { - this.versionNumber += "-" + getTimestamp() + //this.versionNumber += "-" + getTimestamp() release = false } else { release = true diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index afc59b1..e5afff6 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -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" diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh new file mode 100755 index 0000000..dec089d --- /dev/null +++ b/debian/bootstrap.sh @@ -0,0 +1,41 @@ +#!/bin/sh + +set -e + +URL="http://dist.codehaus.org/gradle/gradle-0.9-rc-1-bin.zip"; +ZIP="$(basename $URL)" +DIR="$(echo $ZIP | sed 's/-bin\.zip$//')" +VERSION="0.9~rc1-0.1" + +wget $URL -O $ZIP +unzip $ZIP +mkdir -m 0755 -p $DIR/debian/usr/share/gradle $DIR/debian/usr/bin $DIR/debian/DEBIAN +chmod 0755 $DIR/debian $DIR/debian/usr $DIR/debian/usr/share +rsync -avP $DIR/bin $DIR/lib $DIR/debian/usr/share/gradle +rm $DIR/debian/usr/share/gradle/bin/gradle.bat +./debian/gradle.sed -i $DIR/debian/usr/share/gradle/bin/gradle +cd $DIR/debian/usr/bin && ln -s ../share/gradle/bin/gradle && cd $OLDPWD + +cat > $DIR/debian/DEBIAN/control <<EOF +Package: gradle +Version: $VERSION +Architecture: all +Maintainer: Debian Java Maintainers <[email protected]> +Depends: default-jre-headless +Section: java +Priority: optional +Homepage: http://gradle.org/ +Description: Groovy based build system + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + multi-project build support. It has a layer on top of Ivy + that provides a build-by-convention integration for Ivy. It + gives you always the choice between the flexibility of Ant + and the convenience of a build-by-convention behavior. +EOF + +fakeroot dpkg-deb --build $DIR/debian +mv $DIR/debian.deb ./gradle_${VERSION}_all.deb +echo -e "\n\n./gradle_${VERSION}_all.deb was built." + +rm -rf $DIR $ZIP diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..ec25da9 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +gradle (0.9~rc1-1) UNRELEASED; urgency=low + + * Initial release. (Closes: #587832). + + -- Miguel Landaeta <[email protected]> Mon, 22 Nov 2010 20:45:23 -0430 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..d4a2aaa --- /dev/null +++ b/debian/control @@ -0,0 +1,259 @@ +Source: gradle +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Miguel Landaeta <[email protected]> +Section: java +Priority: optional +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 +Standards-Version: 3.9.1 +Homepage: http://gradle.org/ +Vcs-Git: git://git.debian.org/git/pkg-java/gradle.git +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, + 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, 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, + ${misc:Depends} +Recommends: libgradle-announce-java, libgradle-antlr-java, + libgradle-code-quality-java, libgradle-eclipse-java, libgradle-idea-java, + libgradle-jetty-java, libgradle-maven-java, libgradle-osgi-java, + libgradle-scala-java, libgradle-wrapper-java +Description: Groovy based build system + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + multi-project build support. It has a layer on top of Ivy + that provides a build-by-convention integration for Ivy. It + gives you always the choice between the flexibility of Ant + and the convenience of a build-by-convention behavior. + +Package: libgradle-core-java +Architecture: all +Depends: liblogback-java, libgoogle-collections-java (>= 1.0), groovy, + libjoptsimple-java, libcommons-collections3-java, libcommons-httpclient-java, + libcommons-io-java, libcommons-lang-java, ivy, ant, libjansi-java, + libasm3-java, libslf4j-java, libmaven-ant-tasks-java, libmaven2-core-java, + libplexus-component-api-java, ${misc:Depends} +Recommends: gradle +Suggests: gradle-doc +Description: Groovy based build system - Core library + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + multi-project build support. It has a layer on top of Ivy + that provides a build-by-convention integration for Ivy. It + gives you always the choice between the flexibility of Ant + and the convenience of a build-by-convention behavior. + . + This package contains the Gradle Core API library. + +Package: libgradle-announce-java +Architecture: all +Depends: libgradle-core-java, ${misc:Depends} +Description: Groovy based build system - Announce plugin + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + multi-project build support. It has a layer on top of Ivy + that provides a build-by-convention integration for Ivy. It + gives you always the choice between the flexibility of Ant + and the convenience of a build-by-convention behavior. + . + This package contains the Gradle announce plugin and + enables you to publish messages on succeeded tasks to your favourite + platforms. It supports Twitter, Ubuntu Notify, Snarl and Growl. + +Package: libgradle-antlr-java +Architecture: all +Depends: libgradle-core-java, ${misc:Depends} +Suggests: antlr +Description: Groovy based build system - ANTLR plugin + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + multi-project build support. It has a layer on top of Ivy + that provides a build-by-convention integration for Ivy. It + gives you always the choice between the flexibility of Ant + and the convenience of a build-by-convention behavior. + . + This package contains the Gradle ANTLR plugin that extends the Java + plugin to add support for generating parsers using ANTLR. + +Package: libgradle-code-quality-java +Architecture: all +Depends: libgradle-core-java, ${misc:Depends} +Suggests: libcodenarc-groovy-java, checkstyle +Description: Groovy based build system - Code quality plugin + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + multi-project build support. It has a layer on top of Ivy + that provides a build-by-convention integration for Ivy. It + gives you always the choice between the flexibility of Ant + and the convenience of a build-by-convention behavior. + . + This package contains the Gradle code quality plugin that adds + tasks which perform code quality checks and generate reports from these + checks. The following tools are supported: CodeNarc and checkstyle. + +Package: libgradle-eclipse-java +Architecture: all +Depends: libgradle-core-java, ${misc:Depends} +Suggests: eclipse +Description: Groovy based build system - Eclipse plugin + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + multi-project build support. It has a layer on top of Ivy + that provides a build-by-convention integration for Ivy. It + gives you always the choice between the flexibility of Ant + and the convenience of a build-by-convention behavior. + . + This package contains the Gradle Eclipse plugin that generates + files that are used by Eclipse IDE, thus making it possible to import the + project into Eclipse (File - Import... - Existing Projects into Workspace). + Both external and project dependencies are considered. + +Package: libgradle-idea-java +Architecture: all +Depends: libgradle-core-java, ${misc:Depends} +Description: Groovy based build system - IDEA plugin + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + multi-project build support. It has a layer on top of Ivy + that provides a build-by-convention integration for Ivy. It + gives you always the choice between the flexibility of Ant + and the convenience of a build-by-convention behavior. + . + This package contains the Gradle IDEA plugin that generates files + that are used by IntelliJ Idea IDE, thus making it possible to open the + project from Idea (File - Open Project). Both external (including associated + source and javadoc files) and project dependencies are considered. + +Package: libgradle-jetty-java +Architecture: all +Depends: libgradle-core-java, ${misc:Depends} +Suggests: libjetty-java +Description: Groovy based build system - Jetty plugin + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + multi-project build support. It has a layer on top of Ivy + that provides a build-by-convention integration for Ivy. It + gives you always the choice between the flexibility of Ant + and the convenience of a build-by-convention behavior. + . + This package contains the Gradle Jetty plugin that extends the + War plugin to add tasks which allow you to deploy your web application + to a Jetty web container embedded in the build. + +Package: libgradle-maven-java +Architecture: all +Depends: libgradle-core-java, ${misc:Depends} +Suggests: maven2 +Description: Groovy based build system - Maven plugin + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + multi-project build support. It has a layer on top of Ivy + that provides a build-by-convention integration for Ivy. It + gives you always the choice between the flexibility of Ant + and the convenience of a build-by-convention behavior. + . + This package contains the Gradle Maven plugin. With Gradle you can deploy + to remote Maven repositories or install to your local Maven repository. This + includes all Maven metadata manipulation and works also for Maven snapshots. + +Package: libgradle-osgi-java +Architecture: all +Depends: libgradle-core-java, ${misc:Depends} +Suggests: bnd +Description: Groovy based build system - OSGi plugin + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + multi-project build support. It has a layer on top of Ivy + that provides a build-by-convention integration for Ivy. It + gives you always the choice between the flexibility of Ant + and the convenience of a build-by-convention behavior. + . + This package contains the Gradle OSGi plugin. If the Java plugins is + applied, the OSGi plugin replaces the manifest object of the default jar + with an OsgiManifest object. The replaced manifest is merged into the new + one. The OSGi plugin makes heavy use of Peter Kriens BND tool. + +Package: libgradle-plugins-java +Architecture: all +Depends: libgradle-core-java, ${misc:Depends} +Description: Groovy based build system - Core plugins + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + multi-project build support. It has a layer on top of Ivy + that provides a build-by-convention integration for Ivy. It + gives you always the choice between the flexibility of Ant + and the convenience of a build-by-convention behavior. + . + This package contains the Gradle core plugins. + +Package: libgradle-scala-java +Architecture: all +Depends: libgradle-core-java, ${misc:Depends} +Suggests: scala +Description: Groovy based build system - Scala plugin + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + multi-project build support. It has a layer on top of Ivy + that provides a build-by-convention integration for Ivy. It + gives you always the choice between the flexibility of Ant + and the convenience of a build-by-convention behavior. + . + This package contains the Gradle Scala plugin that extends the + Java Plugin to add support for Scala projects. It can deal with Scala-only + projects and with mixed Java/Scala projects. It can even deal with Java-only + projects. The Scala plugin supports joint compilation of Java and Scala + source. This means your project can contain Scala classes which use Java + classes, and vice versa. + +Package: libgradle-wrapper-java +Architecture: all +Depends: libgradle-core-java, ${misc:Depends} +Description: Groovy based build system - Wrapper plugin + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + multi-project build support. It has a layer on top of Ivy + that provides a build-by-convention integration for Ivy. It + gives you always the choice between the flexibility of Ant + and the convenience of a build-by-convention behavior. + . + This package contains the Gradle Wrapper plugin that provides tasks + that can download the gradle source distribution or check out Gradle from + SVN. This is useful in those cases when Gradle is needed to build + a project, but Gradle is not installed. + +Package: gradle-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Recommends: libgradle-core-java +Suggests: default-jdk-doc, groovy-doc +Description: Documentation for gradle + Documentation for the Gradle core library. + . + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + multi-project build support. It has a layer on top of Ivy + that provides a build-by-convention integration for Ivy. It + gives you always the choice between the flexibility of Ant + and the convenience of a build-by-convention behavior. + . + This package contains the Gradle Core API javadocs. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..fcbb53a --- /dev/null +++ b/debian/copyright @@ -0,0 +1,25 @@ +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. +Authors: Hans Dockter (Founder and Project Lead), + Steve Appling, + Steven Devijver, + Tom Eyckmans, + Adam Murdoch, + Russel Winder +Contributors: Franke Henze, + Stefan Groschupf, + Dierk König, + Ken Krugler, + Guillaume Laforge +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. + +Files: debian/* +Copyright: © 2010 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-doc.docs b/debian/gradle-doc.docs new file mode 100644 index 0000000..802d9f2 --- /dev/null +++ b/debian/gradle-doc.docs @@ -0,0 +1 @@ +build/distributions/all/gradle-*/docs/groovydoc diff --git a/debian/gradle.install b/debian/gradle.install new file mode 100644 index 0000000..9f12b80 --- /dev/null +++ b/debian/gradle.install @@ -0,0 +1,5 @@ +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 diff --git a/debian/gradle.links b/debian/gradle.links new file mode 100644 index 0000000..ccd0427 --- /dev/null +++ b/debian/gradle.links @@ -0,0 +1,60 @@ +usr/share/gradle/bin/gradle usr/bin/gradle + +usr/share/java/ant.jar usr/share/gradle/lib/ant.jar +usr/share/java/ant-launcher.jar usr/share/gradle/lib/ant-launcher.jar +usr/share/java/ant-nodeps.jar usr/share/gradle/lib/ant-nodeps.jar +usr/share/java/ant-trax.jar usr/share/gradle/lib/ant-trax.jar +usr/share/java/asm3-all.jar usr/share/gradle/lib/asm3-all.jar +usr/share/java/commons-cli.jar usr/share/gradle/lib/commons-cli.jar +usr/share/java/commons-codec.jar usr/share/gradle/lib/commons-codec.jar +usr/share/java/commons-collections3.jar usr/share/gradle/lib/commons-collections3.jar +usr/share/java/commons-httpclient.jar usr/share/gradle/lib/commons-httpclient.jar +usr/share/java/commons-io.jar usr/share/gradle/lib/commons-io.jar +usr/share/java/commons-lang.jar usr/share/gradle/lib/commons-lang.jar +usr/share/java/dom4j.jar usr/share/gradle/lib/dom4j.jar +usr/share/java/google-collections.jar usr/share/gradle/lib/google-collections.jar +usr/share/java/groovy-all.jar usr/share/gradle/lib/groovy-all.jar +usr/share/java/ivy.jar usr/share/gradle/lib/ivy.jar +usr/share/java/jansi.jar usr/share/gradle/lib/jansi.jar +usr/share/java/jaxen.jar usr/share/gradle/lib/jaxen.jar +usr/share/java/jcl-over-slf4j.jar usr/share/gradle/lib/jcl-over-slf4j.jar +usr/share/java/jna.jar usr/share/gradle/lib/jna.jar +usr/share/java/jna-posix.jar usr/share/gradle/lib/jna-posix.jar +usr/share/java/joptsimple.jar usr/share/gradle/lib/joptsimple.jar +usr/share/java/jsch.jar usr/share/gradle/lib/jsch.jar +usr/share/java/jul-to-slf4j.jar usr/share/gradle/lib/jul-to-slf4j.jar +usr/share/java/junit4.jar usr/share/gradle/lib/junit4.jar +usr/share/java/jzlib.jar usr/share/gradle/lib/jzlib.jar +usr/share/java/log4j-over-slf4j.jar usr/share/gradle/lib/log4j-over-slf4j.jar +usr/share/java/logback-classic.jar usr/share/gradle/lib/logback-classic.jar +usr/share/java/logback-core.jar usr/share/gradle/lib/logback-core.jar +usr/share/java/maven-ant-tasks.jar usr/share/gradle/lib/maven-ant-tasks.jar +usr/share/java/maven-artifact.jar usr/share/gradle/lib/maven-artifact.jar +usr/share/java/maven-artifact-manager.jar usr/share/gradle/lib/maven-artifact-manager.jar +usr/share/java/maven-model.jar usr/share/gradle/lib/maven-model.jar +usr/share/java/maven-project.jar usr/share/gradle/lib/maven-project.jar +usr/share/java/maven-settings.jar usr/share/gradle/lib/maven-settings.jar +usr/share/java/plexus-component-annotations.jar usr/share/gradle/lib/plexus-component-annotations.jar +usr/share/java/plexus-component-api.jar usr/share/gradle/lib/plexus-component-api.jar +usr/share/java/slf4j-api.jar usr/share/gradle/lib/slf4j-api.jar +usr/share/java/wagon-provider-api.jar usr/share/gradle/lib/wagon-provider-api.jar +usr/share/java/xmlunit.jar usr/share/gradle/lib/xmlunit.jar + +usr/share/java/ant-junit.jar usr/share/gradle/lib/plugins/ant-junit.jar +usr/share/java/ant-antlr.jar usr/share/gradle/lib/plugins/ant-antlr.jar +usr/share/java/antlr.jar usr/share/gradle/lib/plugins/antlr.jar +usr/share/java/bnd.jar usr/share/gradle/lib/plugins/bnd.jar +usr/share/java/checkstyle.jar usr/share/gradle/lib/plugins/checkstyle.jar +usr/share/java/commons-beanutils.jar usr/share/gradle/lib/commons-beanutils.jar +usr/share/java/commons-collections.jar usr/share/gradle/lib/commons-collections.jar +usr/share/java/CodeNarc.jar usr/share/gradle/lib/plugins/CodeNarc.jar +usr/share/java/GMetrics.jar usr/share/gradle/lib/plugins/GMetrics.jar +usr/share/java/jetty.jar usr/share/gradle/lib/plugins/jetty.jar +usr/share/java/jetty-annotations.jar usr/share/gradle/lib/plugins/jetty-annotations.jar +usr/share/java/jetty-naming.jar usr/share/gradle/lib/plugins/jetty-naming.jar +usr/share/java/jetty-plus.jar usr/share/gradle/lib/plugins/jetty-plus.jar +usr/share/java/jetty-util.jar usr/share/gradle/lib/plugins/jetty-util.jar +usr/share/java/jsp-api-2.1.jar usr/share/gradle/lib/plugins/jsp-api-2.1.jar +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 diff --git a/debian/gradle.manpages b/debian/gradle.manpages new file mode 100644 index 0000000..e5c4155 --- /dev/null +++ b/debian/gradle.manpages @@ -0,0 +1 @@ +build/gradle.1 diff --git a/debian/gradle.pod b/debian/gradle.pod new file mode 100644 index 0000000..44b387f --- /dev/null +++ b/debian/gradle.pod @@ -0,0 +1,137 @@ +=head1 NAME + +gradle - Groovy based build system + +=head1 SYNOPSIS + +gradle <target> [options] + +=head1 OVERVIEW + +Gradle is a build system written in Groovy. It uses Groovy +also as the language for its build scripts. It has a powerful +multi-project build support. It has a layer on top of Ivy +that provides a build-by-convention integration for Ivy. It +gives you always the choice between the flexibility of Ant +and the convenience of a build-by-convention behavior. + +For additional information, see http://gradle.org/documentation.html. + +=head1 OPTIONS + +=over 4 + +=item B<-?>, B<-h>, B<--help> + +Shows the help message. + +=item B<-A> I<task>[,...], B<--dep-tasks> I<task>[,...] + +Specify additional tasks for building project dependencies. + +=item B<-C> I<value>, B<--cache> I<value> + +Specifies how compiled build scripts should be cached. Possible values +are: 'rebuild' and 'on'. Default value is 'on'. + +=item B<-D>I<propertie=value>, B<--system-prop> I<propertie=value> + +Set system property of the JVM (e.g. -Dmyprop=myvalue). + +=item B<-I> I<script>, B<--init-script> I<script> + +Specifies an initialization script. + +=item B<-P>I<propertie=value>, B<--project-prop> I<propertie=value> + +Set project property for the build script (e.g. -Pmyprop=myvalue). + +=item B<-S>, B<--full-stacktrace> + +Print out the full (very verbose) stacktrace for any exceptions. + +=item B<-a>, B<--no-rebuild> + +Do not rebuild project dependencies. + +=item B<--all> + +Show additional details in the task listing. + +=item B<-b> I<file>, B<--build-file> I<file> + +Specifies the build file. + +=item B<-c> I<file>, B<--settings-file> I<file> + +Specifies the settings file. + +=item B<-d>, B<--debug> + +Log in debug mode (includes normal stacktrace). + +=item B<-e> I<file>, B<--embedded> I<file> + +Specify an embedded build script. + +=item B<-g> I<directory>, B<--gradle-user-home> I<directory> + +Specifies the gradle user home directory. + +=item B<--gui> + +Launches a GUI application + +=item B<-i> I<value>, B<--info> I<value> + +Set log level to info. + +=item B<-m>, B<--dry-run> + +Runs the builds with all task actions disabled. + +=item B<-n>, B<--dependencies> + +Show list of all project dependencies. + +=item B<--no-opt> + +Ignore any task optimization. + +=item B<-p> I<directory>, B<--project-dir> I<directory> + +Specifies the start directory for Gradle. Defaults to current directory. + +=item B<-q>, B<--quiet> + +Log errors only. + +=item B<-r>, B<--properties> + +Show list of all available project properties. + +=item B<-s>, B<--stacktrace> + +Print out the stacktrace also for user exceptions (e.g. compile error). + +=item B<-t>, B<--tasks> + +Show list of all available tasks. + +=item B<-u>, B<--no-search-upward> + +Don't search in parent folders for a settings.gradle file. + +=item B<-v>, B<--version> + +Print version info. + +=item B<-x> I<task>, B<--exclude-task> I<task> + +Specify a task to be excluded from execution. + +=back + +=head1 SEE ALSO + +http://gradle.org/userguide.html diff --git a/debian/gradle.sed b/debian/gradle.sed new file mode 100755 index 0000000..f30ba39 --- /dev/null +++ b/debian/gradle.sed @@ -0,0 +1,4 @@ +#!/bin/sed -f +/^# Attempt to set JAVA_HOME/ i\ +export JAVA_HOME=/usr/lib/jvm/default-java\ +export GRAILS_HOME=/usr/share/gradle\ diff --git a/debian/libgradle-announce-java.jlibs b/debian/libgradle-announce-java.jlibs new file mode 100644 index 0000000..95bd0b9 --- /dev/null +++ b/debian/libgradle-announce-java.jlibs @@ -0,0 +1 @@ +build/distributions/bin/gradle-*/lib/plugins/gradle-announce-*.jar diff --git a/debian/libgradle-antlr-java.jlibs b/debian/libgradle-antlr-java.jlibs new file mode 100644 index 0000000..eaa71b7 --- /dev/null +++ b/debian/libgradle-antlr-java.jlibs @@ -0,0 +1 @@ +build/distributions/bin/gradle-*/lib/plugins/gradle-antlr-*.jar diff --git a/debian/libgradle-code-quality-java.jlibs b/debian/libgradle-code-quality-java.jlibs new file mode 100644 index 0000000..0cf5e91 --- /dev/null +++ b/debian/libgradle-code-quality-java.jlibs @@ -0,0 +1 @@ +build/distributions/bin/gradle-*/lib/plugins/gradle-code-quality-*.jar diff --git a/debian/libgradle-core-java.jlibs b/debian/libgradle-core-java.jlibs new file mode 100644 index 0000000..d50323c --- /dev/null +++ b/debian/libgradle-core-java.jlibs @@ -0,0 +1 @@ +build/distributions/bin/gradle-*/lib/gradle-core-*.jar diff --git a/debian/libgradle-eclipse-java.jlibs b/debian/libgradle-eclipse-java.jlibs new file mode 100644 index 0000000..7f31cdc --- /dev/null +++ b/debian/libgradle-eclipse-java.jlibs @@ -0,0 +1 @@ +build/distributions/bin/gradle-*/lib/plugins/gradle-eclipse-*.jar diff --git a/debian/libgradle-idea-java.jlibs b/debian/libgradle-idea-java.jlibs new file mode 100644 index 0000000..79dc8ef --- /dev/null +++ b/debian/libgradle-idea-java.jlibs @@ -0,0 +1 @@ +build/distributions/bin/gradle-*/lib/plugins/gradle-idea-*.jar diff --git a/debian/libgradle-jetty-java.jlibs b/debian/libgradle-jetty-java.jlibs new file mode 100644 index 0000000..55ca1e4 --- /dev/null +++ b/debian/libgradle-jetty-java.jlibs @@ -0,0 +1 @@ +build/distributions/bin/gradle-*/lib/plugins/gradle-jetty-*.jar diff --git a/debian/libgradle-maven-java.jlibs b/debian/libgradle-maven-java.jlibs new file mode 100644 index 0000000..c3c9401 --- /dev/null +++ b/debian/libgradle-maven-java.jlibs @@ -0,0 +1 @@ +build/distributions/bin/gradle-*/lib/plugins/gradle-maven-*.jar diff --git a/debian/libgradle-osgi-java.jlibs b/debian/libgradle-osgi-java.jlibs new file mode 100644 index 0000000..b1ff47b --- /dev/null +++ b/debian/libgradle-osgi-java.jlibs @@ -0,0 +1 @@ +build/distributions/bin/gradle-*/lib/plugins/gradle-osgi-*.jar diff --git a/debian/libgradle-plugins-java.jlibs b/debian/libgradle-plugins-java.jlibs new file mode 100644 index 0000000..588ee8f --- /dev/null +++ b/debian/libgradle-plugins-java.jlibs @@ -0,0 +1 @@ +build/distributions/bin/gradle-*/lib/plugins/gradle-plugins-*.jar diff --git a/debian/libgradle-scala-java.jlibs b/debian/libgradle-scala-java.jlibs new file mode 100644 index 0000000..79acb67 --- /dev/null +++ b/debian/libgradle-scala-java.jlibs @@ -0,0 +1 @@ +build/distributions/bin/gradle-*/lib/plugins/gradle-scala-*.jar diff --git a/debian/libgradle-wrapper-java.jlibs b/debian/libgradle-wrapper-java.jlibs new file mode 100644 index 0000000..db57067 --- /dev/null +++ b/debian/libgradle-wrapper-java.jlibs @@ -0,0 +1 @@ +build/distributions/bin/gradle-*/lib/plugins/gradle-wrapper-*.jar diff --git a/debian/orig-tar.excludes b/debian/orig-tar.excludes new file mode 100644 index 0000000..10e1363 --- /dev/null +++ b/debian/orig-tar.excludes @@ -0,0 +1,3 @@ +*.zip +*.war +*.jar diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..0b5db03 --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +# called by uscan with '--upstream-version' <version> <file> +echo "version $2" +package=`dpkg-parsechangelog | sed -n 's/^Source: //p'` +version=$2 +tarball=$3 +TAR=${package}_${version}.orig.tar.gz +DIR=${package}-${version}.orig + +unzip $tarball -d $DIR + +GZIP=--best tar --numeric --group 0 --owner 0 -c -v -z -f $TAR \ + --anchored -X debian/orig-tar.excludes $DIR + +rm -rf $tarball $DIR diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff new file mode 100644 index 0000000..2889a21 --- /dev/null +++ b/debian/patches/01_use_debian_jars.diff @@ -0,0 +1,263 @@ +Description: Build Gradle using libraries available in Debian +Author: Miguel Landaeta <[email protected]> +Forwarded: not-needed +Last-Update: 2010-08-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 + import java.util.jar.Attributes + import org.gradle.api.artifacts.repositories.WebdavResolver ++import org.apache.ivy.plugins.resolver.FileSystemResolver + + import org.gradle.build.samples.WrapperProjectCreator + +@@ -41,35 +42,36 @@ + 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.3@jar', +- ivy: 'org.apache.ivy:ivy:2.2.0-rc1@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', +- 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', ++ 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', ++ 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.22@jar", "org.mortbay.jetty:jetty-util:6.1.22@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 { +@@ -81,7 +83,11 @@ + } + + 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 +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 @@ + * 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" + +- 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" + + 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" + +- 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 { + 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.jopt_simple, + 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", ++ "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.0.10@jar", + libraries.asm_all, +- 'org.fusesource.jansi:jansi:1.2.1', +- 'org.jruby.ext.posix:jna-posix:1.0.3', ++ 'org.fusesource.jansi:jansi:1.4', ++ 'org.jruby.ext.posix:jna-posix:1.0.1', + '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' ++ '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.2' ++ runtime 'net.java.dev.jna:jna:3.2.4' + + 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 @@ + 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/debian/patches/02_logback.diff b/debian/patches/02_logback.diff new file mode 100644 index 0000000..22ce699 --- /dev/null +++ b/debian/patches/02_logback.diff @@ -0,0 +1,18 @@ +Description: Logback compatibility +Author: Miguel Landaeta <[email protected]> +Forwarded: no +Last-Update: 2010-08-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 @@ + levelFilter.setContext(lc); + levelFilter.setOnMatch(onMatch); + levelFilter.setOnMismatch(onMismatch); +- levelFilter.setLevel(level); ++ levelFilter.setLevel(level.toString()); + levelFilter.start(); + return levelFilter; + } diff --git a/debian/patches/03_plexus.diff b/debian/patches/03_plexus.diff new file mode 100644 index 0000000..15ebaf5 --- /dev/null +++ b/debian/patches/03_plexus.diff @@ -0,0 +1,18 @@ +Description: Plexus compatibility +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 +=================================================================== +--- 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 +@@ -98,4 +98,8 @@ + public String getName() { + return logger.getName(); + } ++ ++ public void setThreshold(int level) { ++ throw new UnsupportedOperationException("setThreshold"); ++ } + } diff --git a/debian/patches/04_webdavlib.diff b/debian/patches/04_webdavlib.diff new file mode 100644 index 0000000..64190fd --- /dev/null +++ b/debian/patches/04_webdavlib.diff @@ -0,0 +1,45 @@ +Description: Disable Jakarta Slide WebDAV library + Jakarta Slide WebDAV library is not available in Debian, + and this project was retired by its upstream developers. + Please see http://jakarta.apache.org/slide/. +Author: Miguel Landaeta <[email protected]> +Forwarded: not-needed +Last-Update: 2010-08-23 + +Index: b/subprojects/gradle-core/core.gradle +=================================================================== +--- a/subprojects/gradle-core/core.gradle 2010-08-22 16:18:29.000000000 -0430 ++++ b/subprojects/gradle-core/core.gradle 2010-08-23 19:18:30.000000000 -0430 +@@ -65,7 +65,6 @@ + "commons-codec:commons-codec:1.4@jar", + libraries.google_collections, + "commons-collections:commons-collections3:3.2.1@jar", +- "slide:webdavlib:2.0@jar", + "org.apache.maven:maven-ant-tasks:2.0.10@jar", + libraries.asm_all, + 'org.fusesource.jansi:jansi:1.4', +Index: b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java +=================================================================== +--- a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java 2010-08-22 16:17:01.000000000 -0430 ++++ b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java 2010-08-26 19:18:30.000000000 -0430 +@@ -17,7 +17,6 @@ + + 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 @@ + 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/debian/patches/05_polyglot_maven.diff b/debian/patches/05_polyglot_maven.diff new file mode 100644 index 0000000..1c9c840 --- /dev/null +++ b/debian/patches/05_polyglot_maven.diff @@ -0,0 +1,106 @@ +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 + +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 @@ + libraries.asm_all, + 'org.fusesource.jansi:jansi:1.4', + 'org.jruby.ext.posix:jna-posix:1.0.1', +- '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.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 @@ + 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,10 +31,12 @@ + /** + * 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 @@ + 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) { +@@ -80,4 +86,4 @@ + 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 @@ + + 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/debian/patches/10_fix_version.diff b/debian/patches/10_fix_version.diff new file mode 100644 index 0000000..be41e74 --- /dev/null +++ b/debian/patches/10_fix_version.diff @@ -0,0 +1,18 @@ +Description: Remove build timestamp from the version string +Author: Miguel Landaeta <[email protected]> +Forwarded: not-needed +Last-Update: 2010-08-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 @@ + + project.gradle.taskGraph.whenReady {graph -> + if (!graph.hasTask(':release')) { +- this.versionNumber += "-" + getTimestamp() ++ //this.versionNumber += "-" + getTimestamp() + release = false + } else { + release = true diff --git a/debian/patches/21_docs.diff b/debian/patches/21_docs.diff new file mode 100644 index 0000000..b02e4a4 --- /dev/null +++ b/debian/patches/21_docs.diff @@ -0,0 +1,111 @@ +Description: Generate javadocs and groovydocs only + I still have to figure out how to build the rest of the documentation + using DocBook and other libraries available in Debian. +Author: Miguel Landaeta <[email protected]> +Forwarded: not-needed +Last-Update: 2010-08-27 + +--- gradle-0.9~rc1.orig/build.gradle ++++ gradle-0.9~rc1/build.gradle +@@ -198,7 +198,7 @@ zipRootFolder = "$archivesBaseName-${-> + + binDistImage = copySpec { + from 'src/toplevel' +- from project(':docs').distDocs.destFile ++ //from project(':docs').distDocs.destFile + into('bin') { + from startScriptsDir + fileMode = 0755 +@@ -224,14 +224,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 +@@ -277,7 +279,8 @@ task intTestImage(type: Sync) { + } + } + +-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 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 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 { + userGuideTask + } + ++/* + 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 { + + userGuideStyleSheets 'docbook:docbook-xsl:1.75.2@zip' + } ++*/ + + RemoteLocations remoteLocations = new RemoteLocations(version: version) + +@@ -91,10 +93,11 @@ 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) { +@@ -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]) + + task uploadDocs(dependsOn: docs) << { + ftp(action: 'mkdir', remotedir: remoteLocations.docsRemoteDir) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..2979159 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,7 @@ +01_use_debian_jars.diff +02_logback.diff +03_plexus.diff +04_webdavlib.diff +05_polyglot_maven.diff +10_fix_version.diff +21_docs.diff diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..f036fee --- /dev/null +++ b/debian/rules @@ -0,0 +1,57 @@ +#!/usr/bin/make -f + +VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^Version: \(.\+\)-.\+$$/\1/') +UPSTREAM_VERSION := $(shell echo $(VERSION) | sed 's/~rc/-rc-/') +JARS := announce antlr code-quality eclipse idea jetty maven osgi plugins scala wrapper +export JAVA_HOME=/usr/lib/jvm/default-java + +%: + dh --with javahelper $@ + +override_dh_auto_build: + gradle assemble -g $(CURDIR)/.gradlehome + unzip build/distributions/gradle-*-bin.zip -d build/distributions/bin + unzip build/distributions/gradle-*-all.zip -d build/distributions/all + pod2man -c '' -r '' debian/gradle.pod > build/gradle.1 + ./debian/gradle.sed -i build/distributions/bin/gradle-*/bin/gradle + +override_dh_auto_clean: + dh_auto_clean + -gradle clean -g $(CURDIR)/.gradlehome + -rm -rf .gradle buildSrc/.gradle buildSrc/build .gradlehome + +override_dh_link: + dh_link + # plugins symlinks + cd debian/gradle/usr/share/gradle/lib/plugins && \ + for j in $(JARS); do \ + ln -s ../../../java/gradle-$$j.jar gradle-$$j-$(UPSTREAM_VERSION).jar; \ + done ; + # core jar symlink + cd debian/gradle/usr/share/gradle/lib && \ + ln -s ../../java/gradle-core.jar gradle-core-$(UPSTREAM_VERSION).jar + +override_jh_depends: + # jh_depends crashes when checking jar symlinks, should I file a bug? + +override_jh_installlibs: + jh_installlibs --upstream-version=$(UPSTREAM_VERSION) + +override_jh_installjavadoc: + jh_installjavadoc -pgradle-doc build/distributions/all/gradle-$(UPSTREAM_VERSION)/docs/javadoc + +get-orig-source: + cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ + uscan \ + --verbose \ + --no-symlink \ + --destdir $(CURDIR) \ + --watchfile debian/watch \ + --force-download + +# since gradle build-depends on itself, a way to generate a deb from upstream +# binary distribution is provided with this target. With the resulting .deb, +# gradle can be rebuilt from source. +bootstrap: + cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ + ./debian/bootstrap.sh diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..6faf6da --- /dev/null +++ b/debian/watch @@ -0,0 +1,5 @@ +version=3 +opts=uversionmangle=s/-rc-([0-9])+/~rc$1/ \ +http://gradle.org/downloads.html \ +http://dist.codehaus.org/gradle/gradle-([\w\.-]+)-src\.zip \ +debian debian/orig-tar.sh diff --git a/subprojects/gradle-code-quality/code-quality.gradle b/subprojects/gradle-code-quality/code-quality.gradle index 591e09d..5ec8aa8 100644 --- a/subprojects/gradle-code-quality/code-quality.gradle +++ b/subprojects/gradle-code-quality/code-quality.gradle @@ -23,10 +23,10 @@ dependencies { compile libraries.slf4j_api runtime libraries.log4j_to_slf4j, - "org.gmetrics:GMetrics:0.2@jar" + "org.gmetrics:GMetrics:0.3@jar" - 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, diff --git a/subprojects/gradle-core/core.gradle b/subprojects/gradle-core/core.gradle index c2de68c..501a088 100644 --- a/subprojects/gradle-core/core.gradle +++ b/subprojects/gradle-core/core.gradle @@ -48,32 +48,38 @@ sourceSets { 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.jopt_simple, 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.0@jar", + "commons-collections:commons-collections3:3.2.1@jar", + "org.apache.maven:maven-ant-tasks:2.0.10@jar", libraries.asm_all, - 'org.fusesource.jansi:jansi:1.2.1', - 'org.jruby.ext.posix:jna-posix:1.0.3', - 'org.sonatype.pmaven:pmaven-common:0.8-20100325@jar', - 'org.sonatype.pmaven:pmaven-groovy:0.8-20100325@jar', - 'org.codehaus.plexus:plexus-component-annotations:1.5.2' - - runtime 'net.java.dev.jna:jna:3.2.2' + 'org.fusesource.jansi:jansi:1.4', + 'org.jruby.ext.posix:jna-posix:1.0.1', + 'org.codehaus.plexus:plexus-component-annotations:1.0-beta-3.0.7', + 'org.codehaus.plexus:plexus-component-api:1.0-alpha-22', + 'org.apache.maven:maven-model:2.2.1', + 'org.apache.maven:maven-settings:2.2.1', + 'org.apache.maven:maven-project:2.2.1', + 'org.apache.maven:maven-artifact:2.2.1', + 'org.apache.maven:maven-artifact-manager:2.2.1', + 'org.apache.maven:maven-settings:2.2.1', + 'org.apache.maven.wagon:wagon-provider-api:1.0-beta-6' + + runtime 'net.java.dev.jna:jna:3.2.4' runtime libraries.log4j_to_slf4j, libraries.jcl_to_slf4j diff --git a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java index f461074..57a95ba 100644 --- a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java +++ b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java @@ -60,7 +60,7 @@ public abstract class AbstractClassPathProvider implements ClassPathProvider, Gr protected static List<Pattern> toPatterns(String... patternStrings) { List<Pattern> patterns = new ArrayList<Pattern>(); for (String patternString : patternStrings) { - patterns.add(Pattern.compile(patternString + "-.+")); + patterns.add(Pattern.compile(patternString + "-?.*")); } return patterns; } diff --git a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java index d7df344..86982fd 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,10 +31,12 @@ 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 @@ 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) { @@ -80,4 +86,4 @@ public class CustomModelBuilder extends ModelBuilder { throw new RuntimeException(e); } } -} \ No newline at end of file +} diff --git a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java index 49b0f10..6a6cfbc 100644 --- a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java +++ b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java @@ -17,27 +17,31 @@ package org.gradle.api.internal.artifacts.publish.maven.pombuilder; import groovy.util.FactoryBuilderSupport; import org.apache.maven.model.Model; -import org.sonatype.maven.polyglot.groovy.builder.factory.NamedFactory; +//import org.sonatype.maven.polyglot.groovy.builder.factory.NamedFactory; import java.util.Map; /** * This is a slightly modified version as shipped with polyglot Maven. */ -public class ModelFactory extends NamedFactory { +//public class ModelFactory extends NamedFactory { +public class ModelFactory { private Model model; public ModelFactory(Model model) { + /* super("project"); this.model = model; + */ + throw new UnsupportedOperationException("ModelFactory"); } public Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attrs) throws InstantiationException, IllegalAccessException { return model; } - @Override + //@Override public void onNodeCompleted(FactoryBuilderSupport builder, Object parent, Object node) { Model model = (Model)node; } -} \ No newline at end of file +} diff --git a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java index 26dbb71..0cabd69 100644 --- a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java +++ b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java @@ -98,4 +98,8 @@ public class PlexusLoggerAdapter implements Logger { public String getName() { return logger.getName(); } + + public void setThreshold(int level) { + throw new UnsupportedOperationException("setThreshold"); + } } diff --git a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java index d395a96..67ad723 100644 --- a/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java +++ b/subprojects/gradle-core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java @@ -17,7 +17,6 @@ package org.gradle.api.internal.artifacts.repositories; import org.apache.commons.httpclient.HttpsURL; import org.apache.ivy.plugins.repository.url.URLRepository; -import org.apache.webdav.lib.WebdavResource; import java.io.File; import java.io.IOException; @@ -52,9 +51,12 @@ public class WebdavRepository extends URLRepository { String destinationFileName = destination.substring(fileNameStart + 1); HttpsURL hrl = new HttpsURL(baseUrl); hrl.setUserinfo(user, userPassword); + /* WebdavResource wdr = new WebdavResource(hrl); wdr.putMethod(wdr.getPath() + '/' + destinationFileName, source); wdr.close(); + */ + throw new UnsupportedOperationException("put"); } // Alternative implementation with httpclient only. Unfortunately this is slower. diff --git a/subprojects/gradle-core/src/main/groovy/org/gradle/logging/Slf4jLoggingConfigurer.java b/subprojects/gradle-core/src/main/groovy/org/gradle/logging/Slf4jLoggingConfigurer.java index 98f95e1..315d9dd 100644 --- a/subprojects/gradle-core/src/main/groovy/org/gradle/logging/Slf4jLoggingConfigurer.java +++ b/subprojects/gradle-core/src/main/groovy/org/gradle/logging/Slf4jLoggingConfigurer.java @@ -156,7 +156,7 @@ public class Slf4jLoggingConfigurer implements LoggingConfigurer, LoggingOutput 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 78c73cb..ef7c834 100644 --- a/subprojects/gradle-docs/docs.gradle +++ b/subprojects/gradle-docs/docs.gradle @@ -26,6 +26,7 @@ configurations { userGuideTask } +/* 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 { userGuideStyleSheets 'docbook:docbook-xsl:1.75.2@zip' } +*/ RemoteLocations remoteLocations = new RemoteLocations(version: version) @@ -91,10 +93,11 @@ 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) { @@ -251,7 +254,8 @@ task websiteDocs(type: Docbook2Xhtml, dependsOn: websiteDocsSrc) { 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]) task uploadDocs(dependsOn: docs) << { ftp(action: 'mkdir', remotedir: remoteLocations.docsRemoteDir) diff --git a/subprojects/gradle-jetty/jetty.gradle b/subprojects/gradle-jetty/jetty.gradle index 2278a0f..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.22@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.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" testCompile project(path: ':core', configuration: 'testFixtures') testRuntime project(path: ':core', configuration: 'testFixturesRuntime') diff --git a/subprojects/gradle-osgi/osgi.gradle b/subprojects/gradle-osgi/osgi.gradle index bd6713b..dd27cac 100644 --- a/subprojects/gradle-osgi/osgi.gradle +++ b/subprojects/gradle-osgi/osgi.gradle @@ -13,10 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -repositories { - mavenRepo urls: 'http://www.aQute.biz/repo' -} - dependencies { groovy libraries.groovy_depends @@ -24,7 +20,7 @@ dependencies { compile project(':plugins') compile libraries.slf4j_api - compile 'biz.aQute:bndlib:0.0.384@jar' + compile 'biz.aQute:bnd:0.0.384@jar' testCompile project(path: ':core', configuration: 'testFixtures') testRuntime project(path: ':core', configuration: 'testFixturesRuntime') diff --git a/subprojects/gradle-wrapper/wrapper.gradle b/subprojects/gradle-wrapper/wrapper.gradle index 9ca7d06..c162b8d 100644 --- a/subprojects/gradle-wrapper/wrapper.gradle +++ b/subprojects/gradle-wrapper/wrapper.gradle @@ -19,7 +19,7 @@ dependencies { groovy libraries.groovy_depends compile project(':core') - compile libraries.commons_io, libraries.ant, libraries.ant_nodeps + compile libraries.commons_io, libraries.ant, libraries.ant_nodeps, libraries.ant_trax testCompile project(path: ':core', configuration: 'testFixtures') testRuntime project(path: ':core', configuration: 'testFixturesRuntime') -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
