Merge branch 'malowe/main/35' into 'main'

Iss #35 - Migrate to commons 9.1, Quarkus 3.2, and Java 17 runtime

See merge request !40

pom.xml

@@ -6,17 +6,18 @@
   <version>1.0.0-SNAPSHOT</version>
   <properties>
     <compiler-plugin.version>3.8.1</compiler-plugin.version>
-    <failsafe.useModulePath>false</failsafe.useModulePath>
-    <maven.compiler.release>11</maven.compiler.release>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>    
     <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>2.16.12.Final</quarkus.platform.version>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
-    <auto-value.version>1.8.2</auto-value.version>
-    <org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
-    <eclipse-api-version>0.8.4</eclipse-api-version>
+    <quarkus.platform.version>3.2.9.Final</quarkus.platform.version>
+    <surefire-plugin.version>3.1.2</surefire-plugin.version>
+    <maven.compiler.parameters>true</maven.compiler.parameters>
+    <eclipse-api-version>0.9.1</eclipse-api-version>
+    <auto-value.version>1.10.4</auto-value.version>
+    <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
     <sonar.sources>src/main</sonar.sources>
     <sonar.tests>src/test</sonar.tests>
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>

src/main/java/org/eclipsefoundation/cve/api/GithubCveAPI.java

@@ -14,10 +14,10 @@ package org.eclipsefoundation.cve.api;
 
 import java.util.List;
 
-import javax.ws.rs.BeanParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.BeanParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
 
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 import org.eclipsefoundation.cve.api.models.CveProjectRequestParams;

src/main/java/org/eclipsefoundation/cve/api/GitlabCveAPI.java

@@ -11,9 +11,9 @@
 **********************************************************************/
 package org.eclipsefoundation.cve.api;
 
-import javax.ws.rs.BeanParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.BeanParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
 
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 import org.eclipsefoundation.cve.api.models.GitlabRequestParams;

src/main/java/org/eclipsefoundation/cve/api/models/CveProjectRequestParams.java

@@ -11,8 +11,8 @@
 **********************************************************************/
 package org.eclipsefoundation.cve.api.models;
 
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.PathParam;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;

src/main/java/org/eclipsefoundation/cve/api/models/GithubAdvisoriesRequestParams.java

@@ -11,8 +11,8 @@
 **********************************************************************/
 package org.eclipsefoundation.cve.api.models;
 
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.QueryParam;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.QueryParam;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;

src/main/java/org/eclipsefoundation/cve/api/models/GitlabRequestParams.java

@@ -11,9 +11,9 @@
 **********************************************************************/
 package org.eclipsefoundation.cve.api.models;
 
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;

src/main/java/org/eclipsefoundation/cve/model/CveData.java

@@ -14,7 +14,7 @@ package org.eclipsefoundation.cve.model;
 import java.net.URI;
 import java.time.LocalDate;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.apache.commons.lang3.StringUtils;
 

src/main/java/org/eclipsefoundation/cve/model/CveProjectData.java

@@ -14,7 +14,7 @@ package org.eclipsefoundation.cve.model;
 import java.util.List;
 import java.util.Optional;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;

src/main/java/org/eclipsefoundation/cve/model/GithubAdvisoriesData.java

@@ -12,7 +12,7 @@
  */
 package org.eclipsefoundation.cve.model;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;

src/main/java/org/eclipsefoundation/cve/precaches/InternalAdvisoriesPrecacheProvider.java

@@ -18,10 +18,10 @@ import java.util.concurrent.CompletableFuture;
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.ProcessingException;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.ProcessingException;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.microprofile.context.ManagedExecutor;

src/main/java/org/eclipsefoundation/cve/resources/CveResource.java

@@ -15,16 +15,16 @@ package org.eclipsefoundation.cve.resources;
 import java.util.List;
 import java.util.Optional;
 
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipsefoundation.cve.model.CveData;

src/main/java/org/eclipsefoundation/cve/service/impl/DefaultCveService.java

@@ -14,8 +14,8 @@ package org.eclipsefoundation.cve.service.impl;
 
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.eclipsefoundation.core.model.ParameterizedCacheKey;
 import org.eclipsefoundation.core.service.LoadingCacheManager;

src/test/java/org/eclipsefoundation/cve/test/api/MockGithubCveAPI.java

@@ -17,8 +17,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.eclipsefoundation.cve.api.GithubCveAPI;

src/test/java/org/eclipsefoundation/cve/test/api/MockGitlabCveAPI.java

@@ -13,8 +13,8 @@ package org.eclipsefoundation.cve.test.api;
 
 import java.time.LocalDate;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.eclipsefoundation.cve.api.GitlabCveAPI;