[libspring-java] 09/13: Disabled the HtmlUnit support in spring-test

[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 be1c1239f56c0f193fb39f0370f244aedfbb9a16
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 2 11:06:54 2016 +0200

    Disabled the HtmlUnit support in spring-test
---
 debian/changelog                          |  1 +
 debian/maven.ignoreRules                  |  2 ++
 debian/patches/0044-ignore-httpunit.patch | 21 +++++++++++++++++++++
 debian/patches/series                     |  1 +
 4 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dadfd6b..5a66594 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libspring-java (4.2.6-1) UNRELEASED; urgency=medium
     - Disabled the Money API support for spring-context (not in Debian)
     - Disabled the Hibernate 5 support in spring-orm (not in Debian)
     - Disabled the OkHttp support in spring-web (not in Debian)
+    - Disabled the HtmlUnit support in spring-test
     - New dependency on webjars-locator for spring-webmvc
     - New dependency on commons-pool2 for spring-aop
     - Depend on libreactor-core-java (>= 2.0.8)
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 22f9ad9..6cde0d3 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -7,3 +7,5 @@ com.squareup.okhttp okhttp * * * *
 org.asciidoctor asciidoctor-gradle-plugin * * * *
 org.mvel mvel2 * * * *
 org.skyscreamer jsonassert * * * *
+org.seleniumhq.selenium selenium-htmlunit-driver * * * *
+net.sourceforge.htmlunit htmlunit * * * *
diff --git a/debian/patches/0044-ignore-httpunit.patch b/debian/patches/0044-ignore-httpunit.patch
new file mode 100644
index 0000000..a100515
--- /dev/null
+++ b/debian/patches/0044-ignore-httpunit.patch
@@ -0,0 +1,21 @@
+Description: Ignore the HtmlUnit classes
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -1061,6 +1061,15 @@
+ 		testRuntime("org.terracotta:management-model:2.0.0")
+ 	}
+ 
++	sourceSets {
++		main {
++			java {
++				exclude "**/htmlunit/*"
++			}
++		}
++	}
++
++
+ 	task testNG(type: Test) {
+ 		description = 'Runs TestNG tests.'
+ 		useTestNG()
diff --git a/debian/patches/series b/debian/patches/series
index 434eaae..e7a5f80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 0041-servlet-api-compatibility.patch
 0042-ignore-money-api.patch
 0043-ignore-okhttp.patch
+0044-ignore-httpunit.patch

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