This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository undertow.
commit 84f5917c4f8a3dd569d9d74acdc32554bdefdfc4 Author: Markus Koschany <[email protected]> Date: Tue Jul 11 14:17:05 2017 +0200 Add no-wildfly.patch and don't require the wildfly openssl dependency. --- debian/patches/no-wildfly.patch | 32 ++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 33 insertions(+) diff --git a/debian/patches/no-wildfly.patch b/debian/patches/no-wildfly.patch new file mode 100644 index 0000000..9768519 --- /dev/null +++ b/debian/patches/no-wildfly.patch @@ -0,0 +1,32 @@ +From: Markus Koschany <[email protected]> +Date: Tue, 11 Jul 2017 14:16:52 +0200 +Subject: no wildfly + +--- + core/src/test/java/io/undertow/testutils/DefaultServer.java | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/core/src/test/java/io/undertow/testutils/DefaultServer.java b/core/src/test/java/io/undertow/testutils/DefaultServer.java +index a00f12c..2c80a21 100644 +--- a/core/src/test/java/io/undertow/testutils/DefaultServer.java ++++ b/core/src/test/java/io/undertow/testutils/DefaultServer.java +@@ -53,7 +53,6 @@ import org.junit.runners.BlockJUnit4ClassRunner; + import org.junit.runners.model.FrameworkMethod; + import org.junit.runners.model.InitializationError; + import org.junit.runners.model.Statement; +-import org.wildfly.openssl.OpenSSLProvider; + import org.xnio.ChannelListener; + import org.xnio.ChannelListeners; + import org.xnio.IoUtils; +@@ -101,11 +100,6 @@ public class DefaultServer extends BlockJUnit4ClassRunner { + + static { + Throwable failure = null; +- try { +- OpenSSLProvider.register(); +- } catch (Throwable t) { +- failure = t; +- } + OPENSSL_FAILURE = failure; + } + diff --git a/debian/patches/series b/debian/patches/series index 9b2f906..1609c2d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ ALPN.patch +no-wildfly.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/undertow.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
