Merge branch 'malowe/master/32' into 'master'

Iss #33 - Migrate to commons 9.1, Quarkus 3.2, Java 17

Closes #33

See merge request !41

pom.xml

@@ -8,18 +8,19 @@
   <artifactId>geoip-client</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <properties>
+    <compiler-plugin.version>3.8.1</compiler-plugin.version>
+    <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>3.2.9.Final</quarkus.platform.version>
+    <surefire-plugin.version>3.1.2</surefire-plugin.version>
     <maven.compiler.parameters>true</maven.compiler.parameters>
-    <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
-    <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-    <quarkus.platform.version>2.16.7.Final</quarkus.platform.version>
-		<eclipse-api-version>0.8.0</eclipse-api-version>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
-    <compiler-plugin.version>3.8.1</compiler-plugin.version>
-    <auto-value.version>1.8.2</auto-value.version>
+    <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>
@@ -73,7 +74,7 @@
     <dependency>
       <groupId>com.maxmind.geoip2</groupId>
       <artifactId>geoip2</artifactId>
-      <version>2.15.0</version>
+      <version>4.2.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -124,14 +125,7 @@
       <artifactId>quarkus-jacoco</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-jacoco</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
-
-
   <build>
     <plugins>
       <plugin>

src/main/java/org/eclipsefoundation/geoip/client/resources/AbstractLocationResource.java

@@ -14,9 +14,9 @@ package org.eclipsefoundation.geoip.client.resources;
 import java.io.IOException;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipsefoundation.core.exception.ApplicationException;

src/main/java/org/eclipsefoundation/geoip/client/resources/CityResource.java

@@ -12,13 +12,13 @@
 **********************************************************************/
 package org.eclipsefoundation.geoip.client.resources;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 /**
  * Main resource class for all endpoints under '/cities'.

src/main/java/org/eclipsefoundation/geoip/client/resources/CountryResource.java

@@ -12,13 +12,13 @@
 **********************************************************************/
 package org.eclipsefoundation.geoip.client.resources;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 /**
  * Main resource class for all endpoints under '/countries'.

src/main/java/org/eclipsefoundation/geoip/client/resources/SubnetResource.java

@@ -11,13 +11,13 @@
 **********************************************************************/
 package org.eclipsefoundation.geoip.client.resources;
 
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.eclipsefoundation.geoip.client.model.IPVersion;
 import org.eclipsefoundation.geoip.client.service.NetworkService;

src/main/java/org/eclipsefoundation/geoip/client/service/impl/CSVNetworkService.java

@@ -21,9 +21,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.eclipsefoundation.core.exception.ApplicationException;
 import org.eclipsefoundation.geoip.client.config.EclipseMaxmindSubnetConfig;

src/main/java/org/eclipsefoundation/geoip/client/service/impl/MaxMindGeoIPService.java

@@ -16,10 +16,10 @@ import java.io.File;
 import java.io.IOException;
 import java.net.InetAddress;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.eclipsefoundation.core.exception.ApplicationException;
 import org.eclipsefoundation.geoip.client.config.MaxmindDatabaseConfig;