diff --git a/clients/java/zms/pom.xml b/clients/java/zms/pom.xml index 860b766d746..1dc8ec1aac8 100644 --- a/clients/java/zms/pom.xml +++ b/clients/java/zms/pom.xml @@ -93,6 +93,11 @@ jackson-annotations ${jackson.version} + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.version} + diff --git a/clients/java/zpe/pom.xml b/clients/java/zpe/pom.xml index 8984e55958b..6f3a4df676f 100644 --- a/clients/java/zpe/pom.xml +++ b/clients/java/zpe/pom.xml @@ -27,7 +27,7 @@ ZPE Client Library (Java) - 1.9.1 + 1.21 benchmarks @@ -74,46 +74,6 @@ - - org.apache.maven.plugins - maven-shade-plugin - 2.3 - - - shade-jar - package - - shade - - - - - - - - com.fasterxml.jackson.core - - - - - com.fasterxml.jackson - athenz.shade.zpe.com.fasterxml.jackson - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - org.apache.maven.plugins maven-surefire-plugin @@ -198,29 +158,6 @@ - - no-shade - - - no-shade - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.3 - - - shade-jar - none - - - - - - diff --git a/clients/java/zts/core/pom.xml b/clients/java/zts/core/pom.xml index 1a9557eb9d8..90bd7b48d9c 100644 --- a/clients/java/zts/core/pom.xml +++ b/clients/java/zts/core/pom.xml @@ -53,6 +53,11 @@ athenz-auth-core ${project.parent.version} + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.version} + org.glassfish.jersey.inject jersey-hk2 diff --git a/clients/java/zts/shade/pom.xml b/clients/java/zts/shade/pom.xml index c7d197592de..89448615c47 100644 --- a/clients/java/zts/shade/pom.xml +++ b/clients/java/zts/shade/pom.xml @@ -59,6 +59,11 @@ athenz-auth-core ${project.parent.version} + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.version} + org.glassfish.jersey.inject jersey-hk2 @@ -151,7 +156,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 + 3.2.0 shade-jar @@ -162,9 +167,6 @@ true true - - - com.yahoo.athenz:athenz-zts-java-client-core diff --git a/containers/jetty/pom.xml b/containers/jetty/pom.xml index d0699c423be..19b61d19964 100644 --- a/containers/jetty/pom.xml +++ b/containers/jetty/pom.xml @@ -136,6 +136,11 @@ bcpkix-jdk15on ${bouncycastle.version} + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.version} + ch.qos.logback logback-classic diff --git a/examples/java/centralized-use-case/client/pom.xml b/examples/java/centralized-use-case/client/pom.xml index 2617c7cc6df..63b9f538b57 100644 --- a/examples/java/centralized-use-case/client/pom.xml +++ b/examples/java/centralized-use-case/client/pom.xml @@ -27,7 +27,7 @@ UTF-8 UTF-8 - 1.7.46 + 1.8.3 @@ -73,7 +73,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 + 3.2.0 package diff --git a/examples/java/centralized-use-case/servlet/pom.xml b/examples/java/centralized-use-case/servlet/pom.xml index 70222597f1f..4252affa7de 100644 --- a/examples/java/centralized-use-case/servlet/pom.xml +++ b/examples/java/centralized-use-case/servlet/pom.xml @@ -27,7 +27,7 @@ UTF-8 UTF-8 - 1.7.46 + 1.8.3 @@ -59,7 +59,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 + 3.2.0 package diff --git a/examples/java/decentralized-use-case/client/pom.xml b/examples/java/decentralized-use-case/client/pom.xml index 0c0919533f4..f9855a16285 100644 --- a/examples/java/decentralized-use-case/client/pom.xml +++ b/examples/java/decentralized-use-case/client/pom.xml @@ -27,7 +27,7 @@ UTF-8 UTF-8 - 1.7.46 + 1.8.3 @@ -78,7 +78,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 + 3.2.0 package diff --git a/examples/java/decentralized-use-case/servlet/pom.xml b/examples/java/decentralized-use-case/servlet/pom.xml index b1284fb0412..99ab41c611f 100644 --- a/examples/java/decentralized-use-case/servlet/pom.xml +++ b/examples/java/decentralized-use-case/servlet/pom.xml @@ -27,7 +27,7 @@ UTF-8 UTF-8 - 1.7.46 + 1.8.3 @@ -59,7 +59,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 + 3.2.0 package diff --git a/examples/java/instance-provider/client/pom.xml b/examples/java/instance-provider/client/pom.xml index de6afe81555..72e86fa80b6 100644 --- a/examples/java/instance-provider/client/pom.xml +++ b/examples/java/instance-provider/client/pom.xml @@ -27,8 +27,8 @@ UTF-8 UTF-8 - 1.7.46 - 2.9.5 + 1.8.3 + 2.9.7 @@ -94,7 +94,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 + 3.2.0 package diff --git a/examples/java/instance-provider/provider/pom.xml b/examples/java/instance-provider/provider/pom.xml index 7422da751c2..0d4c3480987 100644 --- a/examples/java/instance-provider/provider/pom.xml +++ b/examples/java/instance-provider/provider/pom.xml @@ -27,9 +27,9 @@ 9.4.9.v20180320 2.25.1 - 2.9.5 - 1.7.46 - 1.59 + 2.9.7 + 1.8.3 + 1.60 UTF-8 UTF-8 @@ -53,7 +53,7 @@ com.yahoo.rdl rdl-java - 1.4.14 + 1.5.1 com.fasterxml.jackson.core @@ -172,7 +172,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 + 3.2.0 package diff --git a/libs/java/cert_refresher/pom.xml b/libs/java/cert_refresher/pom.xml index c9f18d321fb..c84ecb7ac9d 100644 --- a/libs/java/cert_refresher/pom.xml +++ b/libs/java/cert_refresher/pom.xml @@ -30,7 +30,7 @@ jar - 1.42 + 1.43 diff --git a/pom.xml b/pom.xml index b72c946eba9..3edf80debea 100644 --- a/pom.xml +++ b/pom.xml @@ -75,11 +75,12 @@ 2.22.0 1.5.1 1.60 - 1.11.416 + 1.11.426 26.0-jre 1.2.3 3.1.0 - 2.22.0 + 2.1.1 + 2.23.0 UTF-8 UTF-8 diff --git a/servers/zms/pom.xml b/servers/zms/pom.xml index 26514b967d7..195864742b5 100644 --- a/servers/zms/pom.xml +++ b/servers/zms/pom.xml @@ -139,6 +139,11 @@ bcpkix-jdk15on ${bouncycastle.version} + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.version} + javax.servlet javax.servlet-api diff --git a/servers/zts/pom.xml b/servers/zts/pom.xml index ec9e0cb0bde..f9ffe4f4450 100644 --- a/servers/zts/pom.xml +++ b/servers/zts/pom.xml @@ -143,6 +143,11 @@ jetty-client ${jetty.version} + + javax.ws.rs + javax.ws.rs-api + ${javax.ws.version} + javax.servlet javax.servlet-api diff --git a/utils/zpe_policy_updater/pom.xml b/utils/zpe_policy_updater/pom.xml index 0a496b5a10e..5555bc3f6b7 100644 --- a/utils/zpe_policy_updater/pom.xml +++ b/utils/zpe_policy_updater/pom.xml @@ -89,7 +89,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 + 3.2.0 package