Skip to content

Commit

Permalink
Backend dependencies update - 2021.10
Browse files Browse the repository at this point in the history
  • Loading branch information
jswk committed Oct 21, 2021
1 parent 6b83983 commit dace16c
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11.0.10
java-version: 11.0.12
- name: Cache web-e2e
uses: actions/cache@v2
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11.0.10
java-version: 11.0.12
- name: Cache backend
uses: actions/cache@v2
with:
Expand Down Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11.0.10
java-version: 11.0.12
- name: Cache gs-gateway
uses: actions/cache@v2
with:
Expand All @@ -62,7 +62,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11.0.10
java-version: 11.0.12
- name: Cache web
uses: actions/cache@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 14.15.5
nodejs 14.18.1
2 changes: 1 addition & 1 deletion docker-compose-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ services:
GWC_AWS_SECRET_KEY: ${GEOSERVER_TEST_GWC_AWS_SECRET_KEY:-miniotest123}
GWC_ENDPOINT: ${GEOSERVER_TEST_GWC_ENDPOINT:-http://minio-test:9000}
db-test:
image: postgis/postgis:13-3.0
image: postgis/postgis:13-3.1
ports:
- ${DB_TEST_PORT:-5434}:5432
networks:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ services:
GWC_AWS_SECRET_KEY: ${GEOSERVER_GWC_AWS_SECRET_KEY:-minio123}
GWC_ENDPOINT: ${GEOSERVER_GWC_ENDPOINT:-http://minio:9000}
db:
image: postgis/postgis:13-3.0
image: postgis/postgis:13-3.1
ports:
- ${DB_PORT:-5433}:5432
networks:
Expand Down
2 changes: 1 addition & 1 deletion gs-gateway/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:11.0.10-jdk
FROM openjdk:11.0.12-jdk
VOLUME /tmp
ARG DEPENDENCY=target/dependency
COPY ${DEPENDENCY}/BOOT-INF/lib /app/BOOT-INF/lib
Expand Down
2 changes: 1 addition & 1 deletion gs-gateway/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<description>GeoServer Gateway</description>

<properties>
<spring-cloud.version>2020.0.2</spring-cloud.version>
<spring-cloud.version>2020.0.4</spring-cloud.version>
</properties>

<dependencyManagement>
Expand Down
22 changes: 11 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,31 +26,31 @@
<java.version>11</java.version>
<maven.compiler.release>11</maven.compiler.release>

<spring-boot.version>2.5.0</spring-boot.version>
<spring-boot.version>2.5.5</spring-boot.version>

<awssdk.version>2.16.66</awssdk.version>
<commonmark.version>0.17.2</commonmark.version>
<awssdk.version>2.17.64</awssdk.version>
<commonmark.version>0.18.0</commonmark.version>
<commons-email.version>1.5</commons-email.version>
<geotools.version>25.0</geotools.version>
<greenmail.version>1.6.4</greenmail.version>
<geotools.version>26.0</geotools.version>
<greenmail.version>1.6.5</greenmail.version>
<guava.version>30.1.1-jre</guava.version>
<hibernate-types.version>2.11.1</hibernate-types.version>
<jakarta.json-api.version>2.0.0</jakarta.json-api.version>
<hibernate-types.version>2.13.0</hibernate-types.version>
<jakarta.json-api.version>2.0.1</jakarta.json-api.version>
<jjwt.version>0.11.2</jjwt.version>
<joy.version>2.1.0</joy.version>
<justify.version>3.1.0</justify.version>
<lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
<mapstruct.version>1.4.2.Final</mapstruct.version>
<poiooxml.version>4.1.2</poiooxml.version>
<poiooxml.version>5.0.0</poiooxml.version>
<recaptcha-starter.version>2.3.1</recaptcha-starter.version>
<slugify.version>2.5</slugify.version>
<springdoc-openapi.version>1.5.9</springdoc-openapi.version>
<springdoc-openapi.version>1.5.12</springdoc-openapi.version>
<unirest.version>4.0.0-RC1</unirest.version>
<bucket4j-starter.version>0.4.0</bucket4j-starter.version>
<!--
update sentry version only when fid instance is updated
-->
<sentry.version>4.3.0</sentry.version>
<sentry.version>5.2.4</sentry.version>
</properties>

<build>
Expand All @@ -68,7 +68,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.8.1</version>
<version>3.8.3</version>
</requireMavenVersion>
</rules>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion s4e-backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:11.0.10-jdk-slim
FROM openjdk:11.0.12-jdk-slim

RUN mkdir /app
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion s4e-web/.tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 14.15.5
nodejs 14.18.1
2 changes: 1 addition & 1 deletion s4e-web/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Sat4Env frontend.

#### Requirements

* nodejs `14.15.5`
* nodejs `14.18.1`
* npm `^6`

#### Setting up development environment
Expand Down
2 changes: 1 addition & 1 deletion s4e-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<artifactId>frontend-maven-plugin</artifactId>
<configuration>
<installDirectory>target</installDirectory>
<nodeVersion>v14.15.5</nodeVersion>
<nodeVersion>v14.18.1</nodeVersion>
</configuration>
<executions>
<execution>
Expand Down

0 comments on commit dace16c

Please sign in to comment.