[gradle] 48/81: Fix Xerces dependencies

[Kai-Chung Yan]

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository gradle.

commit 3b1c10dbc49c5164d2851e31e7e57059dbd30197
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Mon Jun 8 22:25:50 2015 +0800

    Fix Xerces dependencies
---
 debian/patches/use_local_artifacts.diff | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index af46c65..5f31f42 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -52,7 +52,13 @@ Last-Update: 2015-05-24
  dependencies {
 --- a/gradle/dependencies.gradle
 +++ b/gradle/dependencies.gradle
-@@ -95,9 +95,9 @@
+@@ -90,14 +90,14 @@
+         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",
++        xerces: ["xerces:xercesImpl:[2.9.1, )", "xerces:xmlParserAPIs:[2.6.2, )"],
+         objenesis: 'org.objenesis:objenesis:1.2 at jar',
          jsoup:'org.jsoup:jsoup:1.6.3'
  ]
  
@@ -97,7 +103,15 @@ Last-Update: 2015-05-24
      dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
 --- a/subprojects/core-impl/core-impl.gradle
 +++ b/subprojects/core-impl/core-impl.gradle
-@@ -63,7 +63,7 @@
+@@ -16,6 +16,7 @@
+     compile libraries.slf4j_api
+     compile libraries.maven_ant_tasks
+     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.
      //This file contains only single component so I think we can remove it.
      task.doLast {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git