From 671d08c9f6f6a24bd7e80498a1487000e4b31d85 Mon Sep 17 00:00:00 2001 From: PetrusHahol Date: Mon, 20 Dec 2021 14:25:54 +0300 Subject: [PATCH 1/3] Move to log4j2 --- pom.xml | 17 +++++++++++------ ssl-proxies/pom.xml | 10 +++++++--- .../gsi/provider/TestProxyPathValidator.java | 2 ++ .../gsi/proxy/ProxyPathValidatorTest.java | 5 +---- test-utils/pom.xml | 10 +++++++--- 5 files changed, 28 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 95013723..83f5d4a0 100644 --- a/pom.xml +++ b/pom.xml @@ -65,8 +65,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.5 - 1.5 + 1.8 + 1.8 @@ -139,11 +139,16 @@ 1.1.1 compile + - log4j - log4j - 1.2.14 - compile + org.apache.logging.log4j + log4j-api + 2.16.0 + + + org.apache.logging.log4j + log4j-core + 2.16.0 org.bouncycastle diff --git a/ssl-proxies/pom.xml b/ssl-proxies/pom.xml index 38ea0088..8b866511 100644 --- a/ssl-proxies/pom.xml +++ b/ssl-proxies/pom.xml @@ -34,10 +34,14 @@ commons-logging compile + - log4j - log4j - compile + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core org.bouncycastle diff --git a/ssl-proxies/src/test/java/org/globus/gsi/provider/TestProxyPathValidator.java b/ssl-proxies/src/test/java/org/globus/gsi/provider/TestProxyPathValidator.java index 399973e5..798cdf1d 100644 --- a/ssl-proxies/src/test/java/org/globus/gsi/provider/TestProxyPathValidator.java +++ b/ssl-proxies/src/test/java/org/globus/gsi/provider/TestProxyPathValidator.java @@ -69,6 +69,7 @@ import org.globus.gsi.SigningPolicy; import org.globus.gsi.SigningPolicyParser; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; public class TestProxyPathValidator { @@ -920,6 +921,7 @@ public void testNoBasicConstraintsExtension() throws Exception { } @Test + @Ignore public void testCrlsChecks() throws Exception { KeyStore keyStore = getKeyStore(new X509Certificate[]{goodCertsArr[1], diff --git a/ssl-proxies/src/test/java/org/globus/gsi/proxy/ProxyPathValidatorTest.java b/ssl-proxies/src/test/java/org/globus/gsi/proxy/ProxyPathValidatorTest.java index 4f8ede9c..b7960aa8 100644 --- a/ssl-proxies/src/test/java/org/globus/gsi/proxy/ProxyPathValidatorTest.java +++ b/ssl-proxies/src/test/java/org/globus/gsi/proxy/ProxyPathValidatorTest.java @@ -46,9 +46,6 @@ import org.globus.gsi.SigningPolicy; import org.globus.gsi.SigningPolicyParser; import org.globus.gsi.CertificateRevocationLists; -import org.globus.gsi.proxy.ProxyPolicyHandler; -import org.globus.gsi.proxy.ProxyPathValidator; -import org.globus.gsi.proxy.ProxyPathValidatorException; import org.globus.gsi.proxy.ext.ProxyCertInfo; import org.globus.gsi.proxy.ext.ProxyPolicy; @@ -527,7 +524,7 @@ public void testNoBasicConstraintsExtension() throws Exception { } //JGLOBUS-103 - public void testCrlsChecks() throws Exception { + public void _testCrlsChecks() throws Exception { TestProxyPathValidator tvalidator = new TestProxyPathValidator(); diff --git a/test-utils/pom.xml b/test-utils/pom.xml index c0239dbc..29e348fc 100644 --- a/test-utils/pom.xml +++ b/test-utils/pom.xml @@ -23,10 +23,14 @@ commons-logging compile + - log4j - log4j - compile + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core From a85e428fd2ce832a78fa8c19b262387761d2483a Mon Sep 17 00:00:00 2001 From: PetrusHahol Date: Mon, 20 Dec 2021 14:28:04 +0300 Subject: [PATCH 2/3] remove ignore test --- .../java/org/globus/gsi/provider/TestProxyPathValidator.java | 1 - .../test/java/org/globus/gsi/proxy/ProxyPathValidatorTest.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ssl-proxies/src/test/java/org/globus/gsi/provider/TestProxyPathValidator.java b/ssl-proxies/src/test/java/org/globus/gsi/provider/TestProxyPathValidator.java index 798cdf1d..a85a2d9f 100644 --- a/ssl-proxies/src/test/java/org/globus/gsi/provider/TestProxyPathValidator.java +++ b/ssl-proxies/src/test/java/org/globus/gsi/provider/TestProxyPathValidator.java @@ -921,7 +921,6 @@ public void testNoBasicConstraintsExtension() throws Exception { } @Test - @Ignore public void testCrlsChecks() throws Exception { KeyStore keyStore = getKeyStore(new X509Certificate[]{goodCertsArr[1], diff --git a/ssl-proxies/src/test/java/org/globus/gsi/proxy/ProxyPathValidatorTest.java b/ssl-proxies/src/test/java/org/globus/gsi/proxy/ProxyPathValidatorTest.java index b7960aa8..e88bc623 100644 --- a/ssl-proxies/src/test/java/org/globus/gsi/proxy/ProxyPathValidatorTest.java +++ b/ssl-proxies/src/test/java/org/globus/gsi/proxy/ProxyPathValidatorTest.java @@ -524,7 +524,7 @@ public void testNoBasicConstraintsExtension() throws Exception { } //JGLOBUS-103 - public void _testCrlsChecks() throws Exception { + public void testCrlsChecks() throws Exception { TestProxyPathValidator tvalidator = new TestProxyPathValidator(); From e993791148487665ee0f8bdd9e9f16cec3b9b8b2 Mon Sep 17 00:00:00 2001 From: PetrusHahol Date: Mon, 20 Dec 2021 14:33:49 +0300 Subject: [PATCH 3/3] Fixed to log4j 2.17.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 83f5d4a0..7bcd500e 100644 --- a/pom.xml +++ b/pom.xml @@ -143,12 +143,12 @@ org.apache.logging.log4j log4j-api - 2.16.0 + 2.17.0 org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 org.bouncycastle