[jabref] 06/11: disable xmlunit-[core|matchers] from compile-time dependencies

[Tony Mancill]

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

tmancill pushed a commit to branch dev
in repository jabref.

commit f93f664bdd2c33853cd6a508611ba289da60b854
Author: tony mancill <tmancill at debian.org>
Date:   Sat Dec 10 14:08:04 2016 -0800

    disable xmlunit-[core|matchers] from compile-time dependencies
    
    Debian currently has xmlunit version 1.6, not verison 2.3.0 required by
    upstream.  These classes are only used in tests, which are currently
    disabled in the Debian build.
---
 debian/patches/010_gradle_build.patch | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/debian/patches/010_gradle_build.patch b/debian/patches/010_gradle_build.patch
index c107adb..8745159 100644
--- a/debian/patches/010_gradle_build.patch
+++ b/debian/patches/010_gradle_build.patch
@@ -2,9 +2,11 @@ Description: patch upstream build system for building on Debian
 Author: tony mancill <tmancill at debian.org>
 Forwarded: not-needed
 
---- a/build.gradle
-+++ b/build.gradle
-@@ -2,6 +2,7 @@
+Index: jabref-3.8~pre1+ds/build.gradle
+===================================================================
+--- jabref-3.8~pre1+ds.orig/build.gradle
++++ jabref-3.8~pre1+ds/build.gradle
+@@ -2,6 +2,7 @@ import org.gradle.internal.os.OperatingS
  
  // to update the gradle wrapper, execute ./gradlew wrapper --gradle-version 3.0
  
@@ -12,7 +14,7 @@ Forwarded: not-needed
  buildscript {
      repositories {
          maven {
-@@ -27,9 +28,11 @@
+@@ -27,9 +28,11 @@ buildScan {
      licenseAgreementUrl = 'https://gradle.com/terms-of-service'
      licenseAgree = 'yes'
  }
@@ -24,7 +26,7 @@ Forwarded: not-needed
  apply plugin: "project-report"
  apply plugin: 'jacoco'
  apply plugin: 'install4j'
-@@ -38,17 +41,20 @@
+@@ -38,17 +41,20 @@ apply plugin: 'me.champeau.gradle.jmh'
  apply plugin: 'checkstyle'
  
  apply from: 'eclipse.gradle'
@@ -47,7 +49,7 @@ Forwarded: not-needed
  install4j {
      installDir = file(project.ext.install4jDir)
  }
-@@ -60,6 +66,7 @@
+@@ -60,6 +66,7 @@ repositories {
          url 'https://oss.sonatype.org/content/groups/public'
      }
  }
@@ -55,7 +57,7 @@ Forwarded: not-needed
  
  configurations {
      antlr3
-@@ -67,6 +74,8 @@
+@@ -67,6 +74,8 @@ configurations {
  }
  
  dependencies {
@@ -64,7 +66,18 @@ Forwarded: not-needed
      compile 'com.jgoodies:jgoodies-common:1.8.1'
      compile 'com.jgoodies:jgoodies-forms:1.9.0'
      compile 'com.jgoodies:jgoodies-looks:2.7.0'
-@@ -255,11 +264,12 @@
+@@ -117,8 +126,8 @@ dependencies {
+     compile 'org.apache.logging.log4j:log4j-jcl:2.7'
+     compile 'org.apache.logging.log4j:log4j-api:2.7'
+     compile 'org.apache.logging.log4j:log4j-core:2.7'
+-    compile 'org.xmlunit:xmlunit-core:2.3.0'
+-    compile 'org.xmlunit:xmlunit-matchers:2.3.0'
++    //compile 'org.xmlunit:xmlunit-core:2.3.0'
++    //compile 'org.xmlunit:xmlunit-matchers:2.3.0'
+ 
+     testCompile 'junit:junit:4.12'
+     testCompile 'org.mockito:mockito-core:2.2.28'
+@@ -255,11 +264,12 @@ processTestResources.dependsOn copyTestR
  
  tasks.withType(Test) {
      reports.html.destination = file("${reporting.baseDir}/${name}")
@@ -80,7 +93,7 @@ Forwarded: not-needed
  jacocoTestReport {
      reports {
          xml.enabled = true // coveralls plugin depends on xml format report
-@@ -297,6 +307,7 @@
+@@ -297,6 +307,7 @@ shadowJar {
          }
      })
  }
@@ -88,7 +101,7 @@ Forwarded: not-needed
  
  /*
   * Changes project.version to VERSION--snapshot--DATE--GIT_HASH
-@@ -331,6 +342,7 @@
+@@ -331,6 +342,7 @@ if (hasProperty('dev')) {
      project.version += "--snapshot--" + infoString
  }
  
@@ -96,7 +109,7 @@ Forwarded: not-needed
  // has to be defined AFTER 'dev' things to have the correct project.version
  task media(type: com.install4j.gradle.Install4jTask, dependsOn: "releaseJar") {
      projectFile = file('jabref.install4j')
-@@ -383,3 +395,4 @@
+@@ -383,3 +395,4 @@ jmh {
      iterations = 10
      fork = 2
  }

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