ds2 · dependabot · Dec 21, 2021 · Dec 21, 2021 · Dec 21, 2021 · Dec 21, 2021
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -8,14 +8,12 @@ description = "DS/2 OSS Core API"
 val logbackVersion: String by project
 
 dependencies {
-    //compileOnly(group: 'javax.enterprise', name: 'cdi-api', version:'1.2')
-    //compileOnly(group: 'javax.validation', name: 'validation-api', version:'1.1.0.Final')
     annotationProcessor("org.projectlombok:lombok:1.18.22")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.0")
     compileOnly("org.projectlombok:lombok:1.18.22")
     implementation("javax.xml.bind:jaxb-api:2.4.0")
-    compileOnly("jakarta.platform", "jakarta.jakartaee-api", "8.0.0")
-    testImplementation("jakarta.platform", "jakarta.jakartaee-api", "8.0.0")
+    compileOnly("jakarta.platform", "jakarta.jakartaee-api", "9.1.0")
+    testImplementation("jakarta.platform", "jakarta.jakartaee-api", "9.1.0")
     testImplementation("org.testng:testng:7.4.0")
     testImplementation("org.slf4j:jul-to-slf4j:1.7.32")
     testRuntimeOnly("ch.qos.logback", "logback-classic", logbackVersion)

diff --git a/api/src/main/java/ds2/oss/core/api/JpaCrudFacade.java b/api/src/main/java/ds2/oss/core/api/JpaCrudFacade.java
@@ -15,7 +15,8 @@
  */
 package ds2.oss.core.api;
 
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
+
 import java.util.List;
 
 /**

diff --git a/api/src/main/java/ds2/oss/core/api/PersistenceSupport.java b/api/src/main/java/ds2/oss/core/api/PersistenceSupport.java
@@ -17,7 +17,7 @@
 
 import ds2.oss.core.api.persistence.InvalidEntityException;
 
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.EntityNotFoundException;
 
 /**
  * A persistence support contract. This can be a database, or a cache instance. Or ElasticSearch.

diff --git a/api/src/main/java/ds2/oss/core/api/annotations/LocaleData.java b/api/src/main/java/ds2/oss/core/api/annotations/LocaleData.java
@@ -15,22 +15,23 @@
  */
 package ds2.oss.core.api.annotations;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.util.Nonbinding;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
-
 /**
  * Marks a field to contain some i18n data.
  *
  * @author dstrauss
  * @version 0.3
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER })
-@javax.enterprise.context.ApplicationScoped
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER})
+@ApplicationScoped
 public @interface LocaleData {
     /**
      * The base name to the properties file.

diff --git a/api/src/main/java/ds2/oss/core/api/annotations/LogResourceRequests.java b/api/src/main/java/ds2/oss/core/api/annotations/LogResourceRequests.java
@@ -15,7 +15,8 @@
  */
 package ds2.oss.core.api.annotations;
 
-import javax.ws.rs.NameBinding;
+import jakarta.ws.rs.NameBinding;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -25,7 +26,7 @@
  * Created by deindesign on 18.12.15.
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.METHOD})
+@Target({ElementType.TYPE, ElementType.METHOD})
 @NameBinding
 public @interface LogResourceRequests {
 }
diff --git a/api/src/main/java/ds2/oss/core/api/annotations/Mock.java b/api/src/main/java/ds2/oss/core/api/annotations/Mock.java
@@ -15,8 +15,9 @@
  */
 package ds2.oss.core.api.annotations;
 
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.Stereotype;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Stereotype;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 

diff --git a/api/src/main/java/ds2/oss/core/api/annotations/PathLocation.java b/api/src/main/java/ds2/oss/core/api/annotations/PathLocation.java
@@ -15,14 +15,14 @@
  */
 package ds2.oss.core.api.annotations;
 
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
-
 /**
  * Used to dynamically inject a path.
  *
@@ -31,7 +31,7 @@
  */
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE })
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE})
 public @interface PathLocation {
     /**
      * The environment variable to use to insert its value via injection.

diff --git a/api/src/main/java/ds2/oss/core/api/annotations/PropertiesLoader.java b/api/src/main/java/ds2/oss/core/api/annotations/PropertiesLoader.java
@@ -15,50 +15,53 @@
  */
 package ds2.oss.core.api.annotations;
 
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
-import javax.validation.constraints.Null;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 
 /**
  * To load a properties file from a specific location.
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE })
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE})
 @Qualifier
 public @interface PropertiesLoader {
     /**
      * A path to a file location.
+     *
      * @return the file path
      */
     @Nonbinding
     String filePath() default "";
 
     /**
      * A path from a system property.
+     *
      * @return a system property name that contains the path
      */
     @Nonbinding
     String sysProp() default "";
 
     /**
      * A path from an environment variable. This is tried first.
+     *
      * @return a path from an environment variable
      */
     @Nonbinding
     String envProp() default "";
 
     /**
      * A resource to load the properties from.
+     *
      * @return a resource name
      */
     @Nonbinding
     String resource() default "";
+
     @Nonbinding
     boolean setNullOnFail() default false;
 }
diff --git a/api/src/main/java/ds2/oss/core/api/annotations/SecureRandomizer.java b/api/src/main/java/ds2/oss/core/api/annotations/SecureRandomizer.java
@@ -15,14 +15,14 @@
  */
 package ds2.oss.core.api.annotations;
 
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
-
 /**
  * Qualifier for a secure randomizer. Put this on fields to have a SecureRandom object being
  * injected.
@@ -31,7 +31,7 @@
  * @version 0.3
  */
 @Qualifier
-@Target({ ElementType.FIELD, ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER })
+@Target({ElementType.FIELD, ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface SecureRandomizer {
     /**

diff --git a/api/src/main/java/ds2/oss/core/api/annotations/SmackPEProvider.java b/api/src/main/java/ds2/oss/core/api/annotations/SmackPEProvider.java
@@ -15,15 +15,15 @@
  */
 package ds2.oss.core.api.annotations;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
-
 /**
  * Marks a type to be a packet extension provider from Smack for XMPP.
  *
@@ -32,7 +32,7 @@
  */
 @Qualifier
 @ApplicationScoped
-@Target({ ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface SmackPEProvider {
 

diff --git a/api/src/main/java/ds2/oss/core/api/annotations/SmackPacketListener.java b/api/src/main/java/ds2/oss/core/api/annotations/SmackPacketListener.java
@@ -15,17 +15,16 @@
  */
 package ds2.oss.core.api.annotations;
 
-import static ds2.oss.core.api.xmpp.PacketTypes.Message;
+import ds2.oss.core.api.xmpp.PacketTypes;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
-
-import ds2.oss.core.api.xmpp.PacketTypes;
+import static ds2.oss.core.api.xmpp.PacketTypes.Message;
 
 /**
  * Marks a smack packet listener.
@@ -35,12 +34,11 @@
  */
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER })
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER})
 public @interface SmackPacketListener {
 
     /**
      * The type to filter.
-     *
      */
     @Nonbinding
     PacketTypes type() default Message;

diff --git a/api/src/main/java/ds2/oss/core/api/annotations/StringLoader.java b/api/src/main/java/ds2/oss/core/api/annotations/StringLoader.java
@@ -15,7 +15,7 @@
  */
 package ds2.oss.core.api.annotations;
 
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
 
 /**
  * To load string values from a property, an environment.

diff --git a/api/src/main/java/ds2/oss/core/api/cache/InfinispanConfig.java b/api/src/main/java/ds2/oss/core/api/cache/InfinispanConfig.java
@@ -15,22 +15,22 @@
  */
 package ds2.oss.core.api.cache;
 
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
-
 /**
  * Injection qualifier.
  *
- * @version 0.3
  * @author dstrauss
+ * @version 0.3
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.METHOD })
+@Target({ElementType.FIELD, ElementType.METHOD})
 @Qualifier
 public @interface InfinispanConfig {
     /**

diff --git a/api/src/main/java/ds2/oss/core/api/crypto/Argon2.java b/api/src/main/java/ds2/oss/core/api/crypto/Argon2.java
@@ -15,8 +15,9 @@
  */
 package ds2.oss.core.api.crypto;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Qualifier;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Qualifier;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/api/src/main/java/ds2/oss/core/api/crypto/KeyPairGeneratorService.java b/api/src/main/java/ds2/oss/core/api/crypto/KeyPairGeneratorService.java
@@ -16,20 +16,20 @@
 package ds2.oss.core.api.crypto;
 
 import ds2.oss.core.api.CoreException;
-import ds2.oss.core.api.maths.WeierstrassCurveData;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 import java.security.KeyPair;
 
 /**
  * Created by deindesign on 11.03.16.
  */
 public interface KeyPairGeneratorService {
-    KeyPair generate(@Min(128)int bitSize, @NotNull AlgorithmNamed alg) throws CoreException;
+    KeyPair generate(@Min(128) int bitSize, @NotNull AlgorithmNamed alg) throws CoreException;
 
     /**
      * Generates an RSA key pair.
+     *
      * @param bitSize the bit size
      * @return the generated key pair
      * @throws CoreException if an error occurred
@@ -38,7 +38,8 @@ public interface KeyPairGeneratorService {
 
     /**
      * Generates an elliptic curve key pair.
-     * @param bitSize the bit size
+     *
+     * @param bitSize   the bit size
      * @param curveName the curve name
      * @return the generated key pair
      * @throws CoreException if an error occurred
@@ -53,6 +54,7 @@ public interface KeyPairGeneratorService {
 
     /**
      * Generates an EC key from a default curve given by the current provider.
+     *
      * @param bitSize the bit size to use
      * @return a keypair with some default key rules
      * @throws CoreException if an error occurred

diff --git a/api/src/main/java/ds2/oss/core/api/crypto/Pbkdf2.java b/api/src/main/java/ds2/oss/core/api/crypto/Pbkdf2.java
@@ -15,8 +15,9 @@
  */
 package ds2.oss.core.api.crypto;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Qualifier;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Qualifier;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/api/src/main/java/ds2/oss/core/api/dto/impl/OptionDto.java b/api/src/main/java/ds2/oss/core/api/dto/impl/OptionDto.java
@@ -19,15 +19,15 @@
 import ds2.oss.core.api.options.Option;
 import ds2.oss.core.api.options.OptionStage;
 import ds2.oss.core.api.options.ValueType;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlType;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
 import java.time.LocalDateTime;
 import java.util.Arrays;