diff --git a/pom.xml b/pom.xml index 95013723..7bcd500e 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.17.0 + + + org.apache.logging.log4j + log4j-core + 2.17.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..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 @@ -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 { 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..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 @@ -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; 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