殷啟聰 | Kai-Chung Yan pushed to branch master at Debian Java Maintainers / gradle
Commits: 9a3b7ebb by Jongmin Kim at 2019-04-01T19:47:52Z Use JRE provided xml-apis Closes: #925586 Signed-off-by: Jongmin Kim <[email protected]> - - - - - 2 changed files: - debian/control - debian/patches/use-local-artifacts.patch Changes: ===================================== debian/control ===================================== @@ -40,7 +40,6 @@ Build-Depends: ant, libjarjar-java, libjatl-java, libjaxen-java, - libjaxp1.3-java, libjcifs-java, libjcip-annotations-java, libjgit-java, ===================================== debian/patches/use-local-artifacts.patch ===================================== @@ -7,17 +7,15 @@ Subject: use local artifacts to patch some artifact names here. Forwarded: not-needed --- - build.gradle | 4 +-- - buildSrc/build.gradle | 7 ++-- - gradle/dependencies.gradle | 42 +++++++++++----------- - gradle/testSetup.gradle | 2 +- - .../dependency-management.gradle | 5 --- - subprojects/docs/docs.gradle | 15 ++------ - subprojects/javascript/javascript.gradle | 2 +- - subprojects/maven/maven.gradle | 2 +- - subprojects/reporting/reporting.gradle | 2 +- - .../testing/worker/ForkingTestClassProcessor.java | 4 +-- - 10 files changed, 35 insertions(+), 50 deletions(-) + build.gradle | 5 -- + buildSrc/build.gradle | 8 +-- + gradle/dependencies.gradle | 21 ++++++---- + subprojects/build-init/build-init.gradle | 1 + subprojects/core/core.gradle | 1 + .../dependency-management.gradle | 5 -- + subprojects/reporting/reporting.gradle | 2 + .../testing/worker/ForkingTestClassProcessor.java | 2 + 8 files changed, 22 insertions(+), 23 deletions(-) --- a/build.gradle +++ b/build.gradle @@ -78,7 +76,7 @@ Forwarded: not-needed kryo: 'com.esotericsoftware.kryo:kryo:2.20', jsr305: 'com.google.code.findbugs:jsr305:1.3.9@jar', groovy: "org.codehaus.groovy:groovy-all:${versions.groovy}", -@@ -102,7 +102,7 @@ +@@ -102,11 +102,10 @@ equalsVerifier: 'nl.jqno.equalsverifier:equalsverifier:2.1.6', xbean: 'org.apache.xbean:xbean-reflect:3.4@jar', //required by maven3 classes nativePlatform: 'net.rubygrapefruit:native-platform:0.14', @@ -87,7 +85,11 @@ Forwarded: not-needed xerces: "xerces:xercesImpl:2.11.0", objenesis: 'org.objenesis:objenesis:1.2@jar', jsoup: 'org.jsoup:jsoup:1.6.3', -@@ -157,7 +157,7 @@ +- xmlApis: 'xml-apis:xml-apis:1.4.01', + jgit: [ + 'org.eclipse.jgit:org.eclipse.jgit:4.5.3.201708160445-r@jar', // 4.6+ requires Java 8 + libraries.commons_httpclient, +@@ -157,7 +156,7 @@ dependency 'org.apache.maven.wagon:wagon-file:2.4@jar' dependency 'org.apache.maven.wagon:wagon-http:2.4@jar' dependency 'org.apache.maven.wagon:wagon-provider-api:2.4@jar' @@ -96,7 +98,7 @@ Forwarded: not-needed //eather: dependency 'org.apache.maven.resolver:maven-resolver-api:1.13.1@jar' -@@ -200,8 +200,8 @@ +@@ -200,8 +199,8 @@ dependency libraries.mina } @@ -107,7 +109,7 @@ Forwarded: not-needed dependency libraries.bouncycastle_provider } -@@ -252,3 +252,11 @@ +@@ -252,3 +251,11 @@ } } } @@ -119,6 +121,16 @@ Forwarded: not-needed + apply from: "${rootDir}/../debian/substituteDependencies.gradle" + } +} +--- a/subprojects/core/core.gradle ++++ b/subprojects/core/core.gradle +@@ -55,7 +55,6 @@ + implementation libraries.jcip + implementation libraries.nativePlatform + implementation libraries.commons_compress +- implementation libraries.xmlApis + + runtimeOnly project(":docs") + --- a/subprojects/dependency-management/dependency-management.gradle +++ b/subprojects/dependency-management/dependency-management.gradle @@ -6,11 +6,6 @@ View it on GitLab: https://salsa.debian.org/java-team/gradle/commit/9a3b7ebb9f4365afc4bd442cab0de97afa07ef30 -- View it on GitLab: https://salsa.debian.org/java-team/gradle/commit/9a3b7ebb9f4365afc4bd442cab0de97afa07ef30 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
