Merge pull request plantbreeding#76 from plantbreeding/java-21-upgrade

Migrate Java Test Server to Java 21
plantbreeding · Jan 30, 2025 · e742f19 · e742f19
1 parent 27d96c4
commit e742f19
Show file tree

Hide file tree

Showing 422 changed files with 6,170 additions and 3,800 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 # run container (dev): `docker run --name=brapi-test-server --network=bridge -p 8081:8081 -d docker-username/image-stack-name`
 # run container (prod): `docker run --name=brapi-test-server --restart always --network=brapi_net -d docker-username/image-stack-name`
 
-FROM adoptopenjdk/openjdk8
+FROM amazoncorretto:21
 
 # 8080 - brapi app port | 5005 - brapi app debug port | 8008 - keycloak app port
 EXPOSE 8080 5005 8008

diff --git a/README.md b/README.md
@@ -10,8 +10,8 @@ Use [/calls](https://test-server.brapi.org/brapi/v1/call) (V1) or [/serverinfo](
 
 ## Prerequisites
 * Maven 3.9
-* Java 8
-* Postgres 13
+* Java 21
+* Postgres 17.2
 
 ## Auth Configuration
 BrAPI has provided a [sample central authentication service for the test server](https://brapi.org/oauth).

diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
@@ -11,7 +11,7 @@ services:
     volumes:
       - .\src\main\resources\properties\application.properties:/home/brapi/properties/application.properties
   brapi-db:
-    image: postgres:13
+    image: postgres:17.2
     environment:
       POSTGRES_USER: brapi
       POSTGRES_PASSWORD: password

diff --git a/docker-compose-local-auth.yaml b/docker-compose-local-auth.yaml
@@ -39,7 +39,7 @@ services:
     ports:
       - "8008:8008"
   brapi-db:
-    image: postgres:13
+    image: postgres:17.2
     environment:
       POSTGRES_USER: brapi
       POSTGRES_PASSWORD: password
@@ -48,7 +48,7 @@ services:
     ports:
       - "5433:5432"
   keycloak-db:
-    image: postgres:13
+    image: postgres:17.2
     volumes:
       - keycloak-data:/var/lib/postgresql/data
     environment:

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -30,10 +30,10 @@ services:
       - KC_DB_USERNAME
       - KC_DB_PASSWORD
   postgres:
-    image: postgres:13
+    image: postgres:17.2
     volumes:
       # Update this path with the path your pipeline tool expects
-      - /home/jenkins/brapi.org/brapi-test-server/data:/var/lib/postgresql/data
+      - /home/jenkins/brapi.org/brapi-test-server/17-2:/var/lib/postgresql/data
 networks:
     default:
         external:

diff --git a/pom.xml b/pom.xml
@@ -14,18 +14,24 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-		<spring.version>2.5.12</spring.version>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<java.version>21</java.version>
+		<spring.version>3.4.0</spring.version>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 		<springfox-version>2.10.0</springfox-version>
+		<slf4j-version>2.0.16</slf4j-version>
 	</properties>
 
 	<dependencies>
 		<dependency>
-		    <groupId>org.flywaydb</groupId>
-		    <artifactId>flyway-core</artifactId>
-		    <version>7.7.3</version>
+			<groupId>org.flywaydb</groupId>
+			<artifactId>flyway-core</artifactId>
+			<version>11.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.flywaydb</groupId>
+			<artifactId>flyway-database-postgresql</artifactId>
+			<version>11.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>
@@ -58,6 +64,11 @@
 			<artifactId>spring-boot-starter-security</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>
 			<artifactId>jjwt</artifactId>
@@ -100,6 +111,11 @@
 			<artifactId>jackson-datatype-threetenbp</artifactId>
 			<version>2.8.4</version>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>3.0.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
@@ -115,13 +131,24 @@
 			<artifactId>java-jwt</artifactId>
 			<version>3.14.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>${slf4j-version}</version>
+		</dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.4.1</version>
 				<configuration>
 					<archive>
 						<manifest>

diff --git a/src/main/java/io/swagger/api/core/BatchDeletesApi.java b/src/main/java/io/swagger/api/core/BatchDeletesApi.java
@@ -23,7 +23,7 @@
 
 import java.util.ArrayList;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "batchDeletes", description = "the batch deletes API")
 public interface BatchDeletesApi {
 

diff --git a/src/main/java/io/swagger/api/core/CommonCropNamesApi.java b/src/main/java/io/swagger/api/core/CommonCropNamesApi.java
@@ -17,7 +17,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "commoncropnames", description = "the commoncropnames API")
 public interface CommonCropNamesApi {
 

diff --git a/src/main/java/io/swagger/api/core/ListsApi.java b/src/main/java/io/swagger/api/core/ListsApi.java
@@ -28,7 +28,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "lists", description = "the lists API")
 public interface ListsApi {
 

diff --git a/src/main/java/io/swagger/api/core/LocationsApi.java b/src/main/java/io/swagger/api/core/LocationsApi.java
@@ -25,7 +25,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "locations", description = "the locations API")
 public interface LocationsApi {
 

diff --git a/src/main/java/io/swagger/api/core/PeopleApi.java b/src/main/java/io/swagger/api/core/PeopleApi.java
@@ -25,7 +25,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "people", description = "the people API")
 public interface PeopleApi {
 

diff --git a/src/main/java/io/swagger/api/core/ProgramsApi.java b/src/main/java/io/swagger/api/core/ProgramsApi.java
@@ -26,7 +26,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "programs", description = "the programs API")
 public interface ProgramsApi {
 

diff --git a/src/main/java/io/swagger/api/core/SeasonsApi.java b/src/main/java/io/swagger/api/core/SeasonsApi.java
@@ -22,7 +22,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "seasons", description = "the seasons API")
 public interface SeasonsApi {
 

diff --git a/src/main/java/io/swagger/api/core/ServerInfoApi.java b/src/main/java/io/swagger/api/core/ServerInfoApi.java
@@ -18,7 +18,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "serverinfo", description = "the serverinfo API")
 public interface ServerInfoApi {
 

diff --git a/src/main/java/io/swagger/api/core/StudiesApi.java b/src/main/java/io/swagger/api/core/StudiesApi.java
@@ -25,7 +25,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "studies", description = "the studies API")
 public interface StudiesApi {
 

diff --git a/src/main/java/io/swagger/api/core/StudytypesApi.java b/src/main/java/io/swagger/api/core/StudytypesApi.java
@@ -17,7 +17,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "studytypes", description = "the studytypes API")
 public interface StudytypesApi {
 

diff --git a/src/main/java/io/swagger/api/core/TrialsApi.java b/src/main/java/io/swagger/api/core/TrialsApi.java
@@ -22,7 +22,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
 @Api(value = "trials", description = "the trials API")
 public interface TrialsApi {
 

diff --git a/src/main/java/io/swagger/api/geno/AlleleMatrixApi.java b/src/main/java/io/swagger/api/geno/AlleleMatrixApi.java
@@ -21,7 +21,7 @@
 import io.swagger.model.geno.AlleleMatrixSearchRequest;
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-06-17T15:45:22.167Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-06-17T15:45:22.167Z[GMT]")
 @Validated
 public interface AlleleMatrixApi {
 

diff --git a/src/main/java/io/swagger/api/geno/CallSetsApi.java b/src/main/java/io/swagger/api/geno/CallSetsApi.java
@@ -24,7 +24,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "callsets", description = "the callsets API")
 public interface CallSetsApi {
 

diff --git a/src/main/java/io/swagger/api/geno/CallsApi.java b/src/main/java/io/swagger/api/geno/CallsApi.java
@@ -25,7 +25,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "calls", description = "the calls API")
 public interface CallsApi {
 

diff --git a/src/main/java/io/swagger/api/geno/MapsApi.java b/src/main/java/io/swagger/api/geno/MapsApi.java
@@ -20,7 +20,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "maps", description = "the maps API")
 public interface MapsApi {
 

diff --git a/src/main/java/io/swagger/api/geno/MarkerPositionsApi.java b/src/main/java/io/swagger/api/geno/MarkerPositionsApi.java
@@ -22,7 +22,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "markerpositions", description = "the markerpositions API")
 public interface MarkerPositionsApi {
 

diff --git a/src/main/java/io/swagger/api/geno/PlatesApi.java b/src/main/java/io/swagger/api/geno/PlatesApi.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-06-02T18:30:00.206Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-06-02T18:30:00.206Z[GMT]")
 @Validated
 public interface PlatesApi {
 

diff --git a/src/main/java/io/swagger/api/geno/ReferenceSetsApi.java b/src/main/java/io/swagger/api/geno/ReferenceSetsApi.java
@@ -23,7 +23,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "referencesets", description = "the referencesets API")
 public interface ReferenceSetsApi {
 

diff --git a/src/main/java/io/swagger/api/geno/ReferencesApi.java b/src/main/java/io/swagger/api/geno/ReferencesApi.java
@@ -24,7 +24,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "references", description = "the references API")
 public interface ReferencesApi {
 

diff --git a/src/main/java/io/swagger/api/geno/SamplesApi.java b/src/main/java/io/swagger/api/geno/SamplesApi.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "samples", description = "the samples API")
 public interface SamplesApi {
 

diff --git a/src/main/java/io/swagger/api/geno/VariantSetsApi.java b/src/main/java/io/swagger/api/geno/VariantSetsApi.java
@@ -27,7 +27,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "variantsets", description = "the variantsets API")
 public interface VariantSetsApi {
 

diff --git a/src/main/java/io/swagger/api/geno/VariantsApi.java b/src/main/java/io/swagger/api/geno/VariantsApi.java
@@ -24,7 +24,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "variants", description = "the variants API")
 public interface VariantsApi {
 

diff --git a/src/main/java/io/swagger/api/geno/VendorApi.java b/src/main/java/io/swagger/api/geno/VendorApi.java
@@ -28,7 +28,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:32:53.794Z[GMT]")
 @Api(value = "vendor", description = "the vendor API")
 public interface VendorApi {
 

diff --git a/src/main/java/io/swagger/api/germ/AttributeValuesApi.java b/src/main/java/io/swagger/api/germ/AttributeValuesApi.java
@@ -25,7 +25,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Api(value = "attributevalues", description = "the attributevalues API")
 public interface AttributeValuesApi {
 

diff --git a/src/main/java/io/swagger/api/germ/AttributesApi.java b/src/main/java/io/swagger/api/germ/AttributesApi.java
@@ -26,7 +26,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Api(value = "attributes", description = "the attributes API")
 public interface AttributesApi {
 

diff --git a/src/main/java/io/swagger/api/germ/BreedingMethodsApi.java b/src/main/java/io/swagger/api/germ/BreedingMethodsApi.java
@@ -19,7 +19,7 @@
 
 import jakarta.validation.Valid;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Api(value = "breedingmethods", description = "the breedingmethods API")
 public interface BreedingMethodsApi {
 

diff --git a/src/main/java/io/swagger/api/germ/CrossesApi.java b/src/main/java/io/swagger/api/germ/CrossesApi.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Api(value = "crosses", description = "the crosses API")
 public interface CrossesApi {
 

diff --git a/src/main/java/io/swagger/api/germ/CrossingProjectsApi.java b/src/main/java/io/swagger/api/germ/CrossingProjectsApi.java
@@ -22,7 +22,7 @@
 import jakarta.validation.Valid;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
+@javax.annotation.processing.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:33:36.513Z[GMT]")
 @Api(value = "crossingprojects", description = "the crossingprojects API")
 public interface CrossingProjectsApi {