[gradle-1.12] 171/211: Fix: Won't build if not specify Groovy version
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Jul 1 14:18:47 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 a04ed845f9d617a56b1c156cbb05fa14845eb632
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Sun Jun 14 21:11:44 2015 +0800
Fix: Won't build if not specify Groovy version
---
debian/control | 9 ++---
debian/libgradle-core-java.links | 4 +--
debian/patches/use_local_artifacts.diff | 59 ++++++++++++++++-----------------
3 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/debian/control b/debian/control
index 8ffef49..efd8e12 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: ant,
default-jdk-doc,
docbook-xsl,
gradle (>= 1.5),
- groovy,
+ groovy (>= 1.8.6),
groovy-doc,
ivy,
javahelper,
@@ -44,7 +44,6 @@ Build-Depends: ant,
libjhighlight-java,
libjsch-java,
libjsoup-java,
- libjmock2-java,
libjna-java,
libjna-posix-java,
libjs-jquery,
@@ -54,6 +53,7 @@ Build-Depends: ant,
libmaven2-core-java-doc,
libnative-platform-java (>= 0.10),
libnekohtml-java,
+ libobjenesis-java,
libpegdown-java,
libplexus-containers1.5-java,
libpolyglot-maven-java,
@@ -78,7 +78,7 @@ Homepage: http://gradle.org
Package: gradle
Architecture: all
Depends: default-jre-headless (>= 1:1.6),
- groovy (>= 1.8),
+ groovy (>= 1.8.6),
libcommons-io-java,
libdom4j-java,
libgradle-core-java (>= ${binary:Version}),
@@ -101,7 +101,7 @@ Description: Groovy based build system
Package: libgradle-core-java
Architecture: all
Depends: ant,
- groovy (>= 1.8),
+ groovy (>= 1.8.6),
ivy,
libasm4-java (>= 5),
libatinject-jsr330-api-java,
@@ -163,6 +163,7 @@ Depends: ant-optional,
libjetty-java,
libjetty-extra-java,
libmaven-ant-tasks-java,
+ libobjenesis-java,
libplexus-containers1.5-java,
libpolyglot-maven-java,
librhino-java,
diff --git a/debian/libgradle-core-java.links b/debian/libgradle-core-java.links
index f4e8287..6c5cb65 100644
--- a/debian/libgradle-core-java.links
+++ b/debian/libgradle-core-java.links
@@ -10,7 +10,7 @@ usr/share/java/commons-collections3.jar usr/share/gradle/lib/com
usr/share/java/commons-io.jar usr/share/gradle/lib/commons-io.jar
usr/share/java/commons-lang.jar usr/share/gradle/lib/commons-lang.jar
usr/share/java/gradle-base-services-1.12.jar usr/share/gradle/lib/gradle-base-services-1.12.jar
-usr/share/java/gradle-base-services-groovy-1.12.jar usr/share/gralde/lib/gradle-base-services-groovy-1.12.jar
+usr/share/java/gradle-base-services-groovy-1.12.jar usr/share/gradle/lib/gradle-base-services-groovy-1.12.jar
usr/share/java/gradle-cli-1.12.jar usr/share/gradle/lib/gradle-cli-1.12.jar
usr/share/java/gradle-core-1.12.jar usr/share/gradle/lib/gradle-core-1.12.jar
usr/share/java/gradle-messaging-1.12.jar usr/share/gradle/lib/gradle-messaging-1.12.jar
@@ -19,7 +19,7 @@ usr/share/java/gradle-open-api-1.12.jar usr/share/gradle/lib/gra
usr/share/java/gradle-resources-1.12.jar usr/share/gradle/lib/gradle-resources-1.12.jar
usr/share/java/gradle-tooling-api-1.12.jar usr/share/gradle/lib/gradle-tooling-api-1.12.jar
usr/share/java/gradle-wrapper-1.12.jar usr/share/gradle/lib/gradle-wrapper-1.12.jar
-usr/share/java/groovy-all.jar usr/share/gradle/lib/groovy-all.jar
+usr/share/java/groovy-all.jar usr/share/gradle/lib/groovy-all-1.8.6.jar
usr/share/java/guava.jar usr/share/gradle/lib/guava.jar
usr/share/java/httpclient.jar usr/share/gradle/lib/plugins/httpclient.jar
usr/share/java/httpcore.jar usr/share/gradle/lib/plugins/httpcore.jar
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index f454db8..4b2db32 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -12,19 +12,19 @@ Last-Update: 2015-06-14
+++ b/build.gradle
@@ -115,7 +115,7 @@
group = 'org.gradle'
-
+
repositories {
- maven { url 'http://repo.gradle.org/gradle/libs' }
+ flatDir { dirs "/usr/share/java/" }
}
}
-
+
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
@@ -30,21 +30,6 @@
apply plugin: 'jsoup'
apply plugin: 'javascript-base'
-
+
-repositories {
- javaScript.googleApis()
-
@@ -47,13 +47,13 @@ Last-Update: 2015-06-14
+++ b/buildSrc/build.gradle
@@ -21,13 +21,12 @@
apply plugin: 'eclipse'
-
+
repositories {
- maven { url 'http://repo.gradle.org/gradle/libs' }
- mavenCentral()
+ flatDir { dirs "/usr/share/java" }
}
-
+
dependencies {
compile gradleApi()
- compile 'com.google.guava:guava-jdk5:14.0.1 at jar'
@@ -66,7 +66,7 @@ Last-Update: 2015-06-14
@@ -25,16 +25,16 @@
dependency 'org.apache.ant:ant-launcher:1.9.3 at jar'
}
-
+
-libraries.asm = 'org.ow2.asm:asm-all:5.0_BETA at jar'
-libraries.commons_cli = 'commons-cli:commons-cli:1.2 at jar'
+libraries.asm = 'org.ow2.asm:asm4-all at jar'
@@ -83,12 +83,12 @@ Last-Update: 2015-06-14
libraries.jcip = "net.jcip:jcip-annotations:1.0 at jar"
-libraries.inject = dependencies.module('javax.inject:javax.inject:1')
+libraries.inject = dependencies.module('javax.inject:atinject-jsr330-api')
-
+
// Logging
libraries.slf4j_api = dependencies.module('org.slf4j:slf4j-api:1.7.5')
@@ -54,7 +54,7 @@
}
-
+
// Jetty
-libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211 at jar"
+libraries.servlet_api = "org.mortbay.jetty:servlet-api-2.5 at jar"
@@ -102,12 +102,12 @@ Last-Update: 2015-06-14
- dependency "org.samba.jcifs:jcifs:1.3.17 at jar"
+ dependency "org.samba.jcifs:jcifs at jar"
}
-
+
-libraries.maven_ant_tasks = dependencies.module("org.apache.maven:maven-ant-tasks:2.1.3") {
+libraries.maven_ant_tasks = dependencies.module("org.apache.maven:maven-ant-tasks") {
libraries.ant
}
-
+
libraries += [
ant_antlr: 'org.apache.ant:ant-antlr:1.9.3 at jar',
- antlr: 'antlr:antlr:2.7.7 at jar',
@@ -117,8 +117,7 @@ Last-Update: 2015-06-14
+ dom4j: 'dom4j:dom4j at jar',
+ guava: 'com.google.guava:guava at jar',
jsr305: 'com.google.code.findbugs:jsr305:1.3.9 at jar',
-- groovy: 'org.codehaus.groovy:groovy-all:1.8.6 at jar',
-+ groovy: 'org.codehaus.groovy:groovy-all at jar',
+ groovy: 'org.codehaus.groovy:groovy-all:1.8.6 at jar',
jaxen: 'jaxen:jaxen:1.1 at jar',
- jcip: "net.jcip:jcip-annotations:1.0 at jar",
+ jcip: "net.jcip:jcip-annotations at jar",
@@ -135,19 +134,19 @@ Last-Update: 2015-06-14
objenesis: 'org.objenesis:objenesis:1.2 at jar',
jsoup:'org.jsoup:jsoup:1.6.3'
]
-
+
-libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") {
- dependency "org.apache.maven:maven-settings:3.0.4 at jar"
- dependency "org.apache.maven:maven-settings-builder:3.0.4 at jar"
+libraries.maven3 = dependencies.module("org.apache.maven:maven3-core") {
+ dependency "org.apache.maven:maven3-settings at jar"
+ dependency "org.apache.maven:maven3-settings-builder at jar"
-
+
//plexus:
dependency "org.codehaus.plexus:plexus-utils:2.0.6 at jar"
@@ -111,27 +111,27 @@
dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3 at jar"
-
+
//core:
- dependency "org.apache.maven:maven-core:3.0.4 at jar"
- dependency "org.apache.maven:maven-model-builder:3.0.4 at jar"
@@ -155,7 +154,7 @@ Last-Update: 2015-06-14
+ dependency "org.apache.maven:maven3-core at jar"
+ dependency "org.apache.maven:maven3-model-builder at jar"
+ dependency "org.apache.maven:maven3-model at jar"
-
+
//somewhat core:
- dependency "org.apache.maven:maven-artifact:3.0.4 at jar"
- dependency "org.apache.maven:maven-compat:3.0.4 at jar"
@@ -167,12 +166,12 @@ Last-Update: 2015-06-14
+ dependency "org.apache.maven:maven3-repository-metadata at jar"
+ dependency "org.apache.maven:maven3-plugin-api at jar"
+ dependency "org.apache.maven:maven3-aether-provider at jar"
-
+
dependency 'org.apache.maven.wagon:wagon-http:2.4 at jar'
dependency 'org.apache.maven.wagon:wagon-provider-api:2.4 at jar'
- dependency 'org.apache.maven.wagon:wagon-http-shared4:2.4 at jar'
+ dependency 'org.apache.maven.wagon:wagon-http-shared:2.4 at jar'
-
+
//eather:
- dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
- dependency "org.sonatype.aether:aether-impl:1.13.1 at jar"
@@ -185,7 +184,7 @@ Last-Update: 2015-06-14
+ dependency "org.sonatype.aether:aether-util at jar"
+ dependency 'org.sonatype.aether:aether-connector-wagon at jar'
}
-
+
libraries.spock = [
@@ -149,4 +149,4 @@
libraries.objenesis,
@@ -203,7 +202,7 @@ Last-Update: 2015-06-14
compile libraries.nekohtml
+ compile libraries.xerces
runtime libraries.xbean //maven3 classes dependency
-
+
compile fileTree("$buildDir/libs/jarjar") {
@@ -63,7 +64,7 @@
//I'm removing the components.xml file from the sec-dispatcher jar.
@@ -218,18 +217,18 @@ Last-Update: 2015-06-14
+++ b/subprojects/jetty/jetty.gradle
@@ -31,14 +31,12 @@
}
-
+
runtime module("org.mortbay.jetty:jsp-2.1:6.1.14") {
- dependency "org.eclipse.jdt:core:3.1.1 at jar"
dependency "org.mortbay.jetty:jsp-api-2.1:6.1.14 at jar"
dependency libraries.jetty_util
dependency libraries.servlet_api
}
-
+
runtime "org.mortbay.jetty:jetty-annotations:6.1.25 at jar"
- runtime "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0 at jar"
}
-
+
useTestFixtures()
\ No newline at end of file
--- a/subprojects/code-quality/code-quality.gradle
@@ -259,20 +258,20 @@ Last-Update: 2015-06-14
@@ -21,8 +21,8 @@
compile project(":plugins")
compile project(":maven")
-
+
- compile module("org.bouncycastle:bcpg-jdk15:1.46") {
- dependency "org.bouncycastle:bcprov-jdk15:1.46 at jar"
+ compile module("org.bouncycastle:bcpg") {
+ dependency "org.bouncycastle:bcprov at jar"
}
}
-
+
--- a/subprojects/javascript/javascript.gradle
+++ b/subprojects/javascript/javascript.gradle
@@ -17,7 +17,7 @@
dependencies {
compile libraries.groovy
-
+
- compile "org.mozilla:rhino:1.7R3"
+ compile "rhino:js"
compile libraries.gson // used by JsHint
@@ -288,17 +287,17 @@ Last-Update: 2015-06-14
+ publishCompile 'com.esotericsoftware.kryo:kryo'
testCompile libraries.groovy
}
-
+
--- a/subprojects/osgi/osgi.gradle
+++ b/subprojects/osgi/osgi.gradle
@@ -21,7 +21,7 @@
compile project(':plugins')
compile libraries.slf4j_api
-
+
- compile module('biz.aQute.bnd:bndlib:2.1.0')
+ compile module('biz.aQute.bnd:bndlib')
}
-
+
useTestFixtures()
--- a/subprojects/reporting/reporting.gradle
+++ b/subprojects/reporting/reporting.gradle
@@ -308,6 +307,6 @@ Last-Update: 2015-06-14
compile project(':core')
- compile 'com.googlecode.jatl:jatl:0.2.2'
+ compile 'com.googlecode.jatl:jatl'
-
+
testCompile libraries.jsoup
integTestRuntime project(':codeQuality')
--
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