update packages to their latest releases (#576)

* update packages to their latest releases * no shade plugin for zpe library
AthenZ · Oct 12, 2018 · 6e689d2 · 6e689d2
1 parent 914f3d7
commit 6e689d2
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 88 deletions.
diff --git a/clients/java/zms/pom.xml b/clients/java/zms/pom.xml
@@ -93,6 +93,11 @@
       <artifactId>jackson-annotations</artifactId>
       <version>${jackson.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>${javax.ws.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/clients/java/zpe/pom.xml b/clients/java/zpe/pom.xml
@@ -27,7 +27,7 @@
   <description>ZPE Client Library (Java)</description>
 
   <properties>
-    <jmh.version>1.9.1</jmh.version>
+    <jmh.version>1.21</jmh.version>
     <uberjar.name>benchmarks</uberjar.name>
   </properties>
 
@@ -74,46 +74,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
-        <executions>
-          <execution>
-            <id>shade-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-              </transformers>
-              <artifactSet>
-                <includes>
-                  <include>com.fasterxml.jackson.core</include>
-                </includes>
-              </artifactSet>
-              <relocations>
-                <relocation>
-                  <pattern>com.fasterxml.jackson</pattern>
-                  <shadedPattern>athenz.shade.zpe.com.fasterxml.jackson</shadedPattern>
-                </relocation>
-              </relocations>
-              <filters>
-                <filter>
-                  <artifact>*:*</artifact>
-                  <excludes>
-                    <exclude>META-INF/*.SF</exclude>
-                    <exclude>META-INF/*.DSA</exclude>
-                    <exclude>META-INF/*.RSA</exclude>
-                  </excludes>
-                </filter>
-              </filters>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -198,29 +158,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>no-shade</id>
-      <activation>
-        <property>
-          <name>no-shade</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-shade-plugin</artifactId>
-            <version>2.3</version>
-            <executions>
-              <execution>
-                <id>shade-jar</id>
-                <phase>none</phase>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
   <distributionManagement>

diff --git a/clients/java/zts/core/pom.xml b/clients/java/zts/core/pom.xml
@@ -53,6 +53,11 @@
       <artifactId>athenz-auth-core</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>${javax.ws.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.inject</groupId>
       <artifactId>jersey-hk2</artifactId>

diff --git a/clients/java/zts/shade/pom.xml b/clients/java/zts/shade/pom.xml
@@ -59,6 +59,11 @@
       <artifactId>athenz-auth-core</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>${javax.ws.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.inject</groupId>
       <artifactId>jersey-hk2</artifactId>
@@ -151,7 +156,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <id>shade-jar</id>
@@ -162,9 +167,6 @@
             <configuration>
               <createSourcesJar>true</createSourcesJar>
               <shadeSourcesContent>true</shadeSourcesContent>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-              </transformers>
               <artifactSet>
                 <includes>
                   <include>com.yahoo.athenz:athenz-zts-java-client-core</include>

diff --git a/containers/jetty/pom.xml b/containers/jetty/pom.xml
@@ -136,6 +136,11 @@
       <artifactId>bcpkix-jdk15on</artifactId>
       <version>${bouncycastle.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>${javax.ws.version}</version>
+    </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>

diff --git a/examples/java/centralized-use-case/client/pom.xml b/examples/java/centralized-use-case/client/pom.xml
@@ -27,7 +27,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <athenz.version>1.7.46</athenz.version>
+    <athenz.version>1.8.3</athenz.version>
   </properties>
 
   <dependencies>
@@ -73,7 +73,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <phase>package</phase>

diff --git a/examples/java/centralized-use-case/servlet/pom.xml b/examples/java/centralized-use-case/servlet/pom.xml
@@ -27,7 +27,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <athenz.version>1.7.46</athenz.version>
+    <athenz.version>1.8.3</athenz.version>
   </properties>
 
   <dependencies>
@@ -59,7 +59,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <phase>package</phase>

diff --git a/examples/java/decentralized-use-case/client/pom.xml b/examples/java/decentralized-use-case/client/pom.xml
@@ -27,7 +27,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <athenz.version>1.7.46</athenz.version>
+    <athenz.version>1.8.3</athenz.version>
   </properties>
 
   <dependencies>
@@ -78,7 +78,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <phase>package</phase>

diff --git a/examples/java/decentralized-use-case/servlet/pom.xml b/examples/java/decentralized-use-case/servlet/pom.xml
@@ -27,7 +27,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <athenz.version>1.7.46</athenz.version>
+    <athenz.version>1.8.3</athenz.version>
   </properties>
 
   <dependencies>
@@ -59,7 +59,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <phase>package</phase>

diff --git a/examples/java/instance-provider/client/pom.xml b/examples/java/instance-provider/client/pom.xml
@@ -27,8 +27,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <athenz.version>1.7.46</athenz.version>
-    <jackson.version>2.9.5</jackson.version>
+    <athenz.version>1.8.3</athenz.version>
+    <jackson.version>2.9.7</jackson.version>
   </properties>
 
   <dependencies>
@@ -94,7 +94,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <phase>package</phase>

diff --git a/examples/java/instance-provider/provider/pom.xml b/examples/java/instance-provider/provider/pom.xml
@@ -27,9 +27,9 @@
   <properties>
     <jetty.version>9.4.9.v20180320</jetty.version>
     <jersey.version>2.25.1</jersey.version>
-    <jackson.version>2.9.5</jackson.version>
-    <athenz.version>1.7.46</athenz.version>
-    <bouncycastle.version>1.59</bouncycastle.version>
+    <jackson.version>2.9.7</jackson.version>
+    <athenz.version>1.8.3</athenz.version>
+    <bouncycastle.version>1.60</bouncycastle.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>com.yahoo.rdl</groupId>
       <artifactId>rdl-java</artifactId>
-      <version>1.4.14</version>
+      <version>1.5.1</version>
       <exclusions>
         <exclusion>
           <groupId>com.fasterxml.jackson.core</groupId>
@@ -172,7 +172,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <phase>package</phase>

diff --git a/libs/java/cert_refresher/pom.xml b/libs/java/cert_refresher/pom.xml
@@ -30,7 +30,7 @@
   <packaging>jar</packaging>
 
   <properties>
-    <jmockit.version>1.42</jmockit.version>
+    <jmockit.version>1.43</jmockit.version>
   </properties>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -75,11 +75,12 @@
     <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
     <rdl.version>1.5.1</rdl.version>
     <bouncycastle.version>1.60</bouncycastle.version>
-    <aws.version>1.11.416</aws.version>
+    <aws.version>1.11.426</aws.version>
     <guava.version>26.0-jre</guava.version>
     <logback.version>1.2.3</logback.version>
     <javax.version>3.1.0</javax.version>
-    <mockito.version>2.22.0</mockito.version>
+    <javax.ws.version>2.1.1</javax.ws.version>
+    <mockito.version>2.23.0</mockito.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>

diff --git a/servers/zms/pom.xml b/servers/zms/pom.xml
@@ -139,6 +139,11 @@
       <artifactId>bcpkix-jdk15on</artifactId>
       <version>${bouncycastle.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>${javax.ws.version}</version>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>

diff --git a/servers/zts/pom.xml b/servers/zts/pom.xml
@@ -143,6 +143,11 @@
       <artifactId>jetty-client</artifactId>
       <version>${jetty.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>${javax.ws.version}</version>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>

diff --git a/utils/zpe_policy_updater/pom.xml b/utils/zpe_policy_updater/pom.xml
@@ -89,7 +89,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.3</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <phase>package</phase>