Preparation for JDK17

Update/remove outdated plugin

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: Ia89aa73e09691d20dde39346244eb43663a01bde
Issue-ID: SDC-4467

diff --git a/pom.xml b/pom.xml
index 9e30517..9ab8d95 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -15,9 +15,9 @@
   -->
 
 <project
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://maven.apache.org/POM/4.0.0"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -49,6 +49,8 @@
         <sonar.coverage.jacoco.xmlReportPaths>
             ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
         </sonar.coverage.jacoco.xmlReportPaths>
+
+        <build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
         <docker.api.version>1.41</docker.api.version>
         <checkstyle.skip>true</checkstyle.skip>
         <jetty.version>9.4.49.v20220914</jetty.version>
@@ -138,8 +140,8 @@
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <configuration>
                     <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
-                   <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
-                   <skip>${checkstyle.skip}</skip>
+                    <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+                    <skip>${checkstyle.skip}</skip>
                 </configuration>
             </plugin>
             <plugin>
@@ -172,36 +174,16 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <version>1.0</version>
-                <inherited>true</inherited>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>${build-helper-maven-plugin.version}</version>
                 <executions>
                     <execution>
-                        <id>docker-tags</id>
-                        <phase>validate</phase>
+                        <phase>initialize</phase>
+                        <id>parse-version</id>
                         <goals>
-                            <goal>execute</goal>
+                            <goal>parse-version</goal>
                         </goals>
-                        <configuration>
-                            <source>
-                                println 'Docker Tagging Script:' + project.properties['sdc.project.version'] + '/' + project.properties['sdc.build.timestamp'];
-                                def versionArray;
-                                if (project.properties['sdc.project.version'] != null) {
-                                    versionArray = project.properties['sdc.project.version'].split('\\.');
-                                }
-
-                                if (project.properties['sdc.project.version'].endsWith("-SNAPSHOT")) {
-                                    project.properties.setProperty('project.docker.latesttag.version', versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest");
-                                    project.properties.setProperty('project.docker.latesttagtimestamp.version', versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-" + project.properties['sdc.build.timestamp']);
-                                } else {
-                                    project.properties.setProperty('project.docker.latesttag.version', versionArray[0] + '.' + versionArray[1] + "-STAGING-latest");
-                                    project.properties.setProperty('project.docker.latesttagtimestamp.version', versionArray[0] + '.' + versionArray[1] + "-STAGING-" + project.properties['sdc.build.timestamp']);
-                                }
-
-                                println 'New Tags for docker:' + project.properties['project.docker.latesttag.version'] + '/' + project.properties['project.docker.latesttagtimestamp.version'];
-                            </source>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

diff --git a/sdc-workflow-designer-be/pom.xml b/sdc-workflow-designer-be/pom.xml
index d265ac4..7e2d39c 100644 (file)
--- a/sdc-workflow-designer-be/pom.xml
+++ b/sdc-workflow-designer-be/pom.xml
@@ -16,8 +16,8 @@
     <properties>
         <spring.boot.version>2.2.13.RELEASE</spring.boot.version>
         <org.springframework.version>5.2.23.RELEASE</org.springframework.version>
-        <mapstruct.version>1.3.1.Final</mapstruct.version>
-        <lombok.version>1.18.0</lombok.version>
+        <mapstruct.version>1.5.3.Final</mapstruct.version>
+        <lombok.version>1.18.26</lombok.version>
         <springfox.version>3.0.0</springfox.version>
         <jaxb.api.version>2.3.0</jaxb.api.version>
         <org.glassfish.version>4.0.2</org.glassfish.version>
@@ -475,7 +475,11 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
-            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok-mapstruct-binding</artifactId>
+            <version>0.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -672,8 +676,8 @@
                                     <build>
                                         <tags>
                                             <tag>latest</tag>
-                                            <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                            <tag>${project.docker.latesttag.version}</tag>
+                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-${maven.build.timestamp}</tag>
                                         </tags>
                                         <dockerFileDir>${project.basedir}/docker</dockerFileDir>
                                         <args>

diff --git a/sdc-workflow-designer-init/pom.xml b/sdc-workflow-designer-init/pom.xml
index a6f3b5b..d528be6 100644 (file)
--- a/sdc-workflow-designer-init/pom.xml
+++ b/sdc-workflow-designer-init/pom.xml
@@ -32,8 +32,8 @@
                                     <build>
                                         <tags>
                                             <tag>latest</tag>
-                                            <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                            <tag>${project.docker.latesttag.version}</tag>
+                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-${maven.build.timestamp}</tag>
                                         </tags>
                                         <dockerFile>Dockerfile</dockerFile>
                                     </build>

diff --git a/sdc-workflow-designer-ui/pom.xml b/sdc-workflow-designer-ui/pom.xml
index 633bf68..5cd8725 100644 (file)
--- a/sdc-workflow-designer-ui/pom.xml
+++ b/sdc-workflow-designer-ui/pom.xml
@@ -139,7 +139,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>${build-helper-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>regex-property</id>
@@ -210,8 +210,8 @@
                                     <build>
                                         <tags>
                                             <tag>latest</tag>
-                                            <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                            <tag>${project.docker.latesttag.version}</tag>
+                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+                                            <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-${maven.build.timestamp}</tag>
                                         </tags>
                                         <dockerFileDir>${project.basedir}/docker</dockerFileDir>
                                         <args>