[DRAFT]: Feat: Upgrade to Spring Boot 3.3.13

.github/deploy_templates/values-dev.yaml

@@ -10,7 +10,7 @@ KEYCLOAK_ENABLED: "false"
 # IP of db
 PG_DB_ADDR: "my-postgres-postgresql"
 # Spring profile for security
-SPRING_PROFILES: "disable-security"
+ACTIVE_PROFILES_SPRING: "disable-security"
 keepHookLogs: true
 HELPER_IMAGE: "ghcr.io/netcracker/qubership-testing-platform-helm-hook-helper:main_latest"
 CONTENT_SECURITY_POLICY: "*"

.github/workflows/dev-mvn-docker-build.yaml

@@ -21,7 +21,7 @@ on:
       - ".github/**"
   workflow_dispatch: {}
   pull_request:
-    branches: [main]
+    branches: main
     types:
       [opened, reopened, synchronize]
 
@@ -64,7 +64,7 @@ jobs:
 
       - name: Maven Docker build
         id: maven_build
-        uses: netcracker/qubership-workflow-hub/actions/maven-snapshot-deploy@8d542a426ce561c7dce745f6b9cee068d1d7e101 # v2.0.10
+        uses: netcracker/qubership-workflow-hub/actions/maven-snapshot-deploy@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1
         with:
           java-version: "21"
           additional-mvn-args: ${{ env.additional-mvn-args }}
@@ -139,13 +139,13 @@ jobs:
 
       - name: Metadata
         id: metadata
-        uses: netcracker/qubership-workflow-hub/actions/metadata-action@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10
+        uses: netcracker/qubership-workflow-hub/actions/metadata-action@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1
         with:
           default-template: '{{ref-name}}-{{timestamp}}'
 
       - name: Build and Publish Docker Image
         id: docker_build
-        uses: netcracker/qubership-workflow-hub/actions/docker-action@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10
+        uses: netcracker/qubership-workflow-hub/actions/docker-action@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1
         with:
           ref: ${{ github.ref }}
           dry-run: false
@@ -163,8 +163,7 @@ jobs:
     if: |
       needs.build-and-push.result == 'success' &&
       (
-        github.event_name == 'pull_request' ||
-        (github.event_name == 'push' && github.ref == 'refs/heads/main')
+        github.event_name == 'pull_request'
       )
     uses: netcracker/qubership-testing-platform-helm-hook-helper/.github/workflows/deploy-run-tests.yaml@main
     with:

.github/workflows/maven-release-v2.yaml

@@ -87,7 +87,7 @@ jobs:
           mongo_db: dsgridfs
 
       - name: "Build and Publish current SNAPSHOT (dry run)"
-        uses: netcracker/qubership-workflow-hub/actions/maven-release@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10
+        uses: netcracker/qubership-workflow-hub/actions/maven-release@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1
         with:
           java-version: "21"
           version-type: ${{ github.event.inputs.version-type }}
@@ -140,7 +140,7 @@ jobs:
       - name: "Build and Publish"
         id: build-and-publish
 
-        uses: netcracker/qubership-workflow-hub/actions/maven-release@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10
+        uses: netcracker/qubership-workflow-hub/actions/maven-release@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1
         with:
           java-version: "21"
           version-type: ${{ github.event.inputs.version-type }}
@@ -212,7 +212,7 @@ jobs:
     steps:
       - name: "Docker Build"
         id: docker_build
-        uses: netcracker/qubership-workflow-hub/actions/docker-action@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10
+        uses: netcracker/qubership-workflow-hub/actions/docker-action@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1
         with:
           ref: v${{ needs.deploy.outputs.release-version }}
           download-artifact: true

.github/workflows/pr-assigner.yml

@@ -26,6 +26,6 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: netcracker/qubership-workflow-hub/actions/pr-assigner@8d542a426ce561c7dce745f6b9cee068d1d7e101 #2.0.10
+      - uses: netcracker/qubership-workflow-hub/actions/pr-assigner@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/security-scan.yml

@@ -60,7 +60,7 @@ jobs:
     steps:
       - name: List GHCR packages for this repo
         id: ghcr
-        uses: Netcracker/qubership-workflow-hub/actions/ghcr-discover-repo-packages@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10
+        uses: Netcracker/qubership-workflow-hub/actions/ghcr-discover-repo-packages@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1
         env:
           GH_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
 
@@ -85,7 +85,7 @@ jobs:
         package: ${{ fromJson(needs.debug-packages.outputs.packages) }}
 
     name: "Run Security Scan (matrix)"
-    uses: netcracker/qubership-workflow-hub/.github/workflows/re-security-scan.yml@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10
+    uses: netcracker/qubership-workflow-hub/.github/workflows/re-security-scan.yml@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1
     with:
       target: ${{ inputs.target || 'docker' }}
       image: ${{ format('{0}:{1}', matrix.package.path, inputs.tag || 'latest') }}
@@ -94,7 +94,7 @@ jobs:
     needs: debug-packages
     if: ${{ inputs.image != '' && inputs.image != null }}
     name: "Run Security Scan (single image)"
-    uses: netcracker/qubership-workflow-hub/.github/workflows/re-security-scan.yml@8d542a426ce561c7dce745f6b9cee068d1d7e101 #v2.0.10
+    uses: netcracker/qubership-workflow-hub/.github/workflows/re-security-scan.yml@5edd67e98d2f0eec5ab77b4deca0e1d481137462 # v2.1.1
     with:
       target: ${{ inputs.target || 'docker' }}
       image: ${{ inputs.image }}

Dockerfile

@@ -27,12 +27,13 @@ RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.23/community/" >/etc/apk/repo
           nss_wrapper=1.1.12-r1 \
           pcre2=10.47-r0 \
           procps-ng=4.0.5-r0 \
-          sops=3.11.0-r3 \
+          sops=3.11.0-r4 \
           sysstat=12.7.8-r0 \
           tcpdump=4.99.5-r1 \
           wget=1.25.0-r2 \
           xz-libs=5.8.2-r0 \
-          zip=3.0-r13 && \
+          zip=3.0-r13 \
+          zlib=1.3.2-r0 && \
         rm -rf /var/cache/apk/*
 
 COPY deployments/install deployments/install

README.md

@@ -86,8 +86,8 @@ Datasets Service is used to store and manage test case data.
 3. Main class: org.qubership.atp.dataset.Main
 4. VM options:
     ````properties
-    -Dspring.config.location=target/config/application.properties
-    -Dspring.cloud.bootstrap.location=target/config/bootstrap.properties
+    -Dspring.config.location=file:./target/config/application.properties
+    -Dspring.cloud.bootstrap.location=file:./target/config/bootstrap.properties
     -Dlogging.level.org.qubership.atp.common.logging.interceptor.RestTemplateLogInterceptor=debug
     -Dlogging.level.org.qubership.atp.catalogue.service.client.feign.DatasetFeignClient=debug
     -Dds.logger.level=DEBUG

atp-dataset-benchmarks/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.qubership.atp.dataset</groupId>
         <artifactId>atp-dataset-parent-dependencies</artifactId>
-        <version>1.3.174-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/parent-dependencies/pom.xml</relativePath>
     </parent>
 
@@ -26,7 +26,7 @@
         <!--
             Java source/target to use for compilation.
           -->
-        <javac.target>1.8</javac.target>
+        <javac.target>21</javac.target>
 
         <!--
             Name of the benchmark Uber-JAR to generate.
@@ -59,13 +59,31 @@
                     <artifactId>log4j-core</artifactId>
                     <groupId>org.apache.logging.log4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>org.qubership.atp.dataset</groupId>
             <artifactId>atp-dataset</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>

atp-dataset-common/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.qubership.atp.dataset</groupId>
         <artifactId>atp-dataset-parent-java</artifactId>
-        <version>1.3.174-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/parent-java/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -19,5 +19,10 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

atp-dataset-common/src/main/java/org/qubership/atp/dataset/utils/Utils.java

@@ -22,8 +22,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -78,7 +78,7 @@ public static String replacePlaceholders(Matcher matcher, Function<String, Strin
      */
     private static String replacePlaceholders(Matcher matcher, int groupToConvert,
                                               Function<String, String> placeholderIntoValue) {
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         while (matcher.find()) {
             matcher.appendReplacement(result, placeholderIntoValue.apply(matcher.group(groupToConvert)));
         }

atp-dataset-distribution/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.qubership.atp.dataset</groupId>
         <artifactId>atp-dataset-parent-dependencies</artifactId>
-        <version>1.3.174-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/parent-dependencies/pom.xml</relativePath>
     </parent>
 
@@ -34,6 +34,14 @@
                     <artifactId>log4j-core</artifactId>
                     <groupId>org.apache.logging.log4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

atp-dataset-import/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.qubership.atp.dataset</groupId>
         <artifactId>atp-dataset-parent-db</artifactId>
-        <version>1.3.174-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../parent/parent-db/pom.xml</relativePath>
     </parent>
 
@@ -77,6 +77,14 @@
                     <artifactId>log4j-core</artifactId>
                     <groupId>org.apache.logging.log4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -159,8 +167,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <additionalClasspathElements>
-                        <additionalClasspathElement>${basedir}/target/test-basedir/config/
-                        </additionalClasspathElement>
+                        <additionalClasspathElement>${basedir}/target/test-basedir/config/</additionalClasspathElement>
                     </additionalClasspathElements>
                     <argLine>${tests.argLine}</argLine>
                 </configuration>
@@ -176,8 +183,7 @@
                     <archive>
                         <manifestEntries>
                             <Implementation-Title>DI Excel Importer</Implementation-Title>
-                            <Implementation-Version>${project.version}-${svn.revision}
-                            </Implementation-Version>
+                            <Implementation-Version>${project.version}-${svn.revision}</Implementation-Version>
                         </manifestEntries>
                     </archive>
                 </configuration>
@@ -186,8 +192,7 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
                     <descriptors>
-                        <descriptor>src/main/resources/assemblies/import-excel-assembly.xml
-                        </descriptor>
+                        <descriptor>src/main/resources/assemblies/import-excel-assembly.xml</descriptor>
                     </descriptors>
                 </configuration>
                 <executions>

atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/ChildDsImporter.java

@@ -19,7 +19,7 @@
 import java.util.Iterator;
 import java.util.UUID;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;

atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/DsRow.java

@@ -16,8 +16,8 @@
 
 package org.qubership.atp.dataset.migration;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 import org.apache.poi.ss.usermodel.Cell;
 

atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/ParentDsImporter.java

@@ -18,8 +18,6 @@
 
 import java.util.Iterator;
 
-import javax.annotation.Nonnull;
-
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.qubership.atp.dataset.migration.formula.model.EvaluationContext;
@@ -37,12 +35,13 @@
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Iterators;
+import jakarta.annotation.Nonnull;
 
 public class ParentDsImporter {
 
     private static final Logger LOG = LoggerFactory.getLogger(ParentDsImporter.class);
 
-    private ImportResources res;
+    private final ImportResources res;
 
     public ParentDsImporter(ImportResources res) {
         this.res = res;
@@ -51,8 +50,7 @@ public ParentDsImporter(ImportResources res) {
     /**
      * create parent dataset.
      *
-     * @param resources see {@link ImportResources#create(DsServicesFacade, String, String, String,
-     *                  String)}.
+     * @param resources see {@link ImportResources#create(DsServicesFacade, String, String, String, String)}.
      */
     public static ParentDsImporter create(ImportResources resources) {
         return new ParentDsImporter(resources);

atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/SheetDataIterator.java

@@ -20,8 +20,8 @@
 
 import java.util.Iterator;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;

atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/apply/CreateParam.java

@@ -20,7 +20,7 @@
 
 import java.util.Collections;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 
 import org.qubership.atp.dataset.migration.formula.model.Formula;
 import org.qubership.atp.dataset.migration.formula.model.TransformationException;

atp-dataset-import/src/main/java/org/qubership/atp/dataset/migration/apply/Overlap.java

@@ -20,7 +20,7 @@
 
 import java.io.ByteArrayInputStream;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.qubership.atp.dataset.migration.formula.model.Formula;
 import org.qubership.atp.dataset.migration.formula.model.TransformationException;