[libspring-java] 12/18: Ignore the non-free JSONassert dependency

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libspring-java.

commit b94b48980ce67786e3597fef55895bba3d2b3119
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri May 27 00:18:51 2016 +0200

    Ignore the non-free JSONassert dependency
---
 debian/changelog                             |  1 +
 debian/maven.ignoreRules                     |  1 +
 debian/patches/0040-ignore-json-assert.patch | 31 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 4 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bd8c9d0..a82c897 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ libspring-java (4.1.9-1) UNRELEASED; urgency=medium
     - New suggested dependency on libyaml-snake-java for libspring-beans-java
     - New suggested dependency on libprotobuf-java-format-java and libprotobuf-java
       for libspring-web-java
+    - Ignore the non-free JSONassert dependency
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 03 Apr 2016 01:12:35 +0200
 
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index b58f169..a3f91bf 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -4,3 +4,4 @@ org.hibernate hibernate-annotations * * * *
 org.springframework.build.gradle docbook-reference-plugin * * * *
 org.asciidoctor asciidoctor-gradle-plugin * * * *
 org.mvel mvel2 * * * *
+org.skyscreamer jsonassert * * * *
diff --git a/debian/patches/0040-ignore-json-assert.patch b/debian/patches/0040-ignore-json-assert.patch
new file mode 100644
index 0000000..ad0996a
--- /dev/null
+++ b/debian/patches/0040-ignore-json-assert.patch
@@ -0,0 +1,31 @@
+Description: Ignore the code relying on jsonassert (depends on the non-free json.org library)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/spring-test/src/main/java/org/springframework/test/util/JsonExpectationsHelper.java
++++ b/spring-test/src/main/java/org/springframework/test/util/JsonExpectationsHelper.java
+@@ -16,7 +16,7 @@
+ 
+ package org.springframework.test.util;
+ 
+-import org.skyscreamer.jsonassert.JSONAssert;
++//import org.skyscreamer.jsonassert.JSONAssert;
+ 
+ /**
+  * A helper class for assertions on JSON content.
+@@ -39,7 +39,7 @@
+ 	 * @since 4.1
+ 	 */
+ 	public void assertJsonEqual(String expected, String actual) throws Exception {
+-		JSONAssert.assertEquals(expected, actual, false);
++		//JSONAssert.assertEquals(expected, actual, false);
+ 	}
+ 
+ 	/**
+@@ -52,6 +52,6 @@
+ 	 * @since 4.1
+ 	 */
+ 	public void assertJsonNotEqual(String expected, String actual) throws Exception {
+-		JSONAssert.assertNotEquals(expected, actual, false);
++		//JSONAssert.assertNotEquals(expected, actual, false);
+ 	}
+ }
diff --git a/debian/patches/series b/debian/patches/series
index b933e15..70415f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 0037-ignore-sonar-plugin.patch
 0038-rome-compatibility.patch
 0039-openjpa-compatibility.patch
+0040-ignore-json-assert.patch

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