Commit 186680d4 authored by Anastasios Poimenidis's avatar Anastasios Poimenidis
Browse files

feat: introduce java 25, quarkus 3.27.2 and spotless plugin

parent 7f6ac17a

pom.xml

+48 −63
Changes for pom.xml: 48 added lines, 63 removed lines.
Original line number Diff line number Diff line
@@ -8,15 +8,28 @@ 
    <version>1.6.3</version>



    <properties>

        <compiler-plugin.version>3.11.0</compiler-plugin.version>

        <maven.compiler.release>17</maven.compiler.release>

        <!-- Quarkus Platform (MUST use io.quarkus.platform for full BOM extension resolution) -->

        <quarkus-plugin.version>3.27.2</quarkus-plugin.version>

        <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>

        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>

        <quarkus.platform.version>3.27.2</quarkus.platform.version>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

        <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>

        <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>

        <quarkus.platform.version>3.5.0</quarkus.platform.version>

        <skipITs>true</skipITs>

        <surefire-plugin.version>3.1.2</surefire-plugin.version>

        <maven.compiler.source>21</maven.compiler.source>

        <maven.compiler.target>21</maven.compiler.target>

        <maven.compiler.release>21</maven.compiler.release>

        <!-- Kogito / Apache KIE -->

        <!-- Java setup-->

        <maven.compiler.release>21</maven.compiler.release>

        <!-- Non-BOM Managed Dependency Versions -->

        <lombok.version>1.18.34</lombok.version>

        <mapstruct.version>1.6.3</mapstruct.version>

        <!-- Build & Plugin Utilities -->

        <version.compiler.plugin>3.13.0</version.compiler.plugin>

        <version.failsafe.plugin>3.5.2</version.failsafe.plugin>

        <surefire-plugin.version>3.5.2</surefire-plugin.version>

        <jacoco.maven.version>0.8.12</jacoco.maven.version>

        <spotless.maven.plugin.version>3.10.1</spotless.maven.plugin.version>

    </properties>



    <dependencyManagement>
@@ -31,17 +44,6 @@ 
        </dependencies>

    </dependencyManagement>



    <distributionManagement>

        <repository>

            <id>gitlab-maven</id>

            <url>${env.CI_SERVER_URL}/api/v4/projects/${env.CI_PROJECT_ID}/packages/maven</url>

        </repository>

        <snapshotRepository>

            <id>gitlab-maven</id>

            <url>${env.CI_SERVER_URL}/api/v4/projects/${env.CI_PROJECT_ID}/packages/maven</url>

        </snapshotRepository>

    </distributionManagement>



    <repositories>

        <!-- Explicitly define Maven central (first), so that CI job tries to fetch from it first. -->

        <repository>
@@ -52,8 +54,6 @@ 
            <name>Central Repository</name>

            <url>https://repo.maven.apache.org/maven2</url>

        </repository>





        <repository>

            <id>gitlab-maven</id>

            <url>https://labs.etsi.org/rep/api/v4/groups/1332/-/packages/maven</url>
@@ -64,7 +64,7 @@ 
        <dependency>

            <groupId>org.projectlombok</groupId>

            <artifactId>lombok</artifactId>

            <version>1.18.30</version>

            <version>${lombok.version}</version>

            <scope>provided</scope>

        </dependency>

        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
@@ -91,62 +91,47 @@ 
            <scope>provided</scope>

        </dependency>

    </dependencies>



    <build>

        <plugins>

            <plugin>

                <groupId>${quarkus.platform.group-id}</groupId>

                <groupId>io.quarkus</groupId>

                <artifactId>quarkus-maven-plugin</artifactId>

                <version>${quarkus.platform.version}</version>

                <extensions>true</extensions>

                <executions>

                    <execution>

                        <goals>

                            <goal>build</goal>

                            <goal>generate-code</goal>

                            <goal>generate-code-tests</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>

            <plugin>

                <artifactId>maven-compiler-plugin</artifactId>

                <version>${compiler-plugin.version}</version>

                <configuration>

                    <compilerArgs>

                        <arg>-parameters</arg>

                    </compilerArgs>

                </configuration>

                <artifactId>maven-failsafe-plugin</artifactId>

            </plugin>

            <plugin>

                <artifactId>maven-surefire-plugin</artifactId>

                <version>${surefire-plugin.version}</version>

                <configuration>

                    <systemPropertyVariables>

                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>

                        <maven.home>${maven.home}</maven.home>

                    </systemPropertyVariables>

                </configuration>

            </plugin>

            <plugin>

                <artifactId>maven-failsafe-plugin</artifactId>

                <version>${surefire-plugin.version}</version>

                <executions>

                    <execution>

                        <goals>

                            <goal>integration-test</goal>

                            <goal>verify</goal>

                        </goals>

                <groupId>org.apache.maven.plugins</groupId>

                <artifactId>maven-compiler-plugin</artifactId>

                <version>3.13.0</version>

                <configuration>

                            <systemPropertyVariables>

                                <native.image.path>${project.build.directory}/${project.build.finalName}-runner

                                </native.image.path>

                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>

                                <maven.home>${maven.home}</maven.home>

                            </systemPropertyVariables>

                    <release>21</release>

                    <annotationProcessorPaths>

                        <!-- Lombok Annotation Processor -->

                        <path>

                            <groupId>org.projectlombok</groupId>

                            <artifactId>lombok</artifactId>

                            <version>1.18.34</version>

                        </path>

                        <!-- If you use MapStruct, keep this binding. Otherwise you can remove mapstruct paths -->

                        <path>

                            <groupId>org.projectlombok</groupId>

                            <artifactId>lombok-mapstruct-binding</artifactId>

                            <version>0.2.0</version>

                        </path>

                        <path>

                            <groupId>org.mapstruct</groupId>

                            <artifactId>mapstruct-processor</artifactId>

                            <version>1.6.3</version>

                        </path>

                    </annotationProcessorPaths>

                </configuration>

                    </execution>

                </executions>

            </plugin>

            <!-- other plugins... -->

        </plugins>

    </build>

src/main/java/org/etsi/osl/hypo/core/common/CloudEventBase.java

+8 −4
Changes for src/main/java/org/etsi/osl/hypo/core/common/CloudEventBase.java: 8 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -2,13 +2,12 @@ package org.etsi.osl.hypo.core.common; 


import com.fasterxml.jackson.annotation.JsonInclude;

import com.fasterxml.jackson.annotation.JsonProperty;

import org.etsi.osl.hypo.core.common.constants.KogitoConstants;

import java.io.Serializable;

import java.util.UUID;

import lombok.AllArgsConstructor;

import lombok.Data;

import lombok.NoArgsConstructor;



import java.io.Serializable;

import java.util.UUID;

import org.etsi.osl.hypo.core.common.constants.KogitoConstants;



@Data

@AllArgsConstructor
@@ -17,15 +16,20 @@ import java.util.UUID; 
public class CloudEventBase implements Serializable {

    @JsonProperty(KogitoConstants.SPEC_VERSION)

    private String specVersion;



    private UUID id;

    private String source;

    private String type;



    @JsonProperty(KogitoConstants.KOGITO_PROCESS_REFERENCE_ID)

    private UUID processReferenceId;



    @JsonProperty(KogitoConstants.KOGITO_PROCESS_INSTANCE_ID)

    private UUID processInstanceId;



    @JsonProperty(KogitoConstants.KOGITO_PROCESS_ID)

    private String processId;



    @JsonProperty(KogitoConstants.KOGITO_PARENT_PROC_IID)

    private UUID parentProcessId;

}

src/main/java/org/etsi/osl/hypo/core/common/OrganizationCharacteristics.java

+4 −6
Changes for src/main/java/org/etsi/osl/hypo/core/common/OrganizationCharacteristics.java: 4 added lines, 6 removed lines.
Original line number Diff line number Diff line 
package org.etsi.osl.hypo.core.common;



import com.fasterxml.jackson.annotation.JsonInclude;

import org.etsi.osl.hypo.core.common.object.writer.JsonObjectWriter;

import java.io.Serializable;

import java.util.HashMap;

import lombok.AllArgsConstructor;

import lombok.Data;

import lombok.NoArgsConstructor;

import lombok.ToString;



import java.io.Serializable;

import java.util.HashMap;

import org.etsi.osl.hypo.core.common.object.writer.JsonObjectWriter;



@Data

@NoArgsConstructor
@@ -19,8 +18,7 @@ public class OrganizationCharacteristics implements Serializable { 
    private String organizationId;

    private String organizationName;



    @ToString.Exclude

    private HashMap<String,String> characteristics;

    @ToString.Exclude private HashMap<String, String> characteristics;



    public String toStringAsJson() {

        return JsonObjectWriter.writeValueAsJsonString(this);

src/main/java/org/etsi/osl/hypo/core/common/ServiceBaseObject.java

+4 −5
Changes for src/main/java/org/etsi/osl/hypo/core/common/ServiceBaseObject.java: 4 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -2,14 +2,13 @@ package org.etsi.osl.hypo.core.common; 


import com.fasterxml.jackson.annotation.JsonInclude;

import com.fasterxml.jackson.annotation.JsonProperty;

import java.io.Serializable;

import java.util.UUID;

import lombok.AllArgsConstructor;

import lombok.Data;

import lombok.NoArgsConstructor;

import lombok.ToString;



import java.io.Serializable;

import java.util.UUID;



@Data

@AllArgsConstructor

@NoArgsConstructor
@@ -19,8 +18,8 @@ public class ServiceBaseObject implements Serializable { 
    private UUID serviceOrderItemId;

    private UUID serviceId;



    @ToString.Exclude

    private String authHeader;

    @ToString.Exclude private String authHeader;



    @ToString.Exclude

    @JsonProperty("XVaultToken")

    private String xVaultToken;

src/main/java/org/etsi/osl/hypo/core/common/ServiceBaseOrganizationObject.java

+4 −5
Changes for src/main/java/org/etsi/osl/hypo/core/common/ServiceBaseOrganizationObject.java: 4 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -2,14 +2,13 @@ package org.etsi.osl.hypo.core.common; 


import com.fasterxml.jackson.annotation.JsonInclude;

import com.fasterxml.jackson.annotation.JsonProperty;

import java.io.Serializable;

import java.util.UUID;

import lombok.AllArgsConstructor;

import lombok.Data;

import lombok.NoArgsConstructor;

import lombok.ToString;



import java.io.Serializable;

import java.util.UUID;



@Data

@AllArgsConstructor

@NoArgsConstructor
@@ -19,8 +18,8 @@ public class ServiceBaseOrganizationObject implements Serializable { 
    private UUID serviceOrderItemId;

    private UUID serviceId;



    @ToString.Exclude

    private String authHeader;

    @ToString.Exclude private String authHeader;



    @ToString.Exclude

    @JsonProperty("XVaultToken")

    private String xVaultToken;