[gradle] 01/01: Removed unnecessary changes performed by use_local_artifacts.diff
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Mar 3 12:21:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository gradle.
commit 60325b4bfc02cd07be8ed291d8958c41b9ad9596
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Mar 3 13:21:26 2016 +0100
Removed unnecessary changes performed by use_local_artifacts.diff
---
debian/changelog | 1 +
debian/patches/disable_tests.diff | 2 +-
debian/patches/jcommander.diff | 2 +-
debian/patches/maven-3.3-compatibility.patch | 4 +-
debian/patches/use_local_artifacts.diff | 118 +++++----------------------
5 files changed, 26 insertions(+), 101 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 084c833..4e7903a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ gradle (2.10-2) UNRELEASED; urgency=medium
* Moved aether dependencies changes to eclipse-aether.diff
* Merged maven-aether-provider.diff into eclipse-aether.diff
* Merged maven_builder_support.diff into maven-3.3.9-compatibility.patch
+ * Removed unnecessary changes performed by use_local_artifacts.diff
* Standards-Version updated to 3.9.7 (no changes)
* Use a secure Vcs-Git URL
diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff
index 6d7d5f7..21c620c 100644
--- a/debian/patches/disable_tests.diff
+++ b/debian/patches/disable_tests.diff
@@ -268,7 +268,7 @@ Last-Update: 2015-09-30
--- a/subprojects/reporting/reporting.gradle
+++ b/subprojects/reporting/reporting.gradle
@@ -14,8 +14,6 @@
- compile 'com.googlecode.jatl:jatl'
+ compile 'com.googlecode.jatl:jatl:0.2.2'
testCompile libraries.jsoup
- integTestRuntime project(':codeQuality')
diff --git a/debian/patches/jcommander.diff b/debian/patches/jcommander.diff
index 658da57..35a7d3a 100644
--- a/debian/patches/jcommander.diff
+++ b/debian/patches/jcommander.diff
@@ -15,7 +15,7 @@ Last-Update: 2015-09-30
--- a/subprojects/antlr/antlr.gradle
+++ b/subprojects/antlr/antlr.gradle
@@ -22,6 +22,7 @@
- provided "antlr:antlr"
+ provided "antlr:antlr:2.7.7 at jar"
compile libraries.slf4j_api
+ compile "com.beust:jcommander"
diff --git a/debian/patches/maven-3.3-compatibility.patch b/debian/patches/maven-3.3-compatibility.patch
index 629b7ae..5d924f7 100644
--- a/debian/patches/maven-3.3-compatibility.patch
+++ b/debian/patches/maven-3.3-compatibility.patch
@@ -7,7 +7,7 @@ Forwarded: no
dependency "org.codehaus.plexus:plexus-utils:2.0.6 at jar"
dependency "org.codehaus.plexus:plexus-interpolation:1.14 at jar"
dependency "org.codehaus.plexus:plexus-component-annotations-1.5"
-- dependency "org.codehaus.plexus:plexus-container-default-1.5"
+- dependency "org.codehaus.plexus:plexus-container-default:1.5.5 at jar"
- dependency "org.codehaus.plexus:plexus-classworlds:2.4 at jar"
+ dependency "org.codehaus.plexus:plexus-classworlds2"
+
@@ -18,7 +18,7 @@ Forwarded: no
+ dependency "aopalliance:aopalliance"
//sonatype plexus
- dependency "org.sonatype.plexus:plexus-cipher"
+ dependency "org.sonatype.plexus:plexus-cipher:1.7 at jar"
@@ -117,6 +122,7 @@
dependency "org.apache.maven:maven3-compat"
dependency "org.apache.maven:maven3-model-builder"
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index fa71b5a..9b54a10 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -54,59 +54,29 @@ Last-Update: 2015-07-08
apply from: '../gradle/taskOrdering.gradle'
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
-@@ -25,42 +25,42 @@
-
- versions.bouncycastle = "1.51"
-
--libraries.ant = dependencies.module('org.apache.ant:ant:1.9.3') {
-- dependency 'org.apache.ant:ant-launcher:1.9.3 at jar'
-+libraries.ant = dependencies.module('org.apache.ant:ant') {
-+ dependency 'org.apache.ant:ant-launcher'
+@@ -29,18 +29,18 @@
+ dependency 'org.apache.ant:ant-launcher:1.9.3 at jar'
}
-libraries.asm = 'org.ow2.asm:asm-all:5.0.3'
--libraries.bndlib = dependencies.module('biz.aQute.bnd:bndlib:2.4.0')
--libraries.commons_cli = 'commons-cli:commons-cli:1.2 at jar'
+libraries.asm = 'org.ow2.asm:asm4-all'
-+libraries.bndlib = dependencies.module('biz.aQute.bnd:bndlib')
-+libraries.commons_cli = 'commons-cli:commons-cli'
+ libraries.bndlib = dependencies.module('biz.aQute.bnd:bndlib:2.4.0')
+ libraries.commons_cli = 'commons-cli:commons-cli:1.2 at jar'
libraries.commons_io = dependencies.module(versions.commons_io)
--libraries.commons_lang = 'commons-lang:commons-lang:2.6 at jar'
+ libraries.commons_lang = 'commons-lang:commons-lang:2.6 at jar'
-libraries.commons_collections = 'commons-collections:commons-collections:3.2.1 at jar'
--libraries.jsch = "com.jcraft:jsch:0.1.53"
--libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){
-+libraries.commons_lang = 'commons-lang:commons-lang'
+libraries.commons_collections = 'commons-collections:commons-collections3'
-+libraries.jsch = "com.jcraft:jsch"
-+libraries.ivy = dependencies.module('org.apache.ivy:ivy'){
+ libraries.jsch = "com.jcraft:jsch:0.1.53"
+ libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){
dependency libraries.jsch
}
--libraries.jcip = "net.jcip:jcip-annotations:1.0 at jar"
+ libraries.jcip = "net.jcip:jcip-annotations:1.0 at jar"
-libraries.inject = dependencies.module('javax.inject:javax.inject:1')
-+libraries.jcip = "net.jcip:jcip-annotations"
+libraries.inject = dependencies.module('javax.inject:atinject-jsr330-api')
// Logging
--libraries.slf4j_api = dependencies.module('org.slf4j:slf4j-api:1.7.10')
--libraries.jcl_to_slf4j = dependencies.module('org.slf4j:jcl-over-slf4j:1.7.10') {
-+libraries.slf4j_api = dependencies.module('org.slf4j:slf4j-api')
-+libraries.jcl_to_slf4j = dependencies.module('org.slf4j:jcl-over-slf4j') {
- dependency libraries.slf4j_api
- }
--libraries.jul_to_slf4j = dependencies.module('org.slf4j:jul-to-slf4j:1.7.10') {
-+libraries.jul_to_slf4j = dependencies.module('org.slf4j:jul-to-slf4j') {
- dependency libraries.slf4j_api
- }
--libraries.log4j_to_slf4j = dependencies.module('org.slf4j:log4j-over-slf4j:1.7.10') {
-+libraries.log4j_to_slf4j = dependencies.module('org.slf4j:log4j-over-slf4j') {
- dependency libraries.slf4j_api
- }
--libraries.logback_core = dependencies.module('ch.qos.logback:logback-core:1.0.13')
--libraries.logback_classic = dependencies.module('ch.qos.logback:logback-classic:1.0.13') {
-+libraries.logback_core = dependencies.module('ch.qos.logback:logback-core')
-+libraries.logback_classic = dependencies.module('ch.qos.logback:logback-classic') {
- dependency libraries.logback_core
- dependency libraries.slf4j_api
+ libraries.slf4j_api = dependencies.module('org.slf4j:slf4j-api:1.7.10')
+@@ -60,7 +60,7 @@
}
// Jetty
@@ -115,36 +85,24 @@ Last-Update: 2015-07-08
libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") {
dependency libraries.slf4j_api
dependency libraries.servlet_api
-@@ -74,58 +74,58 @@
- dependency "org.apache.httpcomponents:httpcore:4.2.2 at jar"
- dependency libraries.jcl_to_slf4j
- dependency "commons-codec:commons-codec:1.6 at jar"
-- dependency "org.samba.jcifs:jcifs:1.3.17 at jar"
-+ dependency "org.samba.jcifs:jcifs"
- }
+@@ -79,13 +79,13 @@
libraries += [
-- dom4j: 'dom4j:dom4j:1.6.1 at jar',
+ dom4j: 'dom4j:dom4j:1.6.1 at jar',
- guava: 'com.google.guava:guava-jdk5:17.0 at jar',
-+ dom4j: 'dom4j:dom4j',
+ guava: 'com.google.guava:guava',
jsr305: 'com.google.code.findbugs:jsr305:1.3.9 at jar',
- groovy: "org.codehaus.groovy:groovy-all:${versions.groovy}",
+ groovy: "org.codehaus.groovy:groovy-all-2.x:debian",
jaxen: 'jaxen:jaxen:1.1 at jar',
-- jcip: "net.jcip:jcip-annotations:1.0 at jar",
-+ jcip: "net.jcip:jcip-annotations",
+ jcip: "net.jcip:jcip-annotations:1.0 at jar",
jna: 'net.java.dev.jna:jna:3.2.7 at jar',
- junit: 'junit:junit:4.12 at jar',
+ junit: 'junit:junit4',
xmlunit: 'xmlunit:xmlunit:1.3',
nekohtml: 'net.sourceforge.nekohtml:nekohtml:1.9.14',
xbean: 'org.apache.xbean:xbean-reflect:3.4 at jar', //required by maven3 classes
-- nativePlatform: 'net.rubygrapefruit:native-platform:0.10',
-- xerces: "xerces:xercesImpl:2.9.1",
-+ nativePlatform: 'net.rubygrapefruit:native-platform',
-+ xerces: "xerces:xercesImpl",
- objenesis: 'org.objenesis:objenesis:1.2 at jar',
+@@ -95,14 +95,14 @@
jsoup:'org.jsoup:jsoup:1.6.3'
]
@@ -159,16 +117,12 @@ Last-Update: 2015-07-08
dependency "org.codehaus.plexus:plexus-utils:2.0.6 at jar"
dependency "org.codehaus.plexus:plexus-interpolation:1.14 at jar"
- dependency "org.codehaus.plexus:plexus-component-annotations:1.5.5 at jar"
-- dependency "org.codehaus.plexus:plexus-container-default:1.5.5 at jar"
+ dependency "org.codehaus.plexus:plexus-component-annotations-1.5"
-+ dependency "org.codehaus.plexus:plexus-container-default-1.5"
+ dependency "org.codehaus.plexus:plexus-container-default:1.5.5 at jar"
dependency "org.codehaus.plexus:plexus-classworlds:2.4 at jar"
- //sonatype plexus
-- dependency "org.sonatype.plexus:plexus-cipher:1.7 at jar"
-- dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3 at jar"
-+ dependency "org.sonatype.plexus:plexus-cipher"
-+ dependency "org.sonatype.plexus:plexus-sec-dispatcher"
+@@ -111,21 +111,21 @@
+ dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3 at jar"
//core:
- dependency "org.apache.maven:maven-core:3.0.4 at jar"
@@ -211,17 +165,16 @@ Last-Update: 2015-07-08
]
libraries.jmock = [
'org.jmock:jmock:2.5.1',
-@@ -148,16 +148,16 @@
+@@ -148,7 +148,7 @@
dependencies.create('org.jmock:jmock-junit4:2.5.1') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types.
'org.jmock:jmock-legacy:2.5.1',
libraries.objenesis,
- 'cglib:cglib-nodep:2.2'
+ 'cglib:cglib3-nodep'
]
--libraries.gson = "com.google.code.gson:gson:2.2.4"
-+libraries.gson = "com.google.code.gson:gson"
+ libraries.gson = "com.google.code.gson:gson:2.2.4"
libraries.sshd = dependencies.module("org.apache.sshd:sshd-core:0.13.0") {
- dependency libraries.slf4j_api
+@@ -156,8 +156,8 @@
dependency "org.apache.mina:mina-core:2.0.8"
}
@@ -288,20 +241,9 @@ Last-Update: 2015-07-08
compile libraries.gson // used by JsHint
compile "org.simpleframework:simple:4.1.21" // used by http package in envjs
compile project(':core'), project(":plugins")
---- a/subprojects/messaging/messaging.gradle
-+++ b/subprojects/messaging/messaging.gradle
-@@ -2,7 +2,7 @@
- publishCompile project(':baseServices')
- publishCompile libraries.slf4j_api
- publishCompile libraries.guava
-- publishCompile 'com.esotericsoftware.kryo:kryo:2.20'
-+ publishCompile 'com.esotericsoftware.kryo:kryo'
- testCompile libraries.groovy
- }
-
--- a/subprojects/reporting/reporting.gradle
+++ b/subprojects/reporting/reporting.gradle
-@@ -5,13 +5,13 @@
+@@ -5,7 +5,7 @@
}
repositories {
@@ -310,24 +252,6 @@ Last-Update: 2015-07-08
}
dependencies {
- compile libraries.groovy
- compile project(':core')
-- compile 'com.googlecode.jatl:jatl:0.2.2'
-+ compile 'com.googlecode.jatl:jatl'
-
- testCompile libraries.jsoup
- integTestRuntime project(':codeQuality')
---- a/subprojects/antlr/antlr.gradle
-+++ b/subprojects/antlr/antlr.gradle
-@@ -19,7 +19,7 @@
- compile project(':core')
- compile project(':plugins')
-
-- provided "antlr:antlr:2.7.7 at jar"
-+ provided "antlr:antlr"
-
- compile libraries.slf4j_api
- }
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
@@ -31,18 +31,8 @@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git
More information about the pkg-java-commits
mailing list