[gradle-1.12] 29/211: Refresh patches
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Jul 1 14:17:55 UTC 2015
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 34e6651c3462437b4f3b73ca95481e7d0f18d89f
Author: Miguel Landaeta <miguel at miguel.cc>
Date: Mon May 23 19:29:05 2011 -0430
Refresh patches
---
debian/patches/01_use_debian_jars.diff | 295 +++++++++++++++------------------
debian/patches/02_sonar.diff | 28 ++++
debian/patches/03_plexus.diff | 6 +-
debian/patches/04_webdavlib.diff | 19 ++-
debian/patches/05_polyglot_maven.diff | 108 ++++++------
debian/patches/11_fix_jni_path.diff | 31 ++++
debian/patches/21_docs.diff | 38 ++---
debian/patches/series | 2 +
8 files changed, 280 insertions(+), 247 deletions(-)
diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff
index 944afc9..b27edfe 100644
--- a/debian/patches/01_use_debian_jars.diff
+++ b/debian/patches/01_use_debian_jars.diff
@@ -1,44 +1,76 @@
Description: Build Gradle using libraries available in Debian
Author: Miguel Landaeta <miguel at miguel.cc>
Forwarded: no
-Last-Update: 2011-03-22
+Last-Update: 2011-05-22
---- gradle-0.9.2.orig/build.gradle
-+++ gradle-0.9.2/build.gradle
-@@ -16,6 +16,7 @@
+--- gradle-1.0~m3.orig/buildSrc/build.gradle
++++ gradle-1.0~m3/buildSrc/build.gradle
+@@ -13,6 +13,7 @@
+ * 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'
+@@ -20,7 +21,12 @@ apply plugin: 'idea'
+ apply plugin: 'eclipse'
+ repositories {
+- mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
++ //mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
++ add(new FileSystemResolver()) {
++ name = 'repo'
++ addArtifactPattern "/usr/share/java/[module]-[revision].[ext]"
++ addArtifactPattern "/usr/share/java/[module].[ext]"
++ }
+ }
+
+ dependencies {
+@@ -28,8 +34,14 @@ dependencies {
+ compile 'com.google.collections:google-collections:1.0 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'
++ //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'
++// All tests for this subproject are disabled because they depend on Spock
++// Framework and that software is not available in Debian yet.
++compileTestGroovy {
++ exclude '**'
++}
++
++//apply from: '../gradle/compile.gradle'
+ apply from: '../gradle/codeQuality.gradle'
+--- gradle-1.0~m3.orig/build.gradle
++++ gradle-1.0~m3/build.gradle
+@@ -20,6 +20,7 @@ import org.gradle.build.Install
+ import org.gradle.build.Git
import java.util.jar.Attributes
- import org.gradle.api.artifacts.repositories.WebdavResolver
-+import org.apache.ivy.plugins.resolver.FileSystemResolver
import org.gradle.api.internal.artifacts.dependencies.DefaultSelfResolvingDependency
++import org.apache.ivy.plugins.resolver.FileSystemResolver
- import org.gradle.build.samples.WrapperProjectCreator
-@@ -44,28 +45,29 @@ startScriptsDir = new File("$buildDir/st
- archivesBaseName = 'gradle'
-
- libraries = [
-- ant: 'org.apache.ant:ant:1.8.1 at jar',
-- ant_junit: 'org.apache.ant:ant-junit:1.8.1 at jar',
-- ant_launcher: 'org.apache.ant:ant-launcher:1.8.1 at jar',
-- ant_nodeps: 'org.apache.ant:ant-nodeps:1.8.1 at jar',
-- ant_antlr: 'org.apache.ant:ant-antlr:1.8.1 at jar',
-+ ant: 'org.apache.ant:ant:1.8.0 at jar',
-+ ant_junit: 'org.apache.ant:ant-junit:1.8.0 at jar',
-+ ant_launcher: 'org.apache.ant:ant-launcher:1.8.0 at jar',
-+ ant_nodeps: 'org.apache.ant:ant-nodeps:1.8.0 at jar',
-+ ant_trax: 'org.apache.ant:ant-trax:1.8.0 at jar',
-+ ant_antlr: 'org.apache.ant:ant-antlr:1.8.0 at jar',
+ /**
+ * For building Gradle you usually don't need to specify any properties. Only certain functionality of the Gradle requires
+@@ -47,22 +48,25 @@ libraries = [
+ ant_launcher: 'org.apache.ant:ant-launcher:1.8.2 at jar',
+ ant_antlr: 'org.apache.ant:ant-antlr:1.8.2 at jar',
antlr: 'antlr:antlr:2.7.7 at jar',
-- asm_all: 'asm:asm-all:3.2 at jar',
+- asm_all: 'asm:asm-all:3.3.1 at jar',
+ asm_all: 'asm:asm3-all:3.2 at jar',
commons_cli: 'commons-cli:commons-cli:1.2 at jar',
commons_io: 'commons-io:commons-io:1.4 at jar',
-- commons_lang: 'commons-lang:commons-lang:2.5 at jar',
+- commons_lang: 'commons-lang:commons-lang:2.6 at jar',
+ commons_lang: 'commons-lang:commons-lang:2.4 at jar',
dom4j: 'dom4j:dom4j:1.6.1 at jar',
- google_collections: 'com.google.collections:google-collections:1.0 at jar',
-- groovy: 'org.codehaus.groovy:groovy-all:1.7.6 at jar',
-+ groovy: 'org.codehaus.groovy:groovy-all:1.7.9 at jar',
+- guava: 'com.google.guava:guava:r08 at jar',
++ // Guava is a super set of Google Collections library,
++ // it can be used until Guava is packaged
++ //guava: 'com.google.guava:guava:r08 at jar',
++ guava: 'com.google.guava:google-collections:1.0 at jar',
+ groovy: 'org.codehaus.groovy:groovy-all:1.7.10 at jar',
ivy: 'org.apache.ivy:ivy:2.2.0 at jar',
- jaxen: 'jaxen:jaxen:1.1 at jar',
+ jaxen: 'jaxen:jaxen:1.1.2 at jar',
@@ -46,16 +78,14 @@ Last-Update: 2011-03-22
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.24 at jar',
-- logback_core: 'ch.qos.logback:logback-core:0.9.24 at jar',
-- junit: 'junit:junit:4.8.1',
-+ 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: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',
]
-@@ -82,9 +84,9 @@ libraries.jmock = ['org.jmock:jmock:2.5.
+@@ -79,9 +83,9 @@ libraries.jmock = ['org.jmock:jmock:2.5.
'org.objenesis:objenesis:1.2',
'cglib:cglib-nodep:2.2']
libraries.groovy_depends = [libraries.groovy, libraries.commons_cli]
@@ -68,11 +98,12 @@ Last-Update: 2011-03-22
allprojects {
group = 'org.gradle'
-@@ -95,7 +97,11 @@ allprojects {
+@@ -92,7 +96,12 @@ allprojects {
}
repositories {
-- mavenRepo(urls: 'http://gradle.artifactoryonline.com/gradle/libs')
+- mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
++ //mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
+ add(new FileSystemResolver()) {
+ name = 'repo'
+ addArtifactPattern "/usr/share/java/[module]-[revision].[ext]"
@@ -81,155 +112,102 @@ Last-Update: 2011-03-22
}
version = this.version
---- gradle-0.9.2.orig/buildSrc/build.gradle
-+++ gradle-0.9.2/buildSrc/build.gradle
-@@ -13,6 +13,7 @@
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-+import org.apache.ivy.plugins.resolver.FileSystemResolver
+--- gradle-1.0~m3.orig/subprojects/plugins/plugins.gradle
++++ gradle-1.0~m3/subprojects/plugins/plugins.gradle
+@@ -31,9 +31,9 @@ dependencies {
+ libraries.asm_all,
+ libraries.junit,
+ libraries.ant,
+- 'org.testng:testng:5.14.10'
++ 'org.testng:testng:5.11'
- apply plugin: 'groovy'
- apply plugin: 'code-quality'
-@@ -20,7 +21,11 @@ apply plugin: 'idea'
- apply plugin: 'eclipse'
+- reports 'css3-pie:css3-pie:1.0beta3'
++ //reports 'css3-pie:css3-pie:1.0beta3'
+ testCompile libraries.xmlunit, 'net.sourceforge.nekohtml:nekohtml:1.9.14'
- 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]"
-+ }
- }
+ testCompile project(path: ':core', configuration: 'testFixtures')
+--- gradle-1.0~m3.orig/subprojects/code-quality/code-quality.gradle
++++ gradle-1.0~m3/subprojects/code-quality/code-quality.gradle
+@@ -30,7 +30,7 @@ dependencies {
+ runtime "com.puppycrawl.tools:checkstyle:5.3 at jar",
+ libraries.guava,
+ libraries.antlr,
+- "commons-beanutils:commons-beanutils-core:1.8.3 at jar"
++ "commons-beanutils:commons-beanutils:1.8.3 at jar"
- dependencies {
-@@ -28,8 +33,14 @@ dependencies {
- compile 'com.google.collections:google-collections:1.0 at jar'
- groovy localGroovy()
- testCompile 'junit:junit:4.8.1 at jar'
-- testCompile 'org.spockframework:spock-core:0.5-groovy-1.7 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
-+ //testCompile 'org.spockframework:spock-core:0.5-groovy-1.7 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
- }
+ testCompile project(path: ':core', configuration: 'testFixtures')
+ testRuntime project(path: ':core', configuration: 'testFixturesRuntime')
+--- gradle-1.0~m3.orig/subprojects/core-impl/core-impl.gradle
++++ gradle-1.0~m3/subprojects/core-impl/core-impl.gradle
+@@ -10,8 +10,19 @@ dependencies {
+ 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"
++ 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"
++ compile "org.codehaus.plexus:plexus-utils:1.5.15 at jar"
++ compile "org.apache.maven:maven-model:2.2.1 at jar"
++ compile "org.apache.maven:maven-settings:2.2.1 at jar"
++ compile "org.apache.maven:maven-project:2.2.1 at jar"
++ compile "org.apache.maven:maven-artifact:2.2.1 at jar"
++ compile "org.apache.maven:maven-artifact-manager:2.2.1 at jar"
++ compile "org.apache.maven:maven-settings:2.2.1 at jar"
++ compile "org.apache.maven.wagon:wagon-provider-api:1.0-beta-6 at jar"
++
--apply from: '../gradle/compile.gradle'
-+// All tests for this subproject are disabled because they depend on Spock
-+// Framework and that software is not available in Debian yet.
-+compileTestGroovy {
-+ exclude '**'
+ testCompile libraries.junit
+ testCompile project(path: ':core', configuration: 'testFixtures')
+-}
+\ No newline at end of file
+}
-+
-+//apply from: '../gradle/compile.gradle'
- apply from: '../gradle/codeQuality.gradle'
---- gradle-0.9.2.orig/subprojects/core/core.gradle
-+++ gradle-0.9.2/subprojects/core/core.gradle
-@@ -36,31 +36,41 @@ configurations {
+--- gradle-1.0~m3.orig/subprojects/core/core.gradle
++++ gradle-1.0~m3/subprojects/core/core.gradle
+@@ -36,7 +36,7 @@ configurations {
dependencies {
groovy libraries.groovy_depends
- compile "commons-httpclient:commons-httpclient:3.0 at jar", "commons-codec:commons-codec:1.2 at jar", libraries.jcl_to_slf4j
-+ compile "commons-httpclient:commons-httpclient:3.0 at jar", "commons-codec:commons-codec:1.4 at jar", libraries.jcl_to_slf4j
++ compile "commons-httpclient:commons-httpclient:3.1 at jar", "commons-codec:commons-codec:1.5 at jar", libraries.jcl_to_slf4j
compile libraries.ivy, "com.jcraft:jsch:0.1.42 at jar", 'com.jcraft:jzlib:1.0.7 at jar'
- compile libraries.ant,
- libraries.ant_nodeps,
-+ libraries.ant_trax,
- libraries.logback_classic,
- libraries.logback_core,
- libraries.slf4j_api,
+@@ -48,15 +48,15 @@ dependencies {
libraries.jul_to_slf4j,
libraries.commons_io,
libraries.commons_lang,
- "commons-codec:commons-codec:1.2 at jar",
-+ "commons-codec:commons-codec:1.4 at jar",
- libraries.google_collections,
++ "commons-codec:commons-codec:1.5 at jar",
+ libraries.guava,
- "commons-collections:commons-collections:3.2.1 at jar",
+ "commons-collections:commons-collections3:3.2.1 at jar",
"slide:webdavlib:2.0 at jar",
-- "org.apache.maven:maven-ant-tasks:2.1.1 at jar",
-+ "org.apache.maven:maven-ant-tasks:2.0.10 at jar",
libraries.asm_all,
- 'org.fusesource.jansi:jansi:1.2.1',
-- 'org.jruby.ext.posix:jna-posix:1.0.3',
+- '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 at jar',
- 'org.sonatype.pmaven:pmaven-groovy:0.8-20100325 at 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.codehaus.plexus:plexus-utils:1.5.15',
-+ 'org.apache.maven:maven-model:2.2.1',
-+ 'org.apache.maven:maven-settings:2.2.1',
-+ 'org.apache.maven:maven-project:2.2.1',
-+ 'org.apache.maven:maven-artifact:2.2.1',
-+ 'org.apache.maven:maven-artifact-manager:2.2.1',
-+ 'org.apache.maven:maven-settings:2.2.1',
-+ 'org.apache.maven.wagon:wagon-provider-api:1.0-beta-6'
++ 'org.jruby.ext.posix:jna-posix:1.0.1'
- runtime 'net.java.dev.jna:jna:3.2.2'
-+ runtime 'net.java.dev.jna:jna:3.2.4'
++ runtime 'net.java.dev.jna:jna:3.2.7'
runtime libraries.log4j_to_slf4j, libraries.jcl_to_slf4j
---- gradle-0.9.2.orig/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java
-+++ gradle-0.9.2/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java
-@@ -60,7 +60,7 @@ public abstract class AbstractClassPathP
+--- gradle-1.0~m3.orig/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java
++++ gradle-1.0~m3/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java
+@@ -63,7 +63,8 @@ public abstract class AbstractClassPathP
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 + "-.+"));
+ patterns.add(Pattern.compile(patternString + "-?.*"));
}
return patterns;
}
---- gradle-0.9.2.orig/subprojects/wrapper/wrapper.gradle
-+++ gradle-0.9.2/subprojects/wrapper/wrapper.gradle
-@@ -19,7 +19,7 @@ dependencies {
- groovy libraries.groovy_depends
- compile project(':core')
-
-- compile libraries.commons_io, libraries.ant, libraries.ant_nodeps
-+ compile libraries.commons_io, libraries.ant, libraries.ant_nodeps, libraries.ant_trax
-
- testCompile project(path: ':core', configuration: 'testFixtures')
- testRuntime project(path: ':core', configuration: 'testFixturesRuntime')
---- gradle-0.9.2.orig/subprojects/osgi/osgi.gradle
-+++ gradle-0.9.2/subprojects/osgi/osgi.gradle
-@@ -13,10 +13,6 @@
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--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 at jar'
-+ compile 'biz.aQute:bnd:0.0.384 at jar'
-
- testCompile project(path: ':core', configuration: 'testFixtures')
- testRuntime project(path: ':core', configuration: 'testFixturesRuntime')
---- gradle-0.9.2.orig/subprojects/plugins/plugins.gradle
-+++ gradle-0.9.2/subprojects/plugins/plugins.gradle
-@@ -33,7 +33,7 @@ dependencies {
-
- // This is for the ant junit task. Without it, we get file locking problems with some jvms because the default
- // transformer does not close files
-- runtime 'xalan:xalan:2.7.1'
-+ runtime 'xalan:xalan2:2.7.1'
-
- testCompile libraries.xmlunit
-
---- gradle-0.9.2.orig/subprojects/jetty/jetty.gradle
-+++ gradle-0.9.2/subprojects/jetty/jetty.gradle
+--- gradle-1.0~m3.orig/subprojects/jetty/jetty.gradle
++++ gradle-1.0~m3/subprojects/jetty/jetty.gradle
@@ -21,14 +21,12 @@ dependencies {
compile libraries.slf4j_api,
@@ -250,23 +228,14 @@ Last-Update: 2011-03-22
testCompile project(path: ':core', configuration: 'testFixtures')
testRuntime project(path: ':core', configuration: 'testFixturesRuntime')
---- gradle-0.9.2.orig/subprojects/code-quality/code-quality.gradle
-+++ gradle-0.9.2/subprojects/code-quality/code-quality.gradle
-@@ -19,7 +19,7 @@ dependencies {
- compile project(':core')
+--- gradle-1.0~m3.orig/subprojects/osgi/osgi.gradle
++++ gradle-1.0~m3/subprojects/osgi/osgi.gradle
+@@ -21,7 +21,7 @@ dependencies {
compile project(':plugins')
-
-- compile "org.codenarc:CodeNarc:0.12 at jar"
-+ compile "org.codenarc:CodeNarc:0.11 at jar"
compile libraries.slf4j_api
- // CodeNarc dependencies
-@@ -30,7 +30,7 @@ dependencies {
- runtime "com.puppycrawl.tools:checkstyle:5.3 at jar",
- libraries.google_collections,
- libraries.antlr,
-- "commons-beanutils:commons-beanutils-core:1.8.3 at jar"
-+ "commons-beanutils:commons-beanutils:1.8.3 at jar"
+- compile 'biz.aQute:bndlib:1.15.0 at jar'
++ compile 'biz.aQute:bnd:0.0.384 at jar'
testCompile project(path: ':core', configuration: 'testFixtures')
testRuntime project(path: ':core', configuration: 'testFixturesRuntime')
diff --git a/debian/patches/02_sonar.diff b/debian/patches/02_sonar.diff
new file mode 100644
index 0000000..90e3dbd
--- /dev/null
+++ b/debian/patches/02_sonar.diff
@@ -0,0 +1,28 @@
+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 ->
diff --git a/debian/patches/03_plexus.diff b/debian/patches/03_plexus.diff
index c2a93b6..a5f139d 100644
--- a/debian/patches/03_plexus.diff
+++ b/debian/patches/03_plexus.diff
@@ -3,10 +3,10 @@ Author: Miguel Landaeta <miguel at miguel.cc>
Forwarded: no
Last-Update: 2010-08-23
-Index: b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java
+Index: b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java
===================================================================
---- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java 2010-08-22 16:17:01.000000000 -0430
-+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java 2010-08-23 19:18:30.000000000 -0430
+--- 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();
diff --git a/debian/patches/04_webdavlib.diff b/debian/patches/04_webdavlib.diff
index 6f2acad..6f9b709 100644
--- a/debian/patches/04_webdavlib.diff
+++ b/debian/patches/04_webdavlib.diff
@@ -4,20 +4,21 @@ Description: Disable Jakarta Slide WebDAV library
Please see http://jakarta.apache.org/slide/.
Author: Miguel Landaeta <miguel at miguel.cc>
Forwarded: not-needed
-Last-Update: 2011-01-03
+Last-Update: 2011-05-10
---- gradle-0.9.1.orig/subprojects/core/core.gradle
-+++ gradle-0.9.1/subprojects/core/core.gradle
-@@ -52,7 +52,6 @@ dependencies {
- "commons-codec:commons-codec:1.4 at jar",
- libraries.google_collections,
+--- 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",
- "org.apache.maven:maven-ant-tasks:2.0.10 at jar",
++ //"slide:webdavlib:2.0 at jar",
libraries.asm_all,
'org.fusesource.jansi:jansi:1.4',
---- gradle-0.9.1.orig/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java
-+++ gradle-0.9.1/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java
+ '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;
diff --git a/debian/patches/05_polyglot_maven.diff b/debian/patches/05_polyglot_maven.diff
index 7b3f2a4..910dd70 100644
--- a/debian/patches/05_polyglot_maven.diff
+++ b/debian/patches/05_polyglot_maven.diff
@@ -2,21 +2,62 @@ 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-01-03
+Last-Update: 2011-05-21
---- gradle-0.9.1.orig/subprojects/core/core.gradle
-+++ gradle-0.9.1/subprojects/core/core.gradle
-@@ -56,8 +56,6 @@ dependencies {
- libraries.asm_all,
- 'org.fusesource.jansi:jansi:1.4',
- 'org.jruby.ext.posix:jna-posix:1.0.1',
-- 'org.sonatype.pmaven:pmaven-common:0.8-20100325 at jar',
-- 'org.sonatype.pmaven:pmaven-groovy:0.8-20100325 at jar',
- 'org.codehaus.plexus:plexus-component-annotations:1.0-beta-3.0.7',
- 'org.codehaus.plexus:plexus-component-api:1.0-alpha-22',
- 'org.codehaus.plexus:plexus-utils:1.5.15',
---- gradle-0.9.1.orig/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java
-+++ gradle-0.9.1/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java
+--- 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;
@@ -58,42 +99,3 @@ Last-Update: 2011-01-03
-}
\ No newline at end of file
+}
---- gradle-0.9.1.orig/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java
-+++ gradle-0.9.1/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java
-@@ -17,27 +17,31 @@ package org.gradle.api.internal.artifact
-
- import groovy.util.FactoryBuilderSupport;
- 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/11_fix_jni_path.diff b/debian/patches/11_fix_jni_path.diff
new file mode 100644
index 0000000..599ee1f
--- /dev/null
+++ b/debian/patches/11_fix_jni_path.diff
@@ -0,0 +1,31 @@
+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()) {
diff --git a/debian/patches/21_docs.diff b/debian/patches/21_docs.diff
index 3adfc4c..3f0b787 100644
--- a/debian/patches/21_docs.diff
+++ b/debian/patches/21_docs.diff
@@ -3,20 +3,20 @@ Description: Generate javadocs and groovydocs only
using DocBook and other libraries available in Debian.
Author: Miguel Landaeta <miguel at miguel.cc>
Forwarded: no
-Last-Update: 2011-03-22
+Last-Update: 2011-05-10
---- gradle-0.9.2.orig/build.gradle
-+++ gradle-0.9.2/build.gradle
-@@ -365,7 +365,7 @@ zipRootFolder = "$archivesBaseName-${->
-
- binDistImage = copySpec {
- from 'src/toplevel'
+--- 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
-@@ -391,14 +391,16 @@ allDistImage = copySpec {
+@@ -422,14 +422,16 @@ allDistImage = copySpec {
}
}
@@ -35,9 +35,9 @@ Last-Update: 2011-03-22
classifier = 'bin'
into(zipRootFolder) {
with binDistImage
-@@ -508,7 +510,8 @@ def guessMaxForks() {
+@@ -495,7 +497,8 @@ def guessMaxForks() {
- task testedDists(dependsOn: [assemble, check, integTest, embeddedIntegTest, 'openApi:integTest', ':ui:integTest'])
+ task testedDists(dependsOn: [assemble, check, integTests])
-task nightlyBuild(dependsOn: [clean, testedDists, ':docs:uploadDocs'])
+//task nightlyBuild(dependsOn: [clean, testedDists, ':docs:uploadDocs'])
@@ -45,27 +45,27 @@ Last-Update: 2011-03-22
task install(type: Install) {
description = 'Installs the minimal distribution into directory $gradle_installPath'
-@@ -583,7 +586,8 @@ task releaseArtifacts {
+@@ -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, uploadDists
++ dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadArchives, uploadDists
}
task wrapper(type: Wrapper) {
---- gradle-0.9.2.orig/subprojects/docs/docs.gradle
-+++ gradle-0.9.2/subprojects/docs/docs.gradle
+--- gradle-1.0~m3.orig/subprojects/docs/docs.gradle
++++ gradle-1.0~m3/subprojects/docs/docs.gradle
@@ -28,6 +28,7 @@ configurations {
userGuideTask
}
+/*
dependencies {
- ftpAntTask module("org.apache.ant:ant-commons-net:1.7.0") {
- module("commons-net:commons-net:1.4.1") {
-@@ -43,6 +44,7 @@ dependencies {
+ 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'
}
@@ -73,7 +73,7 @@ Last-Update: 2011-03-22
RemoteLocations remoteLocations = new RemoteLocations(version: version)
-@@ -100,10 +102,10 @@ task userguideStyleSheets(type: Copy) {
+@@ -94,10 +96,10 @@ task userguideStyleSheets(type: Copy) {
from(cssSrcDir) {
include '*.css'
}
@@ -88,7 +88,7 @@ Last-Update: 2011-03-22
}
task samplesDocbook(type: AssembleSamplesDocTask) {
-@@ -337,7 +339,8 @@ task userguide {
+@@ -332,7 +334,8 @@ task userguide {
}
task docs {
diff --git a/debian/patches/series b/debian/patches/series
index 8fbb391..2c6409a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,9 @@
01_use_debian_jars.diff
+02_sonar.diff
03_plexus.diff
04_webdavlib.diff
05_polyglot_maven.diff
10_fix_version.diff
+11_fix_jni_path.diff
21_docs.diff
22_checkstyle.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git
More information about the pkg-java-commits
mailing list