Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker-compose-local-auth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ services:
ports:
- "8008:8008"
brapi-db:
image: postgres:13
image: postgres:17.2
environment:
POSTGRES_USER: brapi
POSTGRES_PASSWORD: password
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
41 changes: 34 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/core/CommonCropNamesApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/core/ListsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/core/LocationsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/core/PeopleApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/core/ProgramsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/core/SeasonsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/core/ServerInfoApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/core/StudiesApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/core/StudytypesApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/core/TrialsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "trials", description = "the trials API")
public interface TrialsApi {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/geno/AlleleMatrixApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/geno/CallSetsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/geno/CallsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/geno/MapsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/geno/MarkerPositionsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/geno/PlatesApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/geno/ReferenceSetsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/geno/ReferencesApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/geno/SamplesApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/geno/VariantSetsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/geno/VariantsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/geno/VendorApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/germ/AttributeValuesApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/germ/AttributesApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/germ/BreedingMethodsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/germ/CrossesApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/germ/CrossingProjectsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/swagger/api/germ/GermplasmApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,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 = "germplasm", description = "the germplasm API")
public interface GermplasmApi {

Expand Down
Loading