[undertow] 10/10: Disable the tests again. Needs more investigation how this can be supported
Markus Koschany
apo at moszumanska.debian.org
Tue Sep 19 18:26:09 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository undertow.
commit 5e457fa2e61fd087025b5f79b99f041a71598c2c
Author: Markus Koschany <apo at debian.org>
Date: Tue Sep 19 20:11:38 2017 +0200
Disable the tests again. Needs more investigation how this can be supported
long-term
---
debian/changelog | 3 ---
debian/maven.ignoreRules | 3 +++
debian/maven.properties | 2 +-
debian/patches/series | 1 -
debian/patches/use-local-test-jars.patch | 35 --------------------------------
5 files changed, 4 insertions(+), 40 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 155bc9e..2abcf29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,7 @@ undertow (1.4.20-1) unstable; urgency=medium
* New upstream version 1.4.20.
* Tighten build-dependency on jboss-xnio.
- * Enable the tests again.
- * No longer ignore the test-jars.
* Add no-wildfly.patch and don't require the wildfly openssl dependency.
- * Add use-local-test-jars.patch
* Declare compliance with Debian Policy 4.1.0.
-- Markus Koschany <apo at debian.org> Tue, 19 Sep 2017 19:58:15 +0200
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 235f40e..91ac2ac 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -9,3 +9,6 @@ com.twitter hpack * * * *
org.eclipse.jetty.alpn alpn-api jar s/.*/debian * *
org.wildfly.openssl wildfly-openssl * * * *
org.zanata zanata-maven-plugin * * * *
+io.undertow undertow-websockets-jsr test-jar * * *
+io.undertow undertow-core test-jar * * *
+io.undertow undertow-servlet test-jar * * *
diff --git a/debian/maven.properties b/debian/maven.properties
index 65ee5d2..6af0556 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,6 +1,6 @@
# Include here properties to pass to Maven during the build.
# For example:
-#maven.test.skip=true
+maven.test.skip=true
maven.compiler.source=1.7
maven.compiler.target=1.7
project.build.sourceEncoding=utf-8
diff --git a/debian/patches/series b/debian/patches/series
index c0279ba..1609c2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
ALPN.patch
no-wildfly.patch
-use-local-test-jars.patch
diff --git a/debian/patches/use-local-test-jars.patch b/debian/patches/use-local-test-jars.patch
deleted file mode 100644
index 2dce7ab..0000000
--- a/debian/patches/use-local-test-jars.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 11 Jul 2017 14:38:52 +0200
-Subject: use local test-jars
-
----
- pom.xml | 1 +
- servlet/pom.xml | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/pom.xml b/pom.xml
-index da8755f..8c78612 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -126,6 +126,7 @@
- </modules>
-
- <build>
-+ <directory>${user.dir}/lib</directory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
-diff --git a/servlet/pom.xml b/servlet/pom.xml
-index 247c02d..3cbac00 100644
---- a/servlet/pom.xml
-+++ b/servlet/pom.xml
-@@ -85,7 +85,8 @@
- <groupId>io.undertow</groupId>
- <artifactId>undertow-core</artifactId>
- <type>test-jar</type>
-- <scope>test</scope>
-+ <scope>system</scope>
-+ <systemPath>${user.dir}/lib/undertow-core-1.4.20.Final-tests.jar</systemPath>
- </dependency>
-
- <dependency>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/undertow.git
More information about the pkg-java-commits
mailing list