[Jpackage-commits] dist/gradle/devel .cvsignore, 1.3, 1.4 02_sonar.diff, NONE, 1.1 03_plexus.diff, NONE, 1.1 04_webdavlib.diff, NONE, 1.1 05_polyglot_maven.diff, NONE, 1.1 10_fix_version.diff, NONE, 1.1 11_fix_jni_path.diff, NONE, 1.1 12_fix_missing_classpath.diff, NONE, 1.1 13_fix_javadocs_links.diff, NONE, 1.1 21_docs.diff, NONE, 1.1 22_checkstyle.diff, NONE, 1.1 gradle-build.patch, 1.3, 1.4 gradle-jarmap, NONE, 1.1 gradle-maven.patch, NONE, 1.1 gradle-website-build.patch, NONE, 1.1 gradle.spec, 1.4, 1.5 sources, 1.4, 1.5

David Walluck david at ryu.zarb.org
Sun Oct 16 09:39:30 CEST 2011


Update of /home/projects/jpackage/cvs/dist/gradle/devel
In directory ryu.zarb.org:/tmp/cvs-serv32166/devel

Modified Files:
	.cvsignore gradle-build.patch gradle.spec sources 
Added Files:
	02_sonar.diff 03_plexus.diff 04_webdavlib.diff 
	05_polyglot_maven.diff 10_fix_version.diff 
	11_fix_jni_path.diff 12_fix_missing_classpath.diff 
	13_fix_javadocs_links.diff 21_docs.diff 22_checkstyle.diff 
	gradle-jarmap gradle-maven.patch gradle-website-build.patch 
Log Message:
- initial import

--- NEW FILE: gradle-website-build.patch ---
--- gradle-1.0/website/build.gradle.orig	2011-04-25 03:38:30.000000000 -0400
+++ gradle-1.0/website/build.gradle	2011-09-10 03:07:57.985378953 -0400
@@ -36,8 +36,8 @@
 }
 dependencies {
     groovy localGroovy()
-    testCompile 'junit:junit:4.7'
-    testCompile 'net.sourceforge.htmlunit:htmlunit:2.8'
+    testCompile 'junit:junit4:4.8.2'
+    testCompile 'net.sourceforge.htmlunit:htmlunit2:2.8'
 }
 
 webSrcDir = file('src')
@@ -328,4 +328,4 @@
     String getScpDir() {
         return release ? '/var/www/domains/gradle.org/www/htdocs' : '/var/www/domains/gradle.org/www/htdocs/latest'
     }
-}
\ No newline at end of file
+}

--- NEW FILE: 13_fix_javadocs_links.diff ---
--- gradle-1.0/subprojects/docs/docs.gradle.orig
+++ gradle-1.0/subprojects/docs/docs.gradle
@@ -238,8 +238,8 @@ task javadoc(type: Javadoc) {
     include 'org/gradle/testfixtures/**'
     include 'org/gradle/tooling/**'
     exclude '**/internal/**'
-    options.links("http://download.oracle.com/javase/1.5.0/docs/api", "http://groovy.codehaus.org/gapi/", "http://maven.apache.org/ref/2.2.1/maven-core/apidocs",
-        "http://maven.apache.org/ref/2.2.1/maven-model/apidocs")
+    options.links("file:///usr/share/javadoc/java", "file:///usr/share/javadoc/groovy17",
+         "file:///usr/share/javadoc/maven2")
     doFirst {
         title = "Gradle API $version"
     }

--- NEW FILE: 21_docs.diff ---
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 <miguel at miguel.cc>
Forwarded: no
Last-Update: 2011-05-10

--- gradle-1.0~m3.orig/build.gradle
+++ gradle-1.0~m3/build.gradle
@@ -393,7 +393,7 @@ binDistImage = copySpec {
     from('src/toplevel') {
         expand(version: version)
     }
-    from project(':docs').distDocs.destFile
+    //from project(':docs').distDocs.destFile
     into('bin') {
         from startScriptsDir
         fileMode = 0755
@@ -422,14 +422,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
@@ -495,7 +497,8 @@ def guessMaxForks() {
 
 task testedDists(dependsOn: [assemble, check, integTests])
 
-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'
@@ -579,7 +582,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, uploadArchives, uploadDists
 }
 
 task wrapper(type: Wrapper) {
--- gradle-1.0~m3.orig/subprojects/docs/docs.gradle
+++ gradle-1.0~m3/subprojects/docs/docs.gradle
@@ -28,6 +28,7 @@ configurations {
     userGuideTask
 }
 
+/*
 dependencies {
     userGuideTask 'xalan:xalan:2.7.1', 'xerces:xercesImpl:2.9.1'
     userGuideTask module('xhtmlrenderer:xhtmlrenderer:R8rc1') {
@@ -37,6 +38,7 @@ dependencies {
 
     userGuideStyleSheets 'docbook:docbook-xsl:1.75.2 at zip'
 }
+*/
 
 RemoteLocations remoteLocations = new RemoteLocations(version: version)
 
@@ -94,10 +96,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) {
@@ -332,7 +334,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'
 }

Index: gradle.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gradle/devel/gradle.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** gradle.spec	24 May 2011 05:28:36 -0000	1.4
--- gradle.spec	16 Oct 2011 07:39:28 -0000	1.5
***************
*** 27,45 ****
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #
  
! %define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
! %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
! %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
! %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
  %bcond_without bootstrap
  %bcond_without repolib
  
! %global namedversion %{version}-milestone-4
  
  Name:           gradle
  Version:        1.0
! Release:        0.1%{?dist}
  Epoch:          0
  Summary:        Groovy-based build system
--- 27,54 ----
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
! %bcond_with superbootstrap
! %bcond_with bootstrap
  
+ %if %with superbootstrap
  %bcond_without bootstrap
+ %bcond_with repolib
+ %else
  %bcond_without repolib
+ %endif
  
! %if 0
! %global _jarsign_opts --skip=%{_usr} --skip=%{_javadir} --nocopy
! %else
! %global _jarsign_opts --skip=%{_usr} --nocopy
! %endif
! 
! %define reltag _milestone_3
! %define namedreltag -milestone-3
! %global namedversion %{version}%{?namedreltag}
  
  Name:           gradle
  Version:        1.0
! Release:        0.1.16%{?reltag}%{?dist}
  Epoch:          0
  Summary:        Groovy-based build system
***************
*** 48,59 ****
  URL:            http://www.gradle.org/
  %if 0
! git clone https://github.com/gradle/gradle.git && cd gradle
! git checkout REL_1.0-milestone-3
! cd .. && mv gradle gradle-1.0 && tar --exclude=.git\* -cjf gradle-1.0.tar.bz2 gradle-1.0
  %endif
! Source0:        gradle-%{version}.tar.bz2
! Source1:        http://repo.gradle.org/gradle/distributions/gradle-snapshots/gradle-1.0-milestone-4-20110512131549+1000-bin.zip
  Source2:        gradle-local-repo.tar.bz2
  Patch0:         gradle-build.patch
  Requires(post): jpackage-utils
  Requires(postun): jpackage-utils
--- 57,81 ----
  URL:            http://www.gradle.org/
  %if 0
! git clone https://github.com/gradle/gradle.git && cd gradle && git archive --prefix=gradle-1.0/ --format=tar REL_1.0-milestone-3 | bzip2 -9 > ../gradle-1.0.tar.bz2
  %endif
! Source0:         http://repo.gradle.org/gradle/distributions/gradle-1.0-milestone-3-src.zip
! #Source0:        gradle-%{version}.tar.bz2
! #Source1:        http://repo.gradle.org/gradle/distributions/gradle-snapshots/gradle-1.0-milestone-3-20110424172210+1000-bin.zip
! Source1:        http://repo.gradle.org/gradle/distributions/gradle-1.0-milestone-3-all.zip
  Source2:        gradle-local-repo.tar.bz2
+ Source3:        gradle-jarmap
  Patch0:         gradle-build.patch
+ Patch1:         02_sonar.diff
+ Patch2:         03_plexus.diff
+ Patch3:         04_webdavlib.diff
+ Patch4:         05_polyglot_maven.diff
+ Patch5:         10_fix_version.diff
+ Patch6:         11_fix_jni_path.diff
+ Patch7:         12_fix_missing_classpath.diff
+ Patch8:         13_fix_javadocs_links.diff
+ Patch9:         21_docs.diff
+ Patch10:        22_checkstyle.diff
+ Patch11:        gradle-maven.patch
+ Patch12:        gradle-website-build.patch
  Requires(post): jpackage-utils
  Requires(postun): jpackage-utils
***************
*** 62,178 ****
  Requires:       jpackage-utils
  #
! Requires:       groovy17
  Requires:       commons-cli
- Requires:       slf4j
- Requires:       commons-httpclient
  Requires:       commons-codec
! Requires:       apache-ivy
! Requires:       jsch
! Requires:       jzlib
! Requires:       ant
! Requires:       logback
! Requires:       commons-io
  Requires:       commons-lang
  Requires:       guava
- Requires:       commons-collections
- Requires:       jakarta-slide-webdavclient
- Requires:       objectweb-asm
  Requires:       jansi
- Requires:       jna-posix
- Requires:       jna
- Requires:       dom4j
  Requires:       jaxen
! # lib/plugins
  Requires:       junit4
! Requires:       testng
! Requires:       bsh2
! #Requires:      jcommander
! #Requires:      snakeyaml
  Requires:       codenarc
  Requires:       gmetrics
! Requires:       checkstyle
! Requires:       antlr
! Requires:       commons-beanutils
! Requires:       jetty6
! Requires:       servlet_2_5_api
! Requires:       jsp_2_1_api
! Requires:       annotation_1_0_api
! Requires:       ant-antlr
! Requires:       aqute-bndlib
! #Requires:      sonar
! # lib/core-impl
  Requires:       maven-ant-tasks
! #Requires:      pmaven
  Requires:       plexus-containers-component-annotations
  #
  %if %without bootstrap
! BuildRequires:   gradle
  %endif
  #
  BuildRequires:  java-devel
  BuildRequires:  jpackage-utils
  #
  BuildRequires:  ant
  BuildRequires:  ant-antlr
! BuildRequires:  ant-junit
! BuildRequires:  antlr   
  BuildRequires:  apache-ivy
  BuildRequires:  commons-cli
! BuildRequires:  commons-io 
  BuildRequires:  commons-lang
! BuildRequires:  dom4j   
! BuildRequires:  guava        
  BuildRequires:  groovy17
  BuildRequires:  jaxen
! BuildRequires:  junit4 
! BuildRequires:  logback
! BuildRequires:  objectweb-asm
! BuildRequires:  slf4j 
! BuildRequires:  xmlunit      
! #
! #BuildRequires:  spockframework
! BuildRequires:  hamcrest
! BuildRequires:  cglib
! BuildRequires:  objenesis
! #
! BuildRequires:  jmock
! #
! BuildRequires:  jetty6
! BuildRequires:  servlet_2_5_api
! #
! BuildRequires:  google-collections
! #
! BuildRequires:  codenarc
! BuildRequires:  gmetrics
! #
! BuildRequires:  checkstyle
! BuildRequires:  commons-beanutils
! #
! BuildRequires:  commons-httpclient
! BuildRequires:  commons-codec
  BuildRequires:  jsch
  BuildRequires:  jzlib
! BuildRequires:  commons-collections
! BuildRequires:  jakarta-slide-webdavclient
! BuildRequires:  jansi
  BuildRequires:  jna-posix
! BuildRequires:  jna
! BuildRequires:  xerces-j2
! #
  BuildRequires:  maven-ant-tasks
! #BuildRequires: pmaven
  BuildRequires:  plexus-containers-component-annotations
  #
  BuildRequires:  xalan-j2
! #BuildRequires: xhtmlrenderer
! #BuildRequires: itext
  BuildRequires:  xslthl
- BuildRequires:  docbook-xsl
  #
! BuildRequires:  ecj
! BuildRequires:  annotation_1_0_api
! #
! BuildRequires:  aqute-bndlib
  #
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
--- 84,228 ----
  Requires:       jpackage-utils
  #
! Requires:       ant
! Requires:       ant-antlr
! Requires:       antlr
! Requires:       apache-ivy
! Requires:       bsh2
! Requires:       checkstyle
! Requires:       commons-beanutils
  Requires:       commons-cli
  Requires:       commons-codec
! Requires:       commons-collections
! Requires:       commons-httpclient
! # FIXME:
! Requires:       jakarta-commons-io
  Requires:       commons-lang
+ Requires:       dom4j
+ Requires:       ecj3
+ Requires:       groovy17
  Requires:       guava
  Requires:       jansi
  Requires:       jaxen
! Requires:       jsr-305
! Requires:       jboss-servlet-api_3.0_spec
! Requires:       jsp_2_1_api
! Requires:       jcommander
! Requires:       jetty6-core
! Requires:       jetty6-annotations
! Requires:       jetty6-naming
! Requires:       jetty6-plus
! Requires:       jna
! Requires:       jsch
  Requires:       junit4
! Requires:       jzlib
! # FIXME
! %if 0
! Requires:       pmaven
! Requires:       jna-posix
! Requires:       logback
! Requires:       bndlib1
  Requires:       codenarc
  Requires:       gmetrics
! Requires:       sonar
! %endif
  Requires:       maven-ant-tasks
! Requires:       objectweb-asm
  Requires:       plexus-containers-component-annotations
+ Requires:       slf4j
+ Requires:       jakarta-slide-webdavclient
+ Requires:       snakeyaml
+ Requires:       testng
  #
  %if %without bootstrap
! BuildRequires:  %{name} >= %{epoch}:0.1.15
  %endif
  #
  BuildRequires:  java-devel
+ BuildRequires:  java-javadoc
  BuildRequires:  jpackage-utils
+ BuildRequires:  groovy17-javadoc
  #
  BuildRequires:  ant
  BuildRequires:  ant-antlr
! BuildRequires:  antlr
  BuildRequires:  apache-ivy
+ BuildRequires:  bsh2
+ BuildRequires:  checkstyle
+ BuildRequires:  commons-beanutils
  BuildRequires:  commons-cli
! BuildRequires:  commons-codec
! BuildRequires:  commons-collections
! BuildRequires:  commons-httpclient
! # FIXME
! BuildRequires:  jakarta-commons-io
  BuildRequires:  commons-lang
! BuildRequires:  dom4j
! BuildRequires:  ecj3
  BuildRequires:  groovy17
+ BuildRequires:  guava
+ BuildRequires:  jansi
  BuildRequires:  jaxen
! BuildRequires:  jsr-305
! BuildRequires:  jboss-servlet-api_3.0_spec
! BuildRequires:  jsp_2_1_api
! BuildRequires:  jcommander
! BuildRequires:  jetty6-core
! BuildRequires:  jetty6-annotations
! BuildRequires:  jetty6-naming
! BuildRequires:  jetty6-plus
! BuildRequires:  jna
  BuildRequires:  jsch
+ BuildRequires:  junit4
  BuildRequires:  jzlib
! # FIXME
! %if 0
! BuildRequires:  pmaven
  BuildRequires:  jna-posix
! BuildRequires:  logback
! BuildRequires:  bndlib1
! BuildRequires:  codenarc
! BuildRequires:  gmetrics
! BuildRequires:  sonar
! %endif
  BuildRequires:  maven-ant-tasks
! BuildRequires:  objectweb-asm
  BuildRequires:  plexus-containers-component-annotations
+ BuildRequires:  slf4j
+ BuildRequires:  jakarta-slide-webdavclient
+ BuildRequires:  snakeyaml
+ BuildRequires:  testng
  #
+ BuildRequires:  ant-jsch
+ BuildRequires:  ant-junit
+ BuildRequires:  docbook-xsl >= 0:1.75.2
+ # FIXME
+ %if 0
+ BuildRequires:  google-collections
+ %endif
+ BuildRequires:  jmock
+ BuildRequires:  nekohtml
  BuildRequires:  xalan-j2
! # FIXME
! %if 0
! BuildRequires:  xhtmlrenderer
! %endif
! BuildRequires:  xmlunit
  BuildRequires:  xslthl
  #
! # FIXME: needs 1.2
! BuildRequires:  objenesis
  #
+ BuildRequires:  maven2
+ # FIXME: maven2 package missing javadocs
+ %if 0
+ BuildRequires:  maven2-javadoc
+ %endif
+ # FIXME: fonts
+ # https://bugzilla.redhat.com/show_bug.cgi?id=708201
+ BuildRequires:  fontconfig
+ # XXX: This may not be portable to non-Red Hat systems
+ BuildRequires:  font(liberationmono)
+ BuildRequires:  font(liberationsans)
+ BuildRequires:  font(liberationserif)
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
***************
*** 181,213 ****
  Groovy-based build system.
  
  %package javadoc
! Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  Requires:       jpackage-utils
  
  %description javadoc
! Javadoc for %{name}.
  
! %package manual
! Summary:        Manual for %{name}
  Group:          Development/Documentation
  Requires:       %{name}-javadoc = %{epoch}:%{version}-%{release}
  
! %description manual
! Manual for %{name}.
  
  %package samples
! Summary:        Samples for %{name}
  Group:          Development/Documentation
  
  %description samples
! Samples for %{name}.
  
  %package src
! Summary:        Source for %{name}
  Group:          Development/Documentation
  
  %description src
! Source for %{name}.
  
  %if %with repolib
--- 231,288 ----
  Groovy-based build system.
  
+ %package docs
+ Summary:        Documentation for %{name}
+ Group:          Development/Documentation
+ Requires:       %{name}-dsl = %{epoch}:%{version}-%{release}
+ Requires:       %{name}-groovydoc = %{epoch}:%{version}-%{release}
+ Requires:       %{name}-javadoc = %{epoch}:%{version}-%{release}
+ Requires:       %{name}-userguide = %{epoch}:%{version}-%{release}
+ 
+ %description docs
+ Documentation for %{name}.
+ 
+ %package dsl
+ Summary:        Gradle Build Language Reference
+ Group:          Development/Documentation
+ 
+ %description dsl
+ Gradle Build Language Reference.
+ 
+ %package groovydoc
+ Summary:        Groovy documentation for %{name}
+ Group:          Development/Documentation
+ 
+ %description groovydoc
+ Groovy documentation for %{name}.
+ 
  %package javadoc
! Summary:        Gradle API documentation
  Group:          Development/Documentation
  Requires:       jpackage-utils
  
  %description javadoc
! Gradle API documentation.
  
! %package userguide
! Summary:        Gradle userguide
  Group:          Development/Documentation
  Requires:       %{name}-javadoc = %{epoch}:%{version}-%{release}
  
! %description userguide
! Gradle userguide.
  
  %package samples
! Summary:        Gradle samples
  Group:          Development/Documentation
  
  %description samples
! Gradle samples.
  
  %package src
! Summary:        Gradle source
  Group:          Development/Documentation
  
  %description src
! Gradle source.
  
  %if %with repolib
***************
*** 223,228 ****
  
  %prep
! %setup -q
  %patch0 -p1 -b .sav0
  
  %if %with bootstrap
--- 298,311 ----
  
  %prep
! %if %without superbootstrap
! %setup -q -n gradle-%{namedversion}
  %patch0 -p1 -b .sav0
+ %patch2 -p1 -b .sav2
+ %patch5 -p1 -b .sav5
+ %patch7 -p1 -b .sav7
+ %patch8 -p1 -b .sav8
+ #if test `%{_bindir}/mvn-jpp -version | grep '^Maven version: ' | %{__awk} '{print $3}' | %{__awk} -F . '{print $2}'` -lt 1; then
+ %patch11 -p1 -b .sav11
+ #fi
  
  %if %with bootstrap
***************
*** 230,259 ****
  %endif
  
  %{__perl} -pi \
      -e 's|^version =.*;|version = "%{namedversion}";|;' \
      -e 's|gradleVersion =.*;|gradleVersion = "%{namedversion}";|;' \
  build.gradle
!  
! %build
! export TMP=%{_tmppath}
! export TMPDIR=%{_tmppath}
! 
! export GRADLE_USER_HOME=`pwd`/.gradle
  
  export LOCAL_REPO=`pwd`/local
! rm -rf ${LOCAL_REPO}
! mkdir -p ${LOCAL_REPO}
  pushd ${LOCAL_REPO}
! tar xf %{SOURCE2}
  popd
  
! export GROOVY_HOME=%{_datadir}/groovy17
! export JAVA_OPTS="-XX:MaxPermSize=512M"
  
! %if %with bootstrap
  export CLASSPATH=
! ./gradlew releaseArtifacts publishLocalArchives
  %else
! %{_bindir}/gradle releaseArtifacts publishLocalArchives
  %endif
  
--- 313,361 ----
  %endif
  
+ # FIXME: this a check for broken signing in brew
+ %if 0
+ %if %without bootstrap
+ for i in `%{_bindir}/find %{_datadir}/%{name}/lib/ -name \*.jar`; do
+     jarsigner -verify ${i}
+     jar tf ${i} | grep META-INF/
+ done
+ %endif
+ %endif
+ 
  %{__perl} -pi \
      -e 's|^version =.*;|version = "%{namedversion}";|;' \
      -e 's|gradleVersion =.*;|gradleVersion = "%{namedversion}";|;' \
  build.gradle
! %else
! %setup -q -n gradle-%{namedversion} -c -T
! %{__mkdir_p} build/distributions
! %{__cp} -p %{SOURCE1} build/distributions
! %endif
  
  export LOCAL_REPO=`pwd`/local
! %{__mkdir_p} ${LOCAL_REPO}
  pushd ${LOCAL_REPO}
! %{__tar} xvf %{SOURCE2}
  popd
  
! %build
! %if %without superbootstrap
! export LOCAL_REPO=`pwd`/local
! export TMP=%{_tmppath}
! export TMPDIR=%{_tmppath}
! export GRADLE_USER_HOME=`pwd`/.gradle
  
! export _OPTS="--full-stacktrace --info"
! export GROOVY_HOME=%{_javadir}
! export JAVA_OPTS="-XX:MaxPermSize=512M -Djava.awt.headless=true"
  export CLASSPATH=
! TARGETS="clean releaseArtifacts publishLocalArchives"
! #TARGETS="${TARGETS} websiteDocs"
! 
! %if %with bootstrap
! /bin/sh ./gradlew ${_OPTS} ${TARGETS}
  %else
! %{_bindir}/gradle ${_OPTS} ${TARGETS}
! %endif
  %endif
  
***************
*** 261,332 ****
  %{__rm} -rf %{buildroot}
  
  %{__mkdir_p} %{buildroot}%{_datadir}
! %{__unzip} -qq build/distributions/gradle-%{namedversion}*-all.zip -d %{buildroot}%{_datadir}
  %{__mv} %{buildroot}%{_datadir}/gradle-%{namedversion}* %{buildroot}%{_datadir}/%{name}
  %{__mkdir_p} %{buildroot}%{_bindir}
! %{__ln_s} %{_datadir}/%{name}/bin/gradle %{buildroot}%{_bindir}/gradle
  %{__rm} %{buildroot}%{_datadir}/%{name}/bin/gradle.bat
  pushd %{buildroot}%{_datadir}/%{name}
! pushd %{buildroot}%{_datadir}/%{name}/lib
! for i in ant ant-launcher apache-ivy objectweb-asm/asm-all logback/classic commons-cli commons-codec commons-collections commons-httpclient commons-io commons-lang logback/core dom4j groovy17-all guava jansi jaxen slf4j/jcl-over-slf4j \
! jna-posix jna jsch slf4j/jul-to-slf4j jzlib slf4j/log4j-over-slf4j slf4j/slf4j-api slide/webdavlib; do
!     rm -fv `basename $i`{,-[0-9]*}.jar
!     ln -s $(build-classpath $i)
! done
! popd
! pushd %{buildroot}%{_datadir}/%{name}/lib/plugins
! rm -fv junit-4.*.jar
! for i in annotation_1_0_api ant/ant-antlr antlr aqute-bndlib checkstyle CodeNarc commons-beanutils-core GMetrics plexus/containers-container-default ecj jetty6/jetty6-naming jetty6/jetty6-plus jetty6/jetty6-util jetty6/jetty6 \
! jsp_2_1_api junit4 servlet_2_5_api testng-jdk15 maven-wagon/wagon-http-lightweight maven-wagon/wagon-provider-api maven-wagon/wagon-ssh; do
!     rm -fv `basename $i`{,-[0-9]*}.jar
!     ln -s $(build-classpath $i)
! done
! popd
! pushd %{buildroot}%{_datadir}/%{name}/lib/core-impl
! for i in plexus/containers-component-annotations maven-ant-tasks; do
!     rm -fv `basename $i`{,-[0-9]*}.jar
!     ln -s $(build-classpath $i)
  done
  popd
- popd
  
! %{__mkdir_p} %{buildroot}%{_javadir}
! %{__mv} %{buildroot}%{_datadir}/%{name}/lib/gradle-core-%{namedversion}.jar %{buildroot}%{_javadir}
! %{__mv} %{buildroot}%{_datadir}/%{name}/lib/gradle-tooling-api-%{namedversion}.jar %{buildroot}%{_javadir}
! %{__mv} %{buildroot}%{_datadir}/%{name}/lib/gradle-wrapper-%{namedversion}.jar %{buildroot}%{_javadir}
! for jar in %{buildroot}%{_javadir}/*.jar ; do
!     %{__ln_s} ${jar} %{buildroot}%{_datadir}/%{name}/lib/`basename  ${jar}`
! done
! %{__cp} -p build/repo/org/gradle/gradle-core/%{namedversion}/gradle-core-%{namedversion}-sources.jar %{buildroot}%{_javadir}
! %{__cp} -p build/repo/org/gradle/gradle-tooling-api/%{namedversion}/gradle-tooling-api-%{namedversion}-sources.jar %{buildroot}%{_javadir}
! %{__cp} -p build/repo/org/gradle/gradle-wrapper/%{namedversion}/gradle-wrapper-%{namedversion}-sources.jar %{buildroot}%{_javadir}
! (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do %{__ln_s} ${jar} `echo ${jar} | sed -e 's/-%{namedversion}//g;'`; done)
  
  %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
! %{__cp} -p build/repo/org/gradle/gradle-core/%{namedversion}/gradle-core-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-gradle-core.pom
! %{__cp} -p build/repo/org/gradle/gradle-tooling-api/%{namedversion}/gradle-tooling-api-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-gradle-tooling-api.pom
! %{__cp} -p build/repo/org/gradle/gradle-wrapper/%{namedversion}/gradle-wrapper-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-gradle-wrapper.pom
! %add_to_maven_depmap org.gradle gradle-core %{namedversion} JPP gradle-core
! %add_to_maven_depmap org.gradle gradle-tooling-api %{namedversion} JPP gradle-tooling-api
! %add_to_maven_depmap org.gradle gradle-wrapper %{namedversion} JPP gradle-wrapper
  
! %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
  %{__ln_s} %{name}-%{namedversion} %{buildroot}%{_javadocdir}/%{name}
- %{__mv} %{buildroot}%{_datadir}/%{name}/docs/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
- %{__rm} -r %{buildroot}%{_datadir}/%{name}/docs/javadoc
  %{__ln_s} %{_javadocdir}/%{name} %{buildroot}%{_datadir}/%{name}/docs/javadoc
  
! %{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{namedversion}
  %{__ln_s} %{name}-%{namedversion} %{buildroot}%{_docdir}/%{name}
! %{__mv} %{buildroot}%{_datadir}/%{name}/docs/* %{buildroot}%{_docdir}/%{name}-%{namedversion}
! %{__rm} -r %{buildroot}%{_datadir}/%{name}/docs
! %{__ln_s} %{_docdir}/%{name} %{buildroot}%{_datadir}/%{name}/docs
  
  %if %with repolib
! %{__mkdir_p} %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew/
! %{__cp} -pr build/repo/* %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew/
  %endif
  
! %{_bindir}/find %{buildroot}%{_datadir}/%{name} -not -type l \( -name "*.jar" \)
  
  %clean
--- 363,433 ----
  %{__rm} -rf %{buildroot}
  
+ export LOCAL_REPO=`pwd`/local
+ 
  %{__mkdir_p} %{buildroot}%{_datadir}
! %{__unzip} -qqo build/distributions/gradle-%{namedversion}*-all.zip -d %{buildroot}%{_datadir}
  %{__mv} %{buildroot}%{_datadir}/gradle-%{namedversion}* %{buildroot}%{_datadir}/%{name}
+ %if 0
+ %{__mkdir_p} %{buildroot}%{_javadir}
+ %{__mv} %{buildroot}%{_datadir}/%{name}/lib %{buildroot}%{_javadir}/%{name}
+ %{__ln_s} ../../..%{_javadir}/%{name} %{buildroot}%{_datadir}/%{name}/lib
+ %endif
+ 
  %{__mkdir_p} %{buildroot}%{_bindir}
! %{__ln_s} %{_datadir}/%{name}/bin/gradle %{buildroot}%{_bindir}/%{name}
  %{__rm} %{buildroot}%{_datadir}/%{name}/bin/gradle.bat
+ 
+ # XXX: disable in superbootstrap mode?
  pushd %{buildroot}%{_datadir}/%{name}
! %{_bindir}/find lib/ -type f \( -name '*.jar' -and -not -name 'gradle*.jar' \) | %{_bindir}/xargs -t %{__rm}
! for line in `%{__awk} '{print $1":"$2}' %{SOURCE3}`; do
!     path=`/bin/echo ${line} | /bin/cut -d : -f1`
!     bc=`/bin/echo ${line} | /bin/cut -d : -f2`
!     if [ -n "${bc}" ]; then
!         f=`%{_bindir}/build-classpath ${bc}`
!         if [ -f ${f} ]; then
!             %{__ln_s} `%{_bindir}/build-classpath ${bc}` ${path}
!         else
!             exit 1
!         fi
!     else
!         jar=`/bin/basename ${path}`
!         %{__cp} -p ${LOCAL_REPO}/${jar} ${path}
!     fi
  done
  popd
  
! %if %without superbootstrap
! %{__mkdir_p} %{buildroot}%{_javadir}/%{name}
! %{__cp} -p build/repo/org/gradle/gradle-core/%{namedversion}/gradle-core-%{namedversion}-sources.jar %{buildroot}%{_javadir}/%{name}
! %{__cp} -p build/repo/org/gradle/gradle-tooling-api/%{namedversion}/gradle-tooling-api-%{namedversion}-sources.jar %{buildroot}%{_javadir}/%{name}
! %{__cp} -p build/repo/org/gradle/gradle-wrapper/%{namedversion}/gradle-wrapper-%{namedversion}-sources.jar %{buildroot}%{_javadir}/%{name}
! (cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{namedversion}*; do %{__ln_s} ${jar} `/bin/echo ${jar} | sed -e 's/-%{namedversion}//g;'`; done)
  
  %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
! %{__cp} -p build/repo/org/gradle/gradle-core/%{namedversion}/gradle-core-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gradle-core.pom
! %{__cp} -p build/repo/org/gradle/gradle-tooling-api/%{namedversion}/gradle-tooling-api-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gradle-tooling-api.pom
! %{__cp} -p build/repo/org/gradle/gradle-wrapper/%{namedversion}/gradle-wrapper-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-gradle-wrapper.pom
! %add_to_maven_depmap org.gradle gradle-core %{namedversion} JPP/%{name} gradle-core
! %add_to_maven_depmap org.gradle gradle-tooling-api %{namedversion} JPP/%{name} gradle-tooling-api
! %add_to_maven_depmap org.gradle gradle-wrapper %{namedversion} JPP/%{name} gradle-wrapper
! %endif
  
! %{__mkdir_p} %{buildroot}%{_javadocdir}
! %{__mv} %{buildroot}%{_datadir}/%{name}/docs/javadoc %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
  %{__ln_s} %{name}-%{namedversion} %{buildroot}%{_javadocdir}/%{name}
  %{__ln_s} %{_javadocdir}/%{name} %{buildroot}%{_datadir}/%{name}/docs/javadoc
  
! %{__mkdir_p} %{buildroot}%{_docdir}
! %{__mv} %{buildroot}%{_datadir}/%{name}/docs %{buildroot}%{_docdir}/%{name}-%{namedversion}
  %{__ln_s} %{name}-%{namedversion} %{buildroot}%{_docdir}/%{name}
! %{__ln_s} %{_docdir}/%{name}-%{namedversion} %{buildroot}%{_datadir}/%{name}/docs
  
  %if %with repolib
! %{__mkdir_p} %{buildroot}%{_javadir}/repository.jboss.com
! %{__cp} -pr build/repo %{buildroot}%{_javadir}/repository.jboss.com/maven2-brew
  %endif
  
! %{_bindir}/find %{buildroot}%{_datadir}/%{name} -not -type l \( -name "*.jar" -a -not -name "gradle*.jar" \)
  
  %clean
***************
*** 341,365 ****
  %files
  %defattr(-,root,root,0755)
! %{_bindir}/gradle
! %{_datadir}/%{name}
  %exclude %{_datadir}/%{name}/samples
  %exclude %{_datadir}/%{name}/src
  %defattr(0644,root,root,0755)
! %{_javadir}/gradle-core-%{namedversion}.jar
! %{_javadir}/gradle-tooling-api-%{namedversion}.jar
! %{_javadir}/gradle-wrapper-%{namedversion}.jar
! %{_javadir}/gradle-core-%{namedversion}-sources.jar
! %{_javadir}/gradle-tooling-api-%{namedversion}-sources.jar
! %{_javadir}/gradle-wrapper-%{namedversion}-sources.jar
! %{_javadir}/gradle-core.jar
! %{_javadir}/gradle-tooling-api.jar
! %{_javadir}/gradle-wrapper.jar
! %{_javadir}/gradle-core-sources.jar
! %{_javadir}/gradle-tooling-api-sources.jar
! %{_javadir}/gradle-wrapper-sources.jar
! %{_datadir}/maven2/poms/JPP-gradle-core.pom
! %{_datadir}/maven2/poms/JPP-gradle-tooling-api.pom
! %{_datadir}/maven2/poms/JPP-gradle-wrapper.pom
  %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
--- 442,484 ----
  %files
  %defattr(-,root,root,0755)
! %attr(0755,root,root) %{_bindir}/%{name}
! %dir %{_datadir}/%{name}
  %exclude %{_datadir}/%{name}/samples
  %exclude %{_datadir}/%{name}/src
  %defattr(0644,root,root,0755)
! %exclude %dir %{_javadocdir}/%{name}
! %doc %{_datadir}/%{name}/LICENSE
! %doc %{_datadir}/%{name}/NOTICE
! %dir %{_datadir}/%{name}/bin
! %attr(0755,root,root) %{_datadir}/%{name}/bin/gradle
! %doc %{_datadir}/%{name}/changelog.txt
! %doc %dir %{_datadir}/%{name}/docs
! %doc %{_datadir}/%{name}/getting-started.html
! %{_datadir}/%{name}/lib
! %if %without superbootstrap
! %{_javadir}*/%{name}
! %{_datadir}/maven2/poms/JPP.%{name}-gradle-core.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gradle-tooling-api.pom
! %{_datadir}/maven2/poms/JPP.%{name}-gradle-wrapper.pom
  %{_mavendepmapfragdir}/%{name}
+ %endif
+ 
+ %files docs
+ %defattr(0644,root,root,0755)
+ %doc %dir %{_docdir}/%{name}-%{namedversion}
+ %doc %dir %{_docdir}/%{name} 
+ %doc %{_docdir}/%{name}-%{namedversion}/javadoc
+ 
+ %files dsl
+ %defattr(0644,root,root,0755)
+ %doc %dir %{_docdir}/%{name}-%{namedversion}
+ %doc %dir %{_docdir}/%{name}
+ %doc %{_docdir}/%{name}-%{namedversion}/dsl
+ 
+ %files groovydoc
+ %defattr(0644,root,root,0755)
+ %doc %dir %{_docdir}/%{name}-%{namedversion}
+ %doc %dir %{_docdir}/%{name}
+ %doc %{_docdir}/%{name}-%{namedversion}/groovydoc
  
  %files javadoc
***************
*** 368,375 ****
  %{_javadocdir}/%{name}
  
! %files manual
  %defattr(0644,root,root,0755)
! %doc %{_docdir}/%{name}-%{namedversion}
! %doc %{_docdir}/%{name}
  
  %files samples
--- 487,495 ----
  %{_javadocdir}/%{name}
  
! %files userguide
  %defattr(0644,root,root,0755)
! %doc %dir %{_docdir}/%{name}-%{namedversion}
! %doc %dir %{_docdir}/%{name}
! %doc %{_docdir}/%{name}-%{namedversion}/userguide
  
  %files samples
***************
*** 392,395 ****
--- 512,576 ----
  
  %changelog
+ * Wed Sep 14 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.16
+ - fix ant-antlr symlink
+ 
+ * Mon Sep 12 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.15
+ - build as non-bootstrap
+ 
+ * Mon Sep 12 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.14
+ - build as non-bootstrap
+ 
+ * Sat Sep 10 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.13
+ - build as super bootstrap
+ - try to sign %%_javadir, but not %%_datadir/%%name
+ 
+ * Sat Sep 10 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.12
+ - build as non-bootstrap
+ 
+ * Fri Sep 09 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.11
+ - downgrade to 1.0-milestone-3
+ - change location of gradle jars
+ - use jsp_2_1_api
+ - bundle groovy-all, guava, plexus-component-annotations
+ 
+ * Thu Sep 08 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.10
+ - build as non-bootstrap
+ 
+ * Thu Sep 08 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.9
+ - bundle broken groovy17-all
+ 
+ * Thu Sep 08 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.8
+ - bundle broken aqute-bndlib, guava, plexus-component-annotations
+ - bundle broken plexus-container-default
+ 
+ * Thu Sep 08 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.7
+ - set _jarsign_opts
+ 
+ * Tue Aug 23 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.6
+ - don't sign jars
+ - make font BuildRequires more portable
+ 
+ * Fri Jun 03 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.5
+ - enable bootstrap and unsign the build when bootstrapping
+ 
+ * Wed Jun 01 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.4
+ - build as non-bootstrap
+ 
+ * Fri May 27 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.3
+ - fix jar symlinks
+ 
+ * Fri May 27 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.2
+ - Requires: ecj3, not ecj
+ 
+ * Wed May 25 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1.1
+ - bundle more jars for brew
+ - fix up symlinking for brew
+ - update file list for brew
+ - use ecj3, not ecj, and also require it
+ - BuildRequires: testng
+ - add some font BuildRequires
+ - set java.awt.headless
+ - add (Build)Requires: plexus-containers-container-default
+ 
  * Sat May 21 2011 David Walluck <dwalluck at redhat.com> 0:1.0-0.1
  - release

--- NEW FILE: gradle-jarmap ---
lib/ant-1.8.2.jar ant
lib/ant-launcher-1.8.2.jar ant-launcher
lib/asm-all-3.3.1.jar objectweb-asm/asm-all
lib/commons-cli-1.2.jar commons-cli
lib/commons-codec-1.2.jar commons-codec
lib/commons-collections-3.2.1.jar commons-collections
lib/commons-httpclient-3.0.jar commons-httpclient
lib/commons-io-1.4.jar commons-io
lib/commons-lang-2.6.jar
lib/core-impl/maven-ant-tasks-2.1.1.jar maven-ant-tasks
lib/core-impl/plexus-component-annotations-1.5.2.jar
lib/core-impl/pmaven-common-0.8-20100325.jar
lib/core-impl/pmaven-groovy-0.8-20100325.jar
lib/dom4j-1.6.1.jar dom4j
lib/groovy-all-1.7.10.jar
lib/guava-r08.jar
lib/ivy-2.2.0.jar apache-ivy
lib/jansi-1.2.1.jar jansi
lib/jaxen-1.1.jar jaxen
lib/jcl-over-slf4j-1.6.1.jar slf4j/jcl-over-slf4j
lib/jna-3.2.2.jar jna
lib/jna-posix-1.0.3.jar
lib/jsch-0.1.42.jar jsch
lib/jul-to-slf4j-1.6.1.jar slf4j/jul-to-slf4j
lib/jzlib-1.0.7.jar jzlib
lib/log4j-over-slf4j-1.6.1.jar slf4j/log4j-over-slf4j
lib/logback-classic-0.9.28.jar
lib/logback-core-0.9.28.jar
lib/plugins/CodeNarc-0.13.jar
lib/plugins/GMetrics-0.3.jar
lib/plugins/ant-antlr-1.8.2.jar ant/ant-antlr
lib/plugins/antlr-2.7.7.jar antlr
lib/plugins/bndlib-1.15.0.jar
lib/plugins/bsh-2.0b4.jar bsh2/bsh
lib/plugins/checkstyle-5.3.jar checkstyle
lib/plugins/commons-beanutils-core-1.8.3.jar commons-beanutils-core
lib/plugins/core-3.1.1.jar
lib/plugins/geronimo-annotation_1.0_spec-1.0.jar jsr305
lib/plugins/jcommander-1.12.jar jcommander
lib/plugins/jetty-6.1.25.jar jetty6/jetty6
lib/plugins/jetty-annotations-6.1.25.jar jetty6/annotations/jetty6-annotations
lib/plugins/jetty-naming-6.1.25.jar jetty6/jetty6-naming
lib/plugins/jetty-plus-6.1.25.jar jetty6/jetty6-plus
lib/plugins/jetty-util-6.1.25.jar jetty6/jetty6-util
lib/plugins/jsp-2.1-6.1.14.jar jsp_2_1_api
lib/plugins/jsp-api-2.1-6.1.14.jar jsp_2_1_api
lib/plugins/junit-4.8.2.jar junit4
lib/plugins/servlet-api-2.5-20081211.jar jboss-servlet-api_3.0_spec/jboss-servlet-api_3.0_spec
lib/plugins/snakeyaml-1.6.jar snakeyaml
lib/plugins/sonar-batch-bootstrapper-2.6.jar
lib/plugins/testng-5.14.10.jar testng
lib/slf4j-api-1.6.1.jar slf4j/slf4j-api
lib/webdavlib-2.0.jar slide/webdavlib

--- NEW FILE: 03_plexus.diff ---
Description: Plexus compatibility
Author: Miguel Landaeta <miguel at miguel.cc>
Forwarded: no
Last-Update: 2010-08-23

Index: b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java
===================================================================
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java	2010-08-22 16:17:01.000000000 -0430
+++ b/subprojects/core-impl/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");
+    }
 }

--- NEW FILE: 10_fix_version.diff ---
Description: Remove build timestamp from the version string
Author: Miguel Landaeta <miguel at miguel.cc>
Forwarded: no
Last-Update: 2010-12-20

--- gradle-0.9.orig/buildSrc/src/main/groovy/org/gradle/build/Version.groovy
+++ gradle-0.9/buildSrc/src/main/groovy/org/gradle/build/Version.groovy
@@ -48,7 +48,7 @@ class Version {
             if (graph.hasTask(':releaseVersion')) {
                 release = true
             } else {
-                this.versionNumber += "-" + getTimestamp()
+                //this.versionNumber += "-" + getTimestamp()
                 release = false
             }
         }

--- NEW FILE: 05_polyglot_maven.diff ---
Description: Disable Polyglot Maven features
 Polyglot Maven is not packaged in Debian yet.
Author: Miguel Landaeta <miguel at miguel.cc>
Forwarded: not-needed
Last-Update: 2011-05-21

--- gradle-1.0~m3.orig/subprojects/core-impl/core-impl.gradle
+++ gradle-1.0~m3/subprojects/core-impl/core-impl.gradle
@@ -8,8 +8,8 @@ dependencies {
     compile libraries.commons_lang
     compile libraries.ivy
     compile "org.apache.maven:maven-ant-tasks:2.1.1 at jar"
-    compile "org.sonatype.pmaven:pmaven-common:0.8-20100325 at jar"
-    compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325 at jar"
+    //compile "org.sonatype.pmaven:pmaven-common:0.8-20100325 at jar"
+    //compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325 at jar"
     //compile "org.codehaus.plexus:plexus-component-annotations:1.5.2 at jar"
     compile "org.codehaus.plexus:plexus-component-annotations:1.0-beta-3.0.7 at jar"
     compile "org.codehaus.plexus:plexus-component-api:1.0-alpha-22 at jar"
--- gradle-1.0~m3.orig/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java
+++ gradle-1.0~m3/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java
@@ -17,27 +17,31 @@ package org.gradle.api.internal.artifact
 
 import groovy.util.FactoryBuilderSupport;
 import org.apache.maven.model.Model;
-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
+}
--- gradle-1.0~m3.orig/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java
+++ gradle-1.0~m3/subprojects/core-impl/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
         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
             throw new RuntimeException(e);
         }
     }
-}
\ No newline at end of file
+}

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gradle/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** sources	23 May 2011 17:52:59 -0000	1.4
--- sources	16 Oct 2011 07:39:28 -0000	1.5
***************
*** 1,3 ****
! 230b9a78fdca2268886149b947a8f3c7  gradle-1.0-milestone-4-20110512131549+1000-bin.zip
! 0468b481462cf149961ddcc249d079f9  gradle-1.0.tar.bz2
! 180b005f8cf4fe6d797849f1a35688b3  gradle-local-repo.tar.bz2
--- 1,3 ----
! e3e01c894da324654da044089e6842ea  gradle-1.0-milestone-3-all.zip
! df5e2e8571150f93f4c8a6fa924f2e63  gradle-1.0-milestone-3-src.zip
! 5579c88db24fcb0692a369bd469a13cc  gradle-local-repo.tar.bz2

--- NEW FILE: gradle-maven.patch ---
--- gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/DefaultMavenPom.java.sav0	2011-04-25 03:38:30.000000000 -0400
+++ gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/DefaultMavenPom.java	2011-09-09 18:29:55.398463232 -0400
@@ -159,11 +159,7 @@
 
     public DefaultMavenPom getEffectivePom() {
         DefaultMavenPom effectivePom = new DefaultMavenPom(null, this.scopeMappings, pomDependenciesConverter, fileResolver);
-        try {
-            effectivePom.setMavenProject((MavenProject) mavenProject.clone());
-        } catch (CloneNotSupportedException e) {
-            throw new RuntimeException(e);
-        }
+        effectivePom.setMavenProject(mavenProject);
         effectivePom.getDependencies().addAll(getGeneratedDependencies());
         effectivePom.withXmlActions = withXmlActions;
         whenConfiguredActions.execute(effectivePom);

--- NEW FILE: 12_fix_missing_classpath.diff ---
Description: Set missing Class-Path in jars
Author: Miguel Landaeta <miguel at miguel.cc>
Forwarded: no
Last-Update: 2011-05-24

--- gradle-1.0~m3.orig/build.gradle
+++ gradle-1.0~m3/build.gradle
@@ -122,10 +122,20 @@ configure(groovyProjects()) {
     }
 
     tasks.withType(Jar).each { jar ->
-        jar.manifest.mainAttributes([
-                (Attributes.Name.IMPLEMENTATION_TITLE.toString()): 'Gradle',
-                (Attributes.Name.IMPLEMENTATION_VERSION.toString()): version,
-        ])
+        // Set missing Class-Path in jars
+        if (jar.getArchiveName() ==~ /^gradle-core-[0-9].*/) {
+            jar.manifest.mainAttributes([
+                    (Attributes.Name.IMPLEMENTATION_TITLE.toString()): 'Gradle',
+                    (Attributes.Name.IMPLEMENTATION_VERSION.toString()): version,
+                    (Attributes.Name.CLASS_PATH.toString()): 'logback-core.jar logback-classic.jar google-collections.jar joptsimple.jar commons-collections3.jar commons-httpclient.jar commons-io.jar commons-lang.jar jansi.jar asm3-all.jar jcl-over-slf4j.jar log4j-over-slf4j.jar slf4j-log4j12.jar jul-to-slf4j.jar maven-ant-tasks.jar maven-artifact-manager.jar maven-artifact.jar maven-model.jar maven-project.jar plexus-component-api.jar plexus-utils.jar libplexus-utils.jar',
+            ])
+        } else {
+            jar.manifest.mainAttributes([
+                    (Attributes.Name.IMPLEMENTATION_TITLE.toString()): 'Gradle',
+                    (Attributes.Name.IMPLEMENTATION_VERSION.toString()): version,
+                    (Attributes.Name.CLASS_PATH.toString()): 'grails-core.jar',
+            ])
+        }
     }
 }
 

--- NEW FILE: 11_fix_jni_path.diff ---
Description: Set the correct path to locate jnidispatch.so library
Author: Miguel Landaeta <miguel at miguel.cc>
Forwarded: no
Last-Update: 2011-05-23

--- gradle-1.0~m3.orig/subprojects/core/src/main/groovy/org/gradle/logging/LoggingServiceRegistry.java
+++ gradle-1.0~m3/subprojects/core/src/main/groovy/org/gradle/logging/LoggingServiceRegistry.java
@@ -107,7 +107,8 @@ public class LoggingServiceRegistry exte
     protected OutputEventRenderer createOutputEventRenderer() {
         Spec<FileDescriptor> terminalDetector;
         if (detectConsole) {
-            terminalDetector = new TerminalDetector(StartParameter.DEFAULT_GRADLE_USER_HOME);
+            //terminalDetector = new TerminalDetector(StartParameter.DEFAULT_GRADLE_USER_HOME);
+            terminalDetector = new TerminalDetector(new java.io.File("/usr/lib"));
         } else {
             terminalDetector = Specs.satisfyNone();
         }
--- gradle-1.0~m3.orig/subprojects/core/src/main/groovy/org/gradle/logging/internal/TerminalDetector.java
+++ gradle-1.0~m3/subprojects/core/src/main/groovy/org/gradle/logging/internal/TerminalDetector.java
@@ -29,8 +29,9 @@ import java.io.*;
 public class TerminalDetector implements Spec<FileDescriptor> {
     public TerminalDetector(File libCacheDir) {
         // Some hackery to prevent JNA from creating a shared lib in the tmp dir, as it does not clean things up
-        File tmpDir = new File(libCacheDir, "jna");
-        tmpDir.mkdirs();
+        //File tmpDir = new File(libCacheDir, "jna");
+        File tmpDir = new File(libCacheDir, "jni");
+        //tmpDir.mkdirs();
         String libName = System.mapLibraryName("jnidispatch");
         File libFile = new File(tmpDir, libName);
         if (!libFile.exists()) {

--- NEW FILE: 02_sonar.diff ---
Description: Disable Sonar features since it is not available in Debian yet
Author: Miguel Landaeta <miguel at miguel.cc>
Forwarded: no
Last-Update: 2011-05-22

--- gradle-1.0~m3.orig/build.gradle
+++ gradle-1.0~m3/build.gradle
@@ -602,7 +602,8 @@ def runtimeProjects() {
 }
 
 def pluginProjects() {
-    ['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', 'ide', 'announce', 'scala', 'sonar'].collect {
+    //['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', 'ide', 'announce', 'scala', 'sonar'].collect {
+    ['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', 'ide', 'announce', 'scala'].collect {
         project(it)
     }
 }
--- gradle-1.0~m3.orig/settings.gradle
+++ gradle-1.0~m3/settings.gradle
@@ -31,7 +31,7 @@ include 'openApi'
 include 'toolingApi'
 include 'docs'
 include 'integTest'
-include 'sonar'
+//include 'sonar'
 
 rootProject.name = 'gradle'
 rootProject.children.each {project ->

--- NEW FILE: 04_webdavlib.diff ---
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 <miguel at miguel.cc>
Forwarded: not-needed
Last-Update: 2011-05-10

--- gradle-1.0~m3.orig/subprojects/core/core.gradle
+++ gradle-1.0~m3/subprojects/core/core.gradle
@@ -51,7 +51,7 @@ dependencies {
             "commons-codec:commons-codec:1.5 at jar",
             libraries.guava,
             "commons-collections:commons-collections3:3.2.1 at jar",
-            "slide:webdavlib:2.0 at jar",
+            //"slide:webdavlib:2.0 at jar",
             libraries.asm_all,
             'org.fusesource.jansi:jansi:1.4',
             'org.jruby.ext.posix:jna-posix:1.0.1'
--- gradle-1.0~m3.orig/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java
+++ gradle-1.0~m3/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;
 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 UR
         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.

Index: gradle-build.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gradle/devel/gradle-build.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** gradle-build.patch	23 May 2011 17:52:59 -0000	1.3
--- gradle-build.patch	16 Oct 2011 07:39:28 -0000	1.4
***************
*** 1,86 ****
! --- gradle-1.0/buildSrc/build.gradle.sav0	2011-04-26 12:08:02.000000000 -0400
! +++ gradle-1.0/buildSrc/build.gradle	2011-05-03 15:37:25.827955666 -0400
! @@ -20,12 +20,13 @@
!  apply plugin: 'eclipse'
!  
!  repositories {
! -    mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
! +    flatDir name: 'libs', dirs: [ System.getenv()['LOCAL_REPO'], '/usr/share/java' ]
!  }
!  
!  dependencies {
!      compile gradleApi()
!      compile 'com.google.collections:google-collections:1.0 at jar'
! +    compile 'antlr:antlr:2.7.7 at jar'
!      groovy localGroovy()
!      testCompile 'junit:junit:4.8.2 at jar'
!      testCompile 'org.spockframework:spock-core:0.5-groovy-1.7 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
! --- gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/DefaultMavenPom.java.sav0	2011-05-06 22:08:09.000000000 -0400
! +++ gradle-1.0/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/DefaultMavenPom.java	2011-05-07 00:12:07.686764264 -0400
! @@ -159,11 +159,7 @@
!  
!      public DefaultMavenPom getEffectivePom() {
!          DefaultMavenPom effectivePom = new DefaultMavenPom(null, this.scopeMappings, pomDependenciesConverter, fileResolver);
! -        try {
! -            effectivePom.setMavenProject((MavenProject) mavenProject.clone());
! -        } catch (CloneNotSupportedException e) {
! -            throw new RuntimeException(e);
! -        }
! +        effectivePom.setMavenProject(mavenProject);
!          effectivePom.getDependencies().addAll(getGeneratedDependencies());
!          effectivePom.withXmlActions = withXmlActions;
!          whenConfiguredActions.execute(effectivePom);
! --- gradle-1.0/subprojects/jetty/jetty.gradle.orig	2011-05-06 22:08:12.000000000 -0400
! +++ gradle-1.0/subprojects/jetty/jetty.gradle	2011-05-07 23:04:14.116944583 -0400
! @@ -21,14 +21,14 @@
!  
!      compile libraries.slf4j_api,
!              libraries.jetty_depends,
! -            "org.mortbay.jetty:jetty-plus:6.1.25 at jar"
! +            "org.mortbay.jetty:jetty6-plus:6.1.25 at jar"
!  
! -    runtime "org.mortbay.jetty:jsp-api-2.1:6.1.14 at jar",
! -            "org.mortbay.jetty:jsp-2.1:6.1.14 at jar",
! -            "org.eclipse.jdt:core:3.1.1 at jar",
! -            "org.mortbay.jetty:jetty-naming:6.1.25 at jar",
! -            "org.mortbay.jetty:jetty-annotations:6.1.25 at jar",
! -            "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0 at jar"
! +    runtime "org.mortbay.jetty:jsp_2_1_api:6.1.25 at jar",
! +            "org.mortbay.jetty:jsp_2_1_api:6.1.25 at jar",
! +            "org.eclipse.jdt:ecj:3.3.1 at jar",
! +            "org.mortbay.jetty:jetty6-naming:6.1.25 at jar",
! +            "org.mortbay.jetty:annotation_1_0_api:6.1.25 at jar",
! +            "org.apache.geronimo.specs:annotation_1_0_api:1.0 at jar"
!  
!      testCompile project(path: ':core', configuration: 'testFixtures')
!      testRuntime project(path: ':core', configuration: 'testFixturesRuntime')
! --- gradle-1.0/subprojects/osgi/osgi.gradle.orig	2011-05-06 22:08:12.000000000 -0400
! +++ gradle-1.0/subprojects/osgi/osgi.gradle	2011-05-08 00:09:02.511854459 -0400
! @@ -21,7 +21,7 @@
!      compile project(':plugins')
!      compile libraries.slf4j_api
!  
! -    compile 'biz.aQute:bndlib:1.15.0 at jar'
! +    compile 'biz.aQute:aqute-bndlib:1.15.0 at jar'
!  
!      testCompile project(path: ':core', configuration: 'testFixtures')
!      testRuntime project(path: ':core', configuration: 'testFixturesRuntime')
! --- gradle-1.0/subprojects/plugins/plugins.gradle.sav0	2011-05-09 13:04:56.000000000 -0400
! +++ gradle-1.0/subprojects/plugins/plugins.gradle	2011-05-10 14:37:13.452658415 -0400
! @@ -31,9 +31,9 @@
!              libraries.asm_all,
!              libraries.junit,
!              libraries.ant,
! -            'org.testng:testng:5.14.10'
! +            'org.testng:testng-jdk15:5.8'
!  
! -    reports 'css3-pie:css3-pie:1.0beta3'
! +    reports 'css3-pie:css3-pie:1.0beta3 at htc'
!      testCompile libraries.xmlunit, 'net.sourceforge.nekohtml:nekohtml:1.9.14'
   
       testCompile project(path: ':core', configuration: 'testFixtures')
! --- gradle-1.0/build.gradle.sav0	2011-05-10 23:44:27.000000000 -0400
! +++ gradle-1.0/build.gradle	2011-05-10 23:54:28.036899910 -0400
! @@ -55,15 +55,15 @@
           commons_lang: 'commons-lang:commons-lang:2.6 at jar',
           dom4j: 'dom4j:dom4j:1.6.1 at jar',
--- 1,19 ----
! --- gradle-1.0/subprojects/core-impl/core-impl.gradle.foo	2011-04-25 03:38:30.000000000 -0400
! +++ gradle-1.0/subprojects/core-impl/core-impl.gradle	2011-09-09 18:40:04.788427336 -0400
! @@ -10,8 +10,8 @@
!      compile "org.apache.maven:maven-ant-tasks:2.1.1 at jar"
!      compile "org.sonatype.pmaven:pmaven-common:0.8-20100325 at jar"
!      compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325 at jar"
! -    compile "org.codehaus.plexus:plexus-component-annotations:1.5.2 at jar"
! +    compile "org.codehaus.plexus:plexus-component-annotations:1.5.2 at jar"
   
+      testCompile libraries.junit
       testCompile project(path: ':core', configuration: 'testFixtures')
! -}
! \ No newline at end of file
! +}
! --- gradle-1.0/build.gradle.sav0	2011-04-25 03:38:30.000000000 -0400
! +++ gradle-1.0/build.gradle	2011-09-09 18:29:55.570450233 -0400
! @@ -53,8 +53,8 @@
           commons_lang: 'commons-lang:commons-lang:2.6 at jar',
           dom4j: 'dom4j:dom4j:1.6.1 at jar',
***************
*** 88,106 ****
  -        groovy: 'org.codehaus.groovy:groovy-all:1.7.10 at jar',
  -        ivy: 'org.apache.ivy:ivy:2.2.0 at jar',
! +        groovy: 'org.codehaus.groovy:groovy17-all:1.7.10 at jar',
  +        ivy: 'org.apache.ivy:apache-ivy:2.2.0 at jar',
           jaxen: 'jaxen:jaxen:1.1 at jar',
           slf4j_api: 'org.slf4j:slf4j-api:1.6.1 at jar',
           jcl_to_slf4j: 'org.slf4j:jcl-over-slf4j:1.6.1 at jar',
!          jul_to_slf4j: 'org.slf4j:jul-to-slf4j:1.6.1 at jar',
           log4j_to_slf4j: 'org.slf4j:log4j-over-slf4j:1.6.1 at jar',
! -        logback_classic: 'ch.qos.logback:logback-classic:0.9.28 at jar',
! -        logback_core: 'ch.qos.logback:logback-core:0.9.28 at jar',
! +        logback_classic: 'ch.qos.logback:classic:0.9.28 at jar',
! +        logback_core: 'ch.qos.logback:core:0.9.28 at jar',
!          jna: 'net.java.dev.jna:jna:3.2.2 at jar',
!          junit: 'junit:junit:4.8.2',
           xmlunit: 'xmlunit:xmlunit:1.3',
! @@ -82,9 +82,9 @@
           'org.objenesis:objenesis:1.2',
           'cglib:cglib-nodep:2.2']
--- 21,39 ----
  -        groovy: 'org.codehaus.groovy:groovy-all:1.7.10 at jar',
  -        ivy: 'org.apache.ivy:ivy:2.2.0 at jar',
! +        groovy: 'org.codehaus.groovy:groovy-all:1.7.10 at jar',
  +        ivy: 'org.apache.ivy:apache-ivy:2.2.0 at jar',
           jaxen: 'jaxen:jaxen:1.1 at jar',
           slf4j_api: 'org.slf4j:slf4j-api:1.6.1 at jar',
           jcl_to_slf4j: 'org.slf4j:jcl-over-slf4j:1.6.1 at jar',
! @@ -62,7 +62,7 @@
           log4j_to_slf4j: 'org.slf4j:log4j-over-slf4j:1.6.1 at jar',
!          logback_classic: 'ch.qos.logback:logback-classic:0.9.28 at jar',
!          logback_core: 'ch.qos.logback:logback-core:0.9.28 at jar',
! -        junit: 'junit:junit:4.8.2',
! +        junit: 'junit:junit4:4.8.2',
           xmlunit: 'xmlunit:xmlunit:1.3',
!  ]
!  
! @@ -79,9 +79,9 @@
           'org.objenesis:objenesis:1.2',
           'cglib:cglib-nodep:2.2']
***************
*** 115,166 ****
   allprojects {
       group = 'org.gradle'
! @@ -95,7 +95,7 @@
       }
   
       repositories {
  -        mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
! +        flatDir name: 'libs', dirs: [ System.getenv()['LOCAL_REPO'], '/usr/share/java', '/usr/share/java/ant', '/usr/share/java/jetty6', '/usr/share/java/logback', '/usr/share/java/maven-wagon', '/usr/share/java/objectweb-asm', '/usr/share/java/plexus', '/usr/share/java/slf4j', '/usr/share/java/slide' ]
       }
   
       version = this.version
! --- gradle-1.0/subprojects/sonar/sonar.gradle.sav0	2011-05-10 23:44:34.000000000 -0400
! +++ gradle-1.0/subprojects/sonar/sonar.gradle	2011-05-10 23:55:06.040767908 -0400
! @@ -28,6 +28,8 @@
   
!      compile "org.codehaus.sonar:sonar-batch-bootstrapper:2.6"
!      provided "org.codehaus.sonar:sonar-batch:2.6"
! +    provided "org.codehaus.sonar:sonar-plugin-api:2.6"
! +    provided "org.apache.commons:commons-configuration:1.6"
   
!      testCompile project(path: ':core', configuration: 'testFixtures')
   }
- --- gradle-1.0/subprojects/core-impl/core-impl.gradle.sav0	2011-05-12 16:33:01.000000000 -0400
- +++ gradle-1.0/subprojects/core-impl/core-impl.gradle	2011-05-13 01:14:37.775624742 -0400
- @@ -10,7 +10,7 @@
-      compile "org.apache.maven:maven-ant-tasks:2.1.1 at jar"
-      compile "org.sonatype.pmaven:pmaven-common:0.8-20100325 at jar"
-      compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325 at jar"
- -    compile "org.codehaus.plexus:plexus-component-annotations:1.5.2 at jar"
- +    compile "org.codehaus.plexus:containers-component-annotations:1.5.5 at jar"
   
!      testCompile libraries.junit
!      testCompile project(path: ':core', configuration: 'testFixtures')
! --- gradle-1.0/subprojects/maven/maven.gradle.orig	2011-05-12 16:33:03.000000000 -0400
! +++ gradle-1.0/subprojects/maven/maven.gradle	2011-05-13 02:38:11.869054731 -0400
! @@ -35,6 +35,11 @@
!      compile "org.sonatype.aether:aether-connector-file:$aetherVersion"
!      compile "org.sonatype.aether:aether-connector-asynchttpclient:$aetherVersion"
!      compile "org.sonatype.aether:aether-connector-wagon:$aetherVersion"
! +    compile "org.sonatype.aether:aether-spi:$aetherVersion"
! +    compile "org.apache.maven.wagon:wagon-provider-api:$wagonVersion"
! +    compile "org.apache.maven:maven-model:$mavenVersion"
! +    compile "org.apache.maven:maven-model-builder:$mavenVersion"
! +    compile "org.codehaus.plexus:containers-container-default:1.5.5"
!      compile "org.apache.maven:maven-aether-provider:$mavenVersion"
!      compile "org.apache.maven.wagon:wagon-ssh:$wagonVersion"
!      compile "org.apache.maven.wagon:wagon-http-lightweight:$wagonVersion"
! --- gradle-1.0/subprojects/docs/docs.gradle.sav0	2011-05-12 16:33:02.000000000 -0400
! +++ gradle-1.0/subprojects/docs/docs.gradle	2011-05-20 14:59:14.137574688 -0400
! @@ -36,7 +36,7 @@
       }
       userGuideTask 'xslthl:xslthl:2.0.1 at jar'
--- 48,111 ----
   allprojects {
       group = 'org.gradle'
! @@ -92,7 +92,7 @@
       }
   
       repositories {
  -        mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
! +        flatDir name: 'libs', dirs: [ System.getenv()['LOCAL_REPO'], '/usr/share/java', '/usr/share/java/ant', '/usr/share/java/jetty6', '/usr/share/java/jetty6/annotations', '/usr/share/java/logback', '/usr/share/java/maven-wagon', '/usr/share/java/objectweb-asm', '/usr/share/java/plexus', '/usr/share/java/slf4j', '/usr/share/java/slide' ]
       }
   
       version = this.version
! --- gradle-1.0/buildSrc/build.gradle.sav0	2011-04-25 03:38:30.000000000 -0400
! +++ gradle-1.0/buildSrc/build.gradle	2011-09-09 18:29:55.570450233 -0400
! @@ -15,21 +15,22 @@
!   */
   
!  apply plugin: 'groovy'
! -apply plugin: 'code-quality'
! +apply plugin: 'code-quality'
!  apply plugin: 'idea'
!  apply plugin: 'eclipse'
   
!  repositories {
! -    mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
! +    flatDir name: 'libs', dirs: [ System.getenv()['LOCAL_REPO'], '/usr/share/java' ]
   }
   
!  dependencies {
!      compile gradleApi()
!      compile 'com.google.collections:google-collections:1.0 at jar'
! +    //compile 'antlr:antlr:2.7.7 at jar'
!      groovy localGroovy()
! -    testCompile 'junit:junit:4.8.2 at jar'
! +    testCompile 'junit:junit4:4.8.2 at jar'
!      testCompile 'org.spockframework:spock-core:0.5-groovy-1.7 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
!  }
!  
!  apply from: '../gradle/compile.gradle'
! -apply from: '../gradle/codeQuality.gradle'
! +apply from: '../gradle/codeQuality.gradle'
! --- gradle-1.0/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java.sav0	2011-04-25 03:38:30.000000000 -0400
! +++ gradle-1.0/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java	2011-09-09 18:29:55.400463082 -0400
! @@ -126,9 +127,13 @@
!          }
!  
!          public void find(Iterable<Pattern> patterns, Collection<File> into) {
! -            for (File file : dir.listFiles()) {
! -                if (matches(patterns, file.getName())) {
! -                    into.add(file);
! +            if (dir == null || dir.listFiles() == null) {
! +                throw new RuntimeException("Installation error: " + dir + " does not exist or is not a directory.");
! +            } else {
! +                for (File file : dir.listFiles()) {
! +                    if (matches(patterns, file.getName())) {
! +                        into.add(file);
! +                    }
!                  }
!              }
!          }
! --- gradle-1.0/subprojects/docs/docs.gradle.sav0	2011-04-25 03:38:30.000000000 -0400
! +++ gradle-1.0/subprojects/docs/docs.gradle	2011-09-09 18:29:55.571450157 -0400
! @@ -35,7 +35,7 @@
       }
       userGuideTask 'xslthl:xslthl:2.0.1 at jar'
***************
*** 171,175 ****
   
   RemoteLocations remoteLocations = new RemoteLocations(version: version)
! @@ -97,7 +97,7 @@
       }
       from(zipTree(configurations.userGuideStyleSheets.singleFile)) {
--- 116,120 ----
   
   RemoteLocations remoteLocations = new RemoteLocations(version: version)
! @@ -96,7 +96,7 @@
       }
       from(zipTree(configurations.userGuideStyleSheets.singleFile)) {
***************
*** 180,181 ****
--- 125,175 ----
   }
   
+ --- gradle-1.0/subprojects/jetty/jetty.gradle.sav0	2011-04-25 03:38:30.000000000 -0400
+ +++ gradle-1.0/subprojects/jetty/jetty.gradle	2011-09-09 18:29:55.626446003 -0400
+ @@ -21,14 +21,14 @@
+  
+      compile libraries.slf4j_api,
+              libraries.jetty_depends,
+ -            "org.mortbay.jetty:jetty-plus:6.1.25 at jar"
+ +            "org.mortbay.jetty:jetty6-plus:6.1.25 at jar"
+  
+ -    runtime "org.mortbay.jetty:jsp-api-2.1:6.1.14 at jar",
+ -            "org.mortbay.jetty:jsp-2.1:6.1.14 at jar",
+ -            "org.eclipse.jdt:core:3.1.1 at jar",
+ -            "org.mortbay.jetty:jetty-naming:6.1.25 at jar",
+ -            "org.mortbay.jetty:jetty-annotations:6.1.25 at jar",
+ -            "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0 at jar"
+ +    runtime "org.mortbay.jetty:jsp_2_1_api:6.1.25 at jar",
+ +            "org.mortbay.jetty:jsp_2_1_api:6.1.25 at jar",
+ +            "org.eclipse.jdt:core:3.1.1 at jar",
+ +            "org.mortbay.jetty:jetty6-naming:6.1.25 at jar",
+ +            "org.mortbay.jetty:jetty6-annotations:6.1.25 at jar",
+ +            "org.jboss.javaee:jboss-javaee:5.0.1.GA at jar"
+  
+      testCompile project(path: ':core', configuration: 'testFixtures')
+      testRuntime project(path: ':core', configuration: 'testFixturesRuntime')
+ --- gradle-1.0/subprojects/plugins/plugins.gradle.sav0	2011-04-25 03:38:30.000000000 -0400
+ +++ gradle-1.0/subprojects/plugins/plugins.gradle	2011-09-09 18:29:55.659443509 -0400
+ @@ -31,9 +31,9 @@
+              libraries.asm_all,
+              libraries.junit,
+              libraries.ant,
+ -            'org.testng:testng:5.14.10'
+ +            'org.testng:testng:5.11'
+  
+ -    reports 'css3-pie:css3-pie:1.0beta3'
+ +    reports 'css3-pie:css3-pie:1.0beta3 at htc'
+      testCompile libraries.xmlunit, 'net.sourceforge.nekohtml:nekohtml:1.9.14'
+  
+      testCompile project(path: ':core', configuration: 'testFixtures')
+ --- gradle-1.0/subprojects/sonar/sonar.gradle.sav0	2011-04-25 03:38:30.000000000 -0400
+ +++ gradle-1.0/subprojects/sonar/sonar.gradle	2011-09-09 18:29:55.983419022 -0400
+ @@ -28,6 +28,8 @@
+  
+      compile "org.codehaus.sonar:sonar-batch-bootstrapper:2.6"
+      provided "org.codehaus.sonar:sonar-batch:2.6"
+ +    provided "org.codehaus.sonar:sonar-plugin-api:2.6"
+ +    provided "org.apache.commons:commons-configuration:1.6"
+  
+      testCompile project(path: ':core', configuration: 'testFixtures')
+  

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gradle/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** .cvsignore	21 May 2011 06:31:46 -0000	1.3
--- .cvsignore	16 Oct 2011 07:39:27 -0000	1.4
***************
*** 1,3 ****
! gradle-1.0-milestone-4-20110512131549+1000-bin.zip
! gradle-1.0.tar.bz2
  gradle-local-repo.tar.bz2
--- 1,3 ----
! gradle-1.0-milestone-3-all.zip
! gradle-1.0-milestone-3-src.zip
  gradle-local-repo.tar.bz2

--- NEW FILE: 22_checkstyle.diff ---
Description: Disable checkstyle features
 There is a conflict due to classpath issues with Checkstyle and ANTLR.
 While I debug this problem, checkstyle checks over Gradle source code are not
 performed.
Author: Miguel Landaeta <miguel at miguel.cc>
Forwarded: no
Last-Update: 2011-03-22

--- 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
 
 apply plugin: 'groovy'
-apply plugin: 'code-quality'
+//apply plugin: 'code-quality'
 apply plugin: 'idea'
 apply plugin: 'eclipse'
 
@@ -43,4 +43,4 @@ compileTestGroovy {
 }
 
 //apply from: '../gradle/compile.gradle'
-apply from: '../gradle/codeQuality.gradle'
+//apply from: '../gradle/codeQuality.gradle'




More information about the JPackage-commits mailing list