Merge branch 'RED-5694' into 'main'

RED-5694: Upgraded to latest platform-dependency

See merge request fforesight/layout-parser!1

layoutparser-service/layoutparser-service-internal-api/pom.xml

@@ -14,11 +14,6 @@
     <artifactId>layoutparser-service-internal-api</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.26</version>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

layoutparser-service/layoutparser-service-processor/pom.xml

@@ -32,11 +32,6 @@
             <artifactId>spring-commons</artifactId>
             <version>6.2.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.dslplatform</groupId>
-            <artifactId>dsl-json-java8</artifactId>
-            <version>1.10.0</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox</artifactId>
@@ -72,11 +67,6 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <version>${spring.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/multitenancy/EncryptionDecryptionService.java

@@ -6,7 +6,6 @@ import java.security.SecureRandom;
 import java.security.spec.KeySpec;
 import java.util.Base64;
 
-import javax.annotation.PostConstruct;
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
@@ -17,6 +16,7 @@ import javax.crypto.spec.SecretKeySpec;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import jakarta.annotation.PostConstruct;
 import lombok.SneakyThrows;
 
 @Service

layoutparser-service/layoutparser-service-server/pom.xml

@@ -52,18 +52,6 @@
     <build>
         <plugins>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <annotationProcessors>
-                        <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
-                        <annotationProcessor>com.dslplatform.json.processor.CompiledJsonAnnotationProcessor</annotationProcessor>
-                    </annotationProcessors>
-                </configuration>
-            </plugin>
-
-
             <plugin>
                 <!-- generate git.properties for exposure in /info -->
                 <groupId>pl.project13.maven</groupId>

layoutparser-service/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.iqser.red</groupId>
         <artifactId>platform-dependency</artifactId>
-        <version>1.17.0</version>
+        <version>2.3.0</version>
         <relativePath/>
     </parent>
 
@@ -27,11 +27,9 @@
         <jackson.version>2.13.2</jackson.version>
         <slf4j.version>2.0.7</slf4j.version>
         <pdfbox.version>3.0.0-alpha2</pdfbox.version>
-        <lombok.version>1.18.26</lombok.version>
         <spring.version>3.0.1</spring.version>
         <spring.cloud.version>2022.0.1</spring.cloud.version>
         <jackson.version>2.15.0-rc2</jackson.version>
-        <dsljson.version>1.9.9</dsljson.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>