Update deps

openraven · Mar 16, 2024 · 04f8ffa · 04f8ffa
1 parent 9527562
commit 04f8ffa
Show file tree

Hide file tree

Showing 182 changed files with 662 additions and 634 deletions.
diff --git a/magpie-api/pom.xml b/magpie-api/pom.xml
@@ -3,15 +3,15 @@
   <parent>
     <artifactId>magpie-parent</artifactId>
     <groupId>io.openraven.magpie</groupId>
-    <version>0.10.1-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>magpie-api</artifactId>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 
   <dependencies>

diff --git a/magpie-aws/pom.xml b/magpie-aws/pom.xml
@@ -3,16 +3,16 @@
   <parent>
     <artifactId>magpie-parent</artifactId>
     <groupId>io.openraven.magpie</groupId>
-    <version>0.10.1-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>magpie-aws</artifactId>
 
   <properties>
     <project.version>${project.version}</project.version>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <javatuples.version>1.2</javatuples.version>
     <aws-sigv4-auth-cassandra-java-driver-plugin.version>4.0.8</aws-sigv4-auth-cassandra-java-driver-plugin.version>
     <mockito.version>4.6.1</mockito.version>
@@ -41,16 +41,34 @@
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>sso</artifactId>
       <version>${aws.sdk.version}</version>
+    <exclusions>
+        <exclusion>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>netty-nio-client</artifactId>
+        </exclusion>
+    </exclusions>
     </dependency>
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>athena</artifactId>
       <version>${aws.sdk.version}</version>
+        <exclusions>
+            <exclusion>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>netty-nio-client</artifactId>
+            </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>batch</artifactId>
       <version>${aws.sdk.version}</version>
+        <exclusions>
+            <exclusion>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>netty-nio-client</artifactId>
+            </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
       <groupId>software.amazon.awssdk</groupId>

diff --git a/magpie-aws/src/main/java/io/openraven/magpie/plugins/aws/discovery/AWSUtils.java b/magpie-aws/src/main/java/io/openraven/magpie/plugins/aws/discovery/AWSUtils.java
@@ -38,7 +38,7 @@
 import software.amazon.awssdk.services.cloudwatch.model.Statistic;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.io.IOException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;

diff --git a/magpie-aws/src/main/java/io/openraven/magpie/plugins/aws/discovery/ClientCreators.java b/magpie-aws/src/main/java/io/openraven/magpie/plugins/aws/discovery/ClientCreators.java
@@ -8,7 +8,7 @@
 import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider;
 import software.amazon.awssdk.services.sts.model.AssumeRoleRequest;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.net.URI;
 import java.util.UUID;
 

diff --git a/.../src/main/java/io/openraven/magpie/plugins/aws/discovery/services/CassandraDiscovery.java b/.../src/main/java/io/openraven/magpie/plugins/aws/discovery/services/CassandraDiscovery.java
@@ -35,7 +35,11 @@
 import javax.net.ssl.SSLContext;
 import java.net.InetSocketAddress;
 import java.security.NoSuchAlgorithmException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 import static java.lang.String.format;
 

diff --git a/...ie-aws/src/main/java/io/openraven/magpie/plugins/aws/discovery/services/EC2Discovery.java b/...ie-aws/src/main/java/io/openraven/magpie/plugins/aws/discovery/services/EC2Discovery.java
@@ -55,7 +55,7 @@
 import software.amazon.awssdk.services.ec2.model.Tag;
 import software.amazon.awssdk.utils.StringUtils;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;

diff --git a/magpie-azure/pom.xml b/magpie-azure/pom.xml
@@ -4,14 +4,14 @@
   <parent>
     <groupId>io.openraven.magpie</groupId>
     <artifactId>magpie-parent</artifactId>
-    <version>0.10.1-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>magpie-azure</artifactId>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 

diff --git a/magpie-azure/src/main/java/io/openraven/magpie/plugins/azure/discovery/AzureUtils.java b/magpie-azure/src/main/java/io/openraven/magpie/plugins/azure/discovery/AzureUtils.java
@@ -22,7 +22,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

diff --git a/magpie-cli/pom.xml b/magpie-cli/pom.xml
@@ -3,15 +3,15 @@
   <parent>
     <artifactId>magpie-parent</artifactId>
     <groupId>io.openraven.magpie</groupId>
-    <version>0.10.1-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>magpie-cli</artifactId>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <jar.finalName>${project.name}</jar.finalName>
   </properties>
 

diff --git a/magpie-core/pom.xml b/magpie-core/pom.xml
@@ -3,15 +3,15 @@
   <parent>
     <artifactId>magpie-parent</artifactId>
     <groupId>io.openraven.magpie</groupId>
-    <version>0.10.1-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>magpie-core</artifactId>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 
   <dependencies>
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>io.openraven.magpie</groupId>
       <artifactId>magpie-persist</artifactId>
-      <version>0.10.1-SNAPSHOT</version>
+      <version>0.11.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
 

diff --git a/magpie-data/pom.xml b/magpie-data/pom.xml
@@ -3,19 +3,19 @@
   <parent>
     <artifactId>magpie-parent</artifactId>
     <groupId>io.openraven.magpie</groupId>
-    <version>0.10.1-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>magpie-data</artifactId>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
-    <aws-java-sdk.version>2.17.93</aws-java-sdk.version>
-    <javax.persistence.version>2.2</javax.persistence.version>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
+    <jakarta.persistence.version>3.1.0</jakarta.persistence.version>
     <findbugs.version>3.0.2</findbugs.version>
     <reflections.version>0.10.2</reflections.version>
+    <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
   </properties>
 
   <distributionManagement>
@@ -30,7 +30,7 @@
       <dependency>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>bom</artifactId>
-        <version>${aws-java-sdk.version}</version>
+        <version>${aws.sdk.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -46,9 +46,14 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.persistence</groupId>
-      <artifactId>javax.persistence-api</artifactId>
-      <version>${javax.persistence.version}</version>
+      <groupId>jakarta.persistence</groupId>
+      <artifactId>jakarta.persistence-api</artifactId>
+      <version>${jakarta.persistence.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <version>${jakarta.annotation-api.version}</version>
     </dependency>
 
     <dependency>
@@ -67,6 +72,12 @@
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>s3</artifactId>
+        <exclusions>
+            <exclusion>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>netty-nio-client</artifactId>
+            </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
@@ -217,9 +228,9 @@
       <artifactId>ssm</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.hibernate</groupId>
+      <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-jpamodelgen</artifactId>
-      <version>5.6.5.Final</version>
+      <version>6.4.4.Final</version>
     </dependency>
 
     <!--    TEST    -->

diff --git a/magpie-data/src/main/java/io/openraven/magpie/data/aws/AWSResource.java b/magpie-data/src/main/java/io/openraven/magpie/data/aws/AWSResource.java
@@ -38,13 +38,13 @@
 import io.openraven.magpie.data.Resource;
 import io.openraven.magpie.data.utils.JsonConverter;
 
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Transient;
+import jakarta.persistence.Access;
+import jakarta.persistence.AccessType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Transient;
 import java.time.Instant;
 
 @Access(AccessType.FIELD)

diff --git a/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/AccountResource.java b/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/AccountResource.java
@@ -38,9 +38,9 @@
 
 import static java.lang.String.format;
 
-@javax.persistence.Entity
-@javax.persistence.Inheritance(strategy = javax.persistence.InheritanceType.TABLE_PER_CLASS)
-@javax.persistence.Table(name = AccountResource.TABLE_NAME)
+@jakarta.persistence.Entity
+@jakarta.persistence.Inheritance(strategy = jakarta.persistence.InheritanceType.TABLE_PER_CLASS)
+@jakarta.persistence.Table(name = AccountResource.TABLE_NAME)
 public class AccountResource extends AWSResource {
 
   protected static final String TABLE_NAME = "awsaccount";

diff --git a/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/IamAccount.java b/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/IamAccount.java
@@ -21,9 +21,9 @@
 
 import io.openraven.magpie.data.aws.AWSResource;
 
-@javax.persistence.Entity
-@javax.persistence.Inheritance(strategy = javax.persistence.InheritanceType.TABLE_PER_CLASS)
-@javax.persistence.Table(name = IamAccount.TABLE_NAME)
+@jakarta.persistence.Entity
+@jakarta.persistence.Inheritance(strategy = jakarta.persistence.InheritanceType.TABLE_PER_CLASS)
+@jakarta.persistence.Table(name = IamAccount.TABLE_NAME)
 public class IamAccount extends AWSResource {
 
   protected static final String TABLE_NAME = "awsiamaccount";

diff --git a/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/IamCredentialsReport.java b/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/IamCredentialsReport.java
@@ -21,9 +21,9 @@
 
 import io.openraven.magpie.data.aws.AWSResource;
 
-@javax.persistence.Entity
-@javax.persistence.Inheritance(strategy = javax.persistence.InheritanceType.TABLE_PER_CLASS)
-@javax.persistence.Table(name = IamCredentialsReport.TABLE_NAME)
+@jakarta.persistence.Entity
+@jakarta.persistence.Inheritance(strategy = jakarta.persistence.InheritanceType.TABLE_PER_CLASS)
+@jakarta.persistence.Table(name = IamCredentialsReport.TABLE_NAME)
 public class IamCredentialsReport extends AWSResource {
 
   protected static final String TABLE_NAME = "awsiamcredentialsreport";

diff --git a/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/IamGroup.java b/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/IamGroup.java
@@ -39,9 +39,9 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.iam.model.Group;
 
-@javax.persistence.Entity
-@javax.persistence.Inheritance(strategy = javax.persistence.InheritanceType.TABLE_PER_CLASS)
-@javax.persistence.Table(name = IamGroup.TABLE_NAME)
+@jakarta.persistence.Entity
+@jakarta.persistence.Inheritance(strategy = jakarta.persistence.InheritanceType.TABLE_PER_CLASS)
+@jakarta.persistence.Table(name = IamGroup.TABLE_NAME)
 public class IamGroup extends AWSResource {
 
   public static final String TABLE_NAME = "awsiamgroup";

diff --git a/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/IamPolicy.java b/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/IamPolicy.java
@@ -38,9 +38,9 @@
 import io.openraven.magpie.data.aws.shared.PayloadUtils;
 import software.amazon.awssdk.services.iam.model.Policy;
 
-@javax.persistence.Entity
-@javax.persistence.Inheritance(strategy = javax.persistence.InheritanceType.TABLE_PER_CLASS)
-@javax.persistence.Table(name = IamPolicy.TABLE_NAME)
+@jakarta.persistence.Entity
+@jakarta.persistence.Inheritance(strategy = jakarta.persistence.InheritanceType.TABLE_PER_CLASS)
+@jakarta.persistence.Table(name = IamPolicy.TABLE_NAME)
 public class IamPolicy extends AWSResource {
   protected static final String TABLE_NAME = "awsiampolicy";
   public static final String RESOURCE_TYPE = "AWS::IAM::Policy";

diff --git a/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/IamRole.java b/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/IamRole.java
@@ -38,9 +38,9 @@
 import io.openraven.magpie.data.aws.shared.PayloadUtils;
 import software.amazon.awssdk.services.iam.model.Role;
 
-@javax.persistence.Entity
-@javax.persistence.Inheritance(strategy = javax.persistence.InheritanceType.TABLE_PER_CLASS)
-@javax.persistence.Table(name = IamRole.TABLE_NAME)
+@jakarta.persistence.Entity
+@jakarta.persistence.Inheritance(strategy = jakarta.persistence.InheritanceType.TABLE_PER_CLASS)
+@jakarta.persistence.Table(name = IamRole.TABLE_NAME)
 public class IamRole extends AWSResource {
   protected static final String TABLE_NAME = "awsiamrole";
   public static final String RESOURCE_TYPE = "AWS::IAM::Role";

diff --git a/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/IamUser.java b/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/IamUser.java
@@ -38,9 +38,9 @@
 import io.openraven.magpie.data.aws.shared.PayloadUtils;
 import software.amazon.awssdk.services.iam.model.User;
 
-@javax.persistence.Entity
-@javax.persistence.Inheritance(strategy = javax.persistence.InheritanceType.TABLE_PER_CLASS)
-@javax.persistence.Table(name = IamUser.TABLE_NAME)
+@jakarta.persistence.Entity
+@jakarta.persistence.Inheritance(strategy = jakarta.persistence.InheritanceType.TABLE_PER_CLASS)
+@jakarta.persistence.Table(name = IamUser.TABLE_NAME)
 public class IamUser extends AWSResource {
   protected static final String TABLE_NAME = "awsiamuser";
   public static final String RESOURCE_TYPE = "AWS::IAM::User";

diff --git a/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/ShadowAccountResource.java b/magpie-data/src/main/java/io/openraven/magpie/data/aws/accounts/ShadowAccountResource.java
@@ -36,9 +36,9 @@
 
 import io.openraven.magpie.data.aws.AWSResource;
 
-@javax.persistence.Entity
-@javax.persistence.Inheritance(strategy = javax.persistence.InheritanceType.TABLE_PER_CLASS)
-@javax.persistence.Table(name = ShadowAccountResource.TABLE_NAME)
+@jakarta.persistence.Entity
+@jakarta.persistence.Inheritance(strategy = jakarta.persistence.InheritanceType.TABLE_PER_CLASS)
+@jakarta.persistence.Table(name = ShadowAccountResource.TABLE_NAME)
 public class ShadowAccountResource extends AWSResource {
   protected static final String TABLE_NAME = "orvnshadowaccount";
     public static final String RESOURCE_TYPE = "ORVN::ShadowAccount";