chore: prepare for next development iteration v3.1.0

* update dependencies * update NEWS * [maven-release-plugin] prepare branch @{releaseLabel} * [maven-release-plugin] prepare for next development iteration
dmytrokrutii · Mar 20, 2024 · 949fe95 · 949fe95
1 parent c213700
commit 949fe95
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 29 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,11 +1,10 @@
-## v3.0.0 in progress
+## v3.0.0 2024-03-19
 ### Breaking changes
 * Delete PUT endpoint from authority-source-files api([MODELINKS-161](https://issues.folio.org/browse/MODELINKS-161))
 * Update authority-source-files PATCH endpoint body, add validations and optimistic locking([MODELINKS-160](https://issues.folio.org/browse/MODELINKS-160))
 
 ### New APIs versions
 * Provides `authority-source-files v2.2`
-* Requires `API_NAME vX.Y`
 
 ### Features
 * Implement Authority Archiving for deleted authorities ([MODELINKS-138](https://issues.folio.org/browse/MODELINKS-138))
@@ -45,7 +44,12 @@
 * Create custom Mockito verifies for Hibernate entities ([MODELINKS-209](https://issues.folio.org/browse/MODELINKS-209))
 
 ### Dependencies
-* Bump `folio-spring-support` from `7.2.0` to `7.2.1`
+* Bump `spring-boot` from `3.1.5` to `3.2.3`
+* Bump `folio-spring-support` from `7.2.0` to `8.1.0`
+* Bump `folio-service-tools` from `3.1.0` to `4.0.0`
+* Added `folio-s3-client` `2.1.0`
+* Added `aws-sdk.s3` `2.25.12`
+* Removed `hypersistence-utils`
 
 ---
 

diff --git a/docker/.env b/docker/.env
@@ -1,7 +1,15 @@
 COMPOSE_PROJECT_NAME=folio-mod-entities-links
-DEBUG_PORT=5010
-OKAPI_URL=http://api-mock:8080
-APP_PORT=8081
+DB_HOST=postgres
+DB_PORT=5432
+DB_DATABASE=okapi_modules
+DB_USERNAME=folio_admin
+DB_PASSWORD=folio_admin
 PGADMIN_DEFAULT_EMAIL=[email protected]
 PGADMIN_DEFAULT_PASSWORD=admin
-PGADMIN_PORT=5000
+PGADMIN_PORT=5050
+KAFKA_HOST=kafka
+KAFKA_PORT=9092
+REPLICATION_FACTOR=1
+ENV=folio
+DEBUG_PORT=5005
+OKAPI_URL=http://api-mock:8080
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -11,21 +11,27 @@ services:
     networks:
       - mod-entities-links-local
     ports:
-      - "${APP_PORT}:8081"
+      - "8081:8081"
       - "${DEBUG_PORT}:${DEBUG_PORT}"
     depends_on:
       - api-mock
       - kafka
       - postgres
     environment:
-      DB_HOST: postgres
-      JAVA_OPTIONS: -Xmx120m -Xms120m
-      JAVA_TOOL_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:${DEBUG_PORT}
-      OKAPI_URL: ${OKAPI_URL}
+      ENV: ${ENV}
+      KAFKA_HOST: ${KAFKA_HOST}
+      KAFKA_PORT: ${KAFKA_PORT}
+      REPLICATION_FACTOR: ${REPLICATION_FACTOR}
+      DB_USERNAME: ${DB_USERNAME}
+      DB_PORT: ${DB_PORT}
+      DB_HOST: ${DB_HOST}
+      DB_DATABASE: ${DB_DATABASE}
+      DB_PASSWORD: ${DB_PASSWORD}
+      JAVA_OPTIONS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:${DEBUG_PORT}"
 
   api-mock:
+    container_name: api-mock_mod-entities-links
     image: wiremock/wiremock:2.32.0
-    container_name: api-mock-entities-links
     networks:
       - mod-entities-links-local
     command:
@@ -36,21 +42,22 @@ services:
       - ../src/test/resources/mappings:/home/wiremock/mappings
 
   zookeeper:
+    container_name: zookeeper_mod-entities-links
     image: wurstmeister/zookeeper:3.4.6
-    container_name: zookeeper-entities-links
     networks:
       - mod-entities-links-local
     ports:
       - "2181:2181"
 
   kafka:
+    container_name: kafka_mod-entities-links
     image: wurstmeister/kafka:2.13-2.8.1
-    container_name: kafka-entities-links
     networks:
       - mod-entities-links-local
     depends_on:
       - zookeeper
     ports:
+      - "9092:9092"
       - "29092:29092"
     environment:
       KAFKA_BROKER_ID: 1
@@ -64,8 +71,8 @@ services:
       KAFKA_AUTO_CREATE_TOPICS_ENABLE: "false"
 
   kafka-ui:
+    container_name: kafka-ui_mod-entities-links
     image: provectuslabs/kafka-ui:latest
-    container_name: kafka-ui-entities-links
     ports:
       - "8080:8080"
     depends_on:
@@ -80,24 +87,25 @@ services:
       - mod-entities-links-local
 
   postgres:
+    container_name: postgres_mod-entities-links
     image: postgres:12-alpine
-    container_name: postgres-entities-links # use this as a host for db connection in pgadmin ui
     networks:
       - mod-entities-links-local
     ports:
       - "5432:5432"
     environment:
-      POSTGRES_USER: folio_admin
-      POSTGRES_PASSWORD: folio_admin
-      POSTGRES_DB: okapi_modules
+      POSTGRES_USER: ${DB_USERNAME}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_DB: ${DB_DATABASE}
+      PGDATA: "/data/postgres"
 
   pgadmin:
+    container_name: pgadmin_mod-entities-links
     image: dpage/pgadmin4:latest
-    container_name: pgadmin-entities-links
     networks:
       - mod-entities-links-local
     ports:
-      - "${PGADMIN_PORT}:80"
+      - ${PGADMIN_PORT}:80
     environment:
       PGADMIN_CONFIG_SERVER_MODE: "False"
       PGADMIN_DEFAULT_EMAIL: "${PGADMIN_DEFAULT_EMAIL}"

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.folio</groupId>
   <artifactId>mod-entities-links</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>3.1.0-SNAPSHOT</version>
   <description>Module for storing and processing links between entities</description>
   <packaging>jar</packaging>
 
@@ -25,17 +25,17 @@
       src/main/java/org/folio/entlinks/model/**
     </sonar.exclusions>
 
-    <folio-spring-support.version>8.2.0-SNAPSHOT</folio-spring-support.version>
-    <folio-service-tools.version>4.0.0-SNAPSHOT</folio-service-tools.version>
-    <folio-s3-client.version>2.1.0-SNAPSHOT</folio-s3-client.version>
-    <aws-sdk-java.version>2.25.1</aws-sdk-java.version>
+    <folio-spring-support.version>8.1.0</folio-spring-support.version>
+    <folio-service-tools.version>4.0.0</folio-service-tools.version>
+    <folio-s3-client.version>2.1.0</folio-s3-client.version>
+    <aws-sdk-java.version>2.25.12</aws-sdk-java.version>
     <mapstruct.version>1.5.5.Final</mapstruct.version>
     <lombok.mapstruct-binding.version>0.2.0</lombok.mapstruct-binding.version>
     <marc4j.version>2.9.5</marc4j.version>
 
-    <awaitility.version>4.2.0</awaitility.version>
+    <awaitility.version>4.2.1</awaitility.version>
 
-    <maven-openapi-generator-plugin.version>7.3.0</maven-openapi-generator-plugin.version>
+    <maven-openapi-generator-plugin.version>7.4.0</maven-openapi-generator-plugin.version>
     <maven-copy-rename-plugin.version>1.0.1</maven-copy-rename-plugin.version>
     <maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
     <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
@@ -58,6 +58,13 @@
       <groupId>org.folio</groupId>
       <artifactId>folio-spring-system-user</artifactId>
       <version>${folio-spring-support.version}</version>
+      <exclusions>
+    <!--  Excluded due to vulnerability CVE-2024-21634  -->
+        <exclusion>
+          <groupId>software.amazon.ion</groupId>
+          <artifactId>ion-java</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>