Skip to content

Commit

Permalink
Merge pull request #1363 from folio-org/OKAPI-1195-upgrade-deps
Browse files Browse the repository at this point in the history
OKAPI-1195: Upgrade dependencies for Ramsons
  • Loading branch information
julianladisch authored Oct 29, 2024
2 parents 249a940 + c942b49 commit 750311e
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 42 deletions.
27 changes: 8 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Okapi — a multitenant API Gateway

Copyright (C) 2015-2023 The Open Library Foundation
Copyright (C) 2015-2024 The Open Library Foundation

This software is distributed under the terms of the Apache License,
Version 2.0. See the file "[LICENSE](LICENSE)" for more information.
Expand All @@ -9,13 +9,13 @@ Version 2.0. See the file "[LICENSE](LICENSE)" for more information.

The Okapi software has the following compile-time dependencies:

* Java 11
* Java 17

* Apache Maven 3.3.x or higher
* Apache Maven 3.8.x or higher

The test suite has these additional dependencies:

* Docker, for details see https://www.testcontainers.org/supported_docker_environment/
* Docker, for details see https://java.testcontainers.org/supported_docker_environment/

* Ports 9230-9239 must be free

Expand All @@ -25,12 +25,12 @@ terminated manually.*

## Quick start

Before buliding, make sure your `` $JAVA_HOME`` environment variable is set correctly.
Before buliding, make sure your `$JAVA_HOME` environment variable is set correctly.

This can be done by one of the two ways described below:

1. For e.g., on Debain(and Debian-based) distros, run the following command to set the
$JAVA_HOME for the current session:
`$JAVA_HOME` for the current session:

```
$ export JAVA_HOME=`readlink -f /usr/bin/javac | sed "s:bin/javac::"`
Expand Down Expand Up @@ -84,22 +84,12 @@ At Docker Hub:
* https://hub.docker.com/r/folioorg/okapi released versions
* https://hub.docker.com/r/folioci/okapi snapshot versions

See [Automation/Docker
Hub](https://dev.folio.org/guides/automation/#docker-hub) for details.
See [Automation/Docker Hub](https://dev.folio.org/guides/automation/#docker-hub) for details.

Docker images are the primary distribution model for FOLIO modules.
To run the images you will need the Docker Engine or Docker Desktop
runtime.

## Ubuntu package

Import the FOLIO signing key and add the [FOLIO apt
repository](https://repository.folio.org/packages/ubuntu/) for
Ubuntu 20.04 LTS (Focal Fossa):

wget -q -O - https://repository.folio.org/packages/debian/folio-apt-archive-key.asc | sudo apt-key add -
sudo add-apt-repository "deb https://repository.folio.org/packages/ubuntu/ focal/"

## Issue tracker

See project [OKAPI](https://issues.folio.org/browse/OKAPI) at the
Expand All @@ -113,8 +103,7 @@ See project [OKAPI](https://issues.folio.org/browse/OKAPI) at the
* [Contributing guidelines](CONTRIBUTING.md)
* [Securing](doc/securing.md) in the doc directory shows how to enable
security-related modules.
* [Folio Sample
Modules](https://github.com/folio-org/folio-sample-modules). There is
* [Folio Sample Modules](https://github.com/folio-org/folio-sample-modules). There is
a decent README, and some minimal sample modules to get started with
* Other FOLIO Developer documentation is at
[dev.folio.org](https://dev.folio.org/)
Expand Down
1 change: 0 additions & 1 deletion okapi-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.16.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
44 changes: 22 additions & 22 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
<version>2.22.1</version>
<version>2.24.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-stack-depchain</artifactId>
<version>4.5.7</version> <!-- also update depending versions below! -->
<version>4.5.10</version> <!-- also update depending versions below! -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -51,14 +51,14 @@
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-bom</artifactId>
<version>1.12.2</version> <!-- https://github.com/vert-x3/vertx-micrometer-metrics/blob/master/pom.xml#L41 -->
<version>1.12.11</version> <!-- https://github.com/vert-x3/vertx-micrometer-metrics/blob/master/pom.xml#L41 -->
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
<version>5.3.5</version> <!-- https://github.com/vert-x3/vertx-hazelcast/blob/4.x/.github/workflows/ci-4.x.yml -->
<version>5.3.8</version> <!-- https://github.com/vert-x3/vertx-hazelcast/blob/4.x/.github/workflows/ci-4.x.yml -->
</dependency>
<!-- END: versions that depend on the vertx-stack-depchain version -->

Expand All @@ -82,7 +82,7 @@
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<version>5.4.0</version>
<version>5.5.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -92,7 +92,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.25.3</version>
<version>3.26.3</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
Expand All @@ -113,14 +113,14 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.10.2</version>
<version>5.11.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>1.20.1</version>
<version>1.20.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -129,13 +129,13 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.27.0</version>
<version>1.27.1</version>
</dependency>
<!-- testcontainers requires a recent commons-lang3, io.rest-assured:xml-path downgrades it to 3.11 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.16.0</version>
<version>3.17.0</version>
</dependency>
<!-- unmaintained raml-tester doesn't bump vulnerable commons-fileupload
https://github.com/nidi3/raml-tester -->
Expand All @@ -148,19 +148,19 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.16.1</version>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-bom</artifactId>
<version>5.10.0</version>
<version>5.14.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.2.0</version>
<version>4.2.2</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -185,7 +185,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
<version>3.6.0</version>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<filters>
Expand All @@ -202,7 +202,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.2</version>
</plugin>

<plugin>
Expand All @@ -223,7 +223,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<version>3.13.0</version>
<configuration>
<release>17</release>
<compilerArgument>-Xlint:unchecked</compilerArgument>
Expand All @@ -249,7 +249,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.1</version>
<version>3.4.1</version>
<executions>
<execution>
<id>default-cli</id>
Expand Down Expand Up @@ -287,7 +287,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.1</version>
<configuration>
<preparationGoals>clean verify</preparationGoals>
<tagNameFormat>v@{project.version}</tagNameFormat>
Expand Down Expand Up @@ -325,12 +325,12 @@

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
<version>3.5.1</version>
</plugin>

<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -344,7 +344,7 @@

<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version>
<version>3.10.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -358,7 +358,7 @@

<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.3</version>
<executions>
<execution>
<id>deploy</id>
Expand Down

0 comments on commit 750311e

Please sign in to comment.