Skip to content

Commit

Permalink
chore: prepare for next development iteration v27.1.0 (#1003)
Browse files Browse the repository at this point in the history
* chore: update dependencies

vertx 4.5.5
aspectj 1.9.21.2
folio-kafka-wrapper 3.1.0

* Update NEWS

* [maven-release-plugin] prepare branch @{releaseLabel}

* [maven-release-plugin] prepare for next development iteration
  • Loading branch information
psmagin authored Mar 19, 2024
1 parent 639ac0d commit 1925425
Show file tree
Hide file tree
Showing 4 changed files with 158 additions and 11 deletions.
19 changes: 15 additions & 4 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
## v27.1.0 In progress
### Breaking changes
* Description ([ISSUE_NUMBER](https://issues.folio.org/browse/ISSUE_NUMBER))

## v27.1.0 2024-03-19
### New APIs versions
* Provides `item-storage v10.1`
* Provides `inventory-hierarchy 0.5`
Expand All @@ -11,6 +8,7 @@
* Add location properties and material type id to inventory-hierarchy items-and-holdings response ([MODINVSTOR-1133](https://issues.folio.org/browse/MODINVSTOR-1133))
* Add new field "Display summary" for the item schema ([MODINVSTOR-1154](https://issues.folio.org/browse/MODINVSTOR-1154))
* Add new Identifier type Cancelled LCCN ([MODINVSTOR-1156](https://folio-org.atlassian.net/browse/MODINVSTOR-1156))
* Add source field to contributor name type ([MODINVSTOR-1143](https://folio-org.atlassian.net/browse/MODINVSTOR-1143))
* Classification-types: Publish domain events on changes ([MODINVSTOR-1171](https://folio-org.atlassian.net/browse/MODINVSTOR-1171))

### Bug fixes
Expand All @@ -19,6 +17,19 @@
### Tech Dept
* Prevent virtual fields populating for holdings records ([MODINVSTOR-1094](https://issues.folio.org/browse/MODINVSTOR-1094))
* Create base for reference data APIs integration tests ([MODINVSTOR-1164](https://issues.folio.org/browse/MODINVSTOR-1164))
* Make response message more informative for hrid exceptions ([MODINVSTOR-1100](https://issues.folio.org/browse/MODINVSTOR-1100))


### Dependencies
* Bump `vertx` from `4.3.5` to `4.5.5`
* Bump `log4j` from `2.17.2` to `2.23.1`
* Bump `domain-models-runtime` from `35.0.4` to `35.2.0`
* Bump `folio-kafka-wrapper` from `3.0.0` to `3.1.0`
* Bump `caffeine` from `3.1.3` to `3.1.5`
* Bump `lombok` from `1.18.24` to `1.18.30`
* Bump `marc4j` from `2.9.4` to `2.9.5`
* Bump `commons-lang3` from `3.12.0` to `3.14.0`
* Bump `aspectj` from `1.9.19` to `1.9.21.2`

---

Expand Down
14 changes: 14 additions & 0 deletions docker/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
COMPOSE_PROJECT_NAME=folio-mod-inventory-storage
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=5050
KAFKA_HOST=kafka
KAFKA_PORT=9092
REPLICATION_FACTOR=1
ENV=folio
DEBUG_PORT=5005
112 changes: 112 additions & 0 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
version: "3.9"

services:
postgres:
container_name: postgres_mod-inventory-storage
image: postgres:12-alpine
ports:
- "5432:5432"
volumes:
- postgres-data:/data/postgres
environment:
POSTGRES_USER: ${DB_USERNAME}
POSTGRES_PASSWORD: ${DB_PASSWORD}
POSTGRES_DB: ${DB_DATABASE}
PGDATA: "/data/postgres"
networks:
- mod-inventory-storage-local

pgadmin:
container_name: pgadmin_mod-inventory-storage
image: dpage/pgadmin4:6.7
ports:
- ${PGADMIN_PORT}:80
volumes:
- "pgadmin-data:/var/lib/pgadmin"
environment:
PGADMIN_CONFIG_SERVER_MODE: "False"
PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL}
PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD}
networks:
- mod-inventory-storage-local

zookeeper:
container_name: zookeeper_mod-inventory-storage
image: wurstmeister/zookeeper:3.4.6
ports:
- "2181:2181"
networks:
- mod-inventory-storage-local

kafka:
container_name: kafka_mod-inventory-storage
image: wurstmeister/kafka:2.13-2.8.1
ports:
- "9092:9092"
- "29092:29092"
environment:
KAFKA_ADVERTISED_LISTENERS: "INTERNAL://:9092,LOCAL://localhost:29092"
KAFKA_BROKER_ID: "1"
KAFKA_LOG_RETENTION_HOURS: "-1"
KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
KAFKA_LISTENERS: "INTERNAL://:9092,LOCAL://:29092"
KAFKA_INTER_BROKER_LISTENER_NAME: "INTERNAL"
KAFKA_LOG_RETENTION_BYTES: "-1"
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "LOCAL:PLAINTEXT,INTERNAL:PLAINTEXT"
KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true"
depends_on:
- zookeeper
networks:
- mod-inventory-storage-local

kafka-ui:
container_name: kafka-ui_mod-inventory-storage
image: provectuslabs/kafka-ui:latest
ports:
- "8080:8080"
depends_on:
- zookeeper
- kafka
environment:
KAFKA_CLUSTERS_0_NAME: local
KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka:9092
KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper:2181
KAFKA_CLUSTERS_0_JMXPORT: 9997
networks:
- mod-inventory-storage-local

mod-inventory-storage:
container_name: mod-inventory-storage
image: dev.folio/mod-inventory-storage
build:
context: ../
dockerfile: Dockerfile
ports:
- "8081:8081"
- "5005:5005"
environment:
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}"
depends_on:
- "postgres"
- "kafka"
networks:
- mod-inventory-storage-local

networks:
mod-inventory-storage-local:
driver: "bridge"

volumes:
pgadmin-data:
driver: "local"
postgres-data:
driver: "local"
24 changes: 17 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<artifactId>mod-inventory-storage</artifactId>
<groupId>org.folio</groupId>
<version>27.1.0-SNAPSHOT</version>
<version>27.2.0-SNAPSHOT</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -13,10 +13,10 @@
<argLine />

<raml-module-builder-version>35.2.0</raml-module-builder-version> <!-- also update vertx.version -->
<vertx.version>4.5.4</vertx.version>
<vertx.version>4.5.5</vertx.version>
<marc4j.version>2.9.5</marc4j.version>
<aspectj.version>1.9.21.1</aspectj.version>
<folio-kafka-wrapper.version>3.0.2</folio-kafka-wrapper.version>
<aspectj.version>1.9.21.2</aspectj.version>
<folio-kafka-wrapper.version>3.1.0</folio-kafka-wrapper.version>
<caffeine.version>3.1.8</caffeine.version>
<lombok.version>1.18.30</lombok.version>
<snappy-java.version>1.1.10.5</snappy-java.version>
Expand All @@ -33,10 +33,10 @@
<JUnitParams.version>1.1.1</JUnitParams.version>
<wiremock.version>3.4.2</wiremock.version>
<rest-assured.version>5.4.0</rest-assured.version>
<awaitility.version>4.2.0</awaitility.version>
<awaitility.version>4.2.1</awaitility.version>
<assertj.version>3.25.3</assertj.version>

<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>
<properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
Expand All @@ -46,9 +46,10 @@
<maven-shade-plugin.version>3.5.2</maven-shade-plugin.version>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
<checkstyle.version>10.14.0</checkstyle.version>
<checkstyle.version>10.14.2</checkstyle.version>
<maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
<license-maven-plugin.version>2.4.0</license-maven-plugin.version>
<versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -634,6 +635,15 @@
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>${versions-maven-plugin.version}</version>
<configuration>
<generateBackupPoms>false</generateBackupPoms>
</configuration>
</plugin>

</plugins>
</build>

Expand Down

0 comments on commit 1925425

Please sign in to comment.