Skip to content

Commit

Permalink
chore: update dependencies & set java version 21
Browse files Browse the repository at this point in the history
  • Loading branch information
NilsOveTen committed Dec 10, 2024
1 parent 63059e4 commit e3f17b8
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod&demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
uses: Informasjonsforvaltning/workflows/.github/workflows/build-push.yaml@main
with:
app_name: dataset-catalog
java_version: '17'
java_version: '21'
coverage_file_path: ./target/site/jacoco/jacoco.xml
environment: prod
secrets:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: Informasjonsforvaltning/workflows/.github/workflows/build-push.yaml@main
with:
app_name: dataset-catalog
java_version: '17'
java_version: '21'
coverage_file_path: ./target/site/jacoco/jacoco.xml
environment: staging
secrets:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre-alpine
FROM eclipse-temurin:21-jre-alpine

ENV TZ=Europe/Oslo
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ A back end service for creating dataset catalogues and datasets. Exposes a dcat-

## Requirements
- maven
- java 15
- java 21
- docker
- docker-compose

Expand Down
20 changes: 10 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version>
<version>3.4.0</version>
<relativePath/>
</parent>

<properties>
<!--standard properties-->
<java.release>17</java.release>
<java.release>21</java.release>
<java.encoding>UTF-8</java.encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand All @@ -29,8 +29,8 @@
<maven.exec.skip>false</maven.exec.skip>
<!--end standard properties-->

<kotlin.version>2.0.20</kotlin.version>
<testcontainers.version>1.20.1</testcontainers.version>
<kotlin.version>2.1.0</kotlin.version>
<testcontainers.version>1.20.4</testcontainers.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -71,12 +71,12 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<version>5.1.0</version>
<version>5.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
<version>5.1.0</version>
<version>5.2.0</version>
</dependency>

<!-- Security -->
Expand Down Expand Up @@ -119,7 +119,7 @@
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.3.1</version>
<version>5.4.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -142,7 +142,7 @@
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<version>3.9.1</version>
<version>3.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -282,7 +282,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.2</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
<argLine>${surefire.jacoco.args}</argLine>
Expand All @@ -296,7 +296,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.2</version>
<configuration>
<argLine>${failsafe.jacoco.args}</argLine>
<groups>contract</groups>
Expand Down

0 comments on commit e3f17b8

Please sign in to comment.