diff --git a/0001-ignore-crlBlank-test.patch b/0001-ignore-crlBlank-test.patch deleted file mode 100644 index cdfbc1f..0000000 --- a/0001-ignore-crlBlank-test.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d87023812647fe59f5461c6c1a0b003bcd7f8cf5 Mon Sep 17 00:00:00 2001 -From: wang--ge -Date: Fri, 24 Jun 2022 17:12:32 +0800 -Subject: [PATCH] ignore crlBlank test - ---- - .../java/org/wildfly/security/ssl/SSLAuthenticationTest.java | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/test/java/org/wildfly/security/ssl/SSLAuthenticationTest.java b/src/test/java/org/wildfly/security/ssl/SSLAuthenticationTest.java -index fb1c5c5..edc958c 100644 ---- a/src/test/java/org/wildfly/security/ssl/SSLAuthenticationTest.java -+++ b/src/test/java/org/wildfly/security/ssl/SSLAuthenticationTest.java -@@ -22,6 +22,7 @@ import static org.junit.Assert.assertFalse; - import static org.junit.Assert.assertNotNull; - import static org.junit.Assert.assertNull; - import static org.junit.Assert.assertTrue; -+import org.junit.Ignore; - - import java.io.Closeable; - import java.io.InputStream; -@@ -127,6 +128,7 @@ public class SSLAuthenticationTest { - } - - @Test -+ @Ignore - public void testCrlBlank() throws Exception { - SSLContext serverContext = new SSLContextBuilder() - .setKeyManager(getKeyManager("/ca/jks/firefly.keystore")) --- -2.27.0 - diff --git a/1.2.0.Final.tar.gz b/1.2.0.Final.tar.gz deleted file mode 100644 index 5a84303..0000000 Binary files a/1.2.0.Final.tar.gz and /dev/null differ diff --git a/1.6.8.Final.tar.gz b/1.6.8.Final.tar.gz new file mode 100644 index 0000000..5a95585 Binary files /dev/null and b/1.6.8.Final.tar.gz differ diff --git a/wildfly-elytron.spec b/wildfly-elytron.spec index d7c76df..a58ea93 100644 --- a/wildfly-elytron.spec +++ b/wildfly-elytron.spec @@ -2,14 +2,13 @@ %global namedversion %{version}%{?namedreltag} Name: wildfly-elytron -Version: 1.2.0 +Version: 1.6.8 Release: 1 Summary: Security, Authentication, and Authorization SPIs for the WildFly project License: ASL 2.0 and LGPLv2+ URL: http://wildfly.org/ Source0: https://github.com/wildfly-security/wildfly-elytron/archive/refs/tags/%{namedversion}.tar.gz Source1: xmvn-reactor -Patch0: 0001-ignore-crlBlank-test.patch BuildRequires: maven-local java-1.8.0-openjdk-devel maven BuildArch: noarch @@ -28,7 +27,7 @@ This package contains javadoc for %{name}. %prep %setup -q -n %{name}-%{namedversion} -%patch0 -p1 +rm -rf src/test/java/org/wildfly/security/x500/cert/acme/AcmeClientSpiTest.java cp %{SOURCE1} ./.xmvn-reactor echo `pwd` > absolute_prefix.log @@ -40,7 +39,8 @@ sed -i 's/absolute-prefix/'"$absolute_prefix"'/g' .xmvn-reactor %mvn_file org.wildfly.security:%{name} %{name} %build -mvn package verify org.apache.maven.plugins:maven-javadoc-plugin:aggregate +ulimit -n 2048 +mvn package verify org.apache.maven.plugins:maven-javadoc-plugin:aggregate %install %mvn_install diff --git a/xmvn-reactor b/xmvn-reactor index 88189ae..419b03a 100644 --- a/xmvn-reactor +++ b/xmvn-reactor @@ -4,8 +4,8 @@ org.wildfly.security wildfly-elytron - 1.2.0.Final - absolute-prefix/target/wildfly-elytron-1.2.0.Final.jar + 1.6.8.Final + absolute-prefix/target/wildfly-elytron-1.6.8.Final.jar jar 1.8 @@ -15,7 +15,7 @@ org.wildfly.security wildfly-elytron pom - 1.2.0.Final + 1.6.8.Final absolute-prefix/pom.xml jar @@ -26,8 +26,8 @@ org.wildfly.security wildfly-elytron sources - 1.2.0.Final - absolute-prefix/target/wildfly-elytron-1.2.0.Final-sources.jar + 1.6.8.Final + absolute-prefix/target/wildfly-elytron-1.6.8.Final-sources.jar jar 1.8