Skip to content
This repository has been archived by the owner on Oct 21, 2024. It is now read-only.

Commit

Permalink
chore: use JDK 17 (#38)
Browse files Browse the repository at this point in the history
* ci: upgrade build system to use JDK 17

* feat(docker): use JDK 17 on images

* chore: bump version to 1.4.0

* chore(deps): bump maven plugins

* chore(deps): bump prometheus from 0.14.0 to 0.19.0
  • Loading branch information
vitorhugods authored Jul 24, 2023
1 parent 50a56e5 commit 25c65fd
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 8
java-version: 17

- name: Set Release Version
# use the version specified in the pom.xml as the tag
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 8
java-version: 17

- name: Build with Maven
run: mvn -DskipTests package
Expand All @@ -31,7 +31,7 @@ jobs:
uses: actions/setup-java@v3
with: # running setup-java again overwrites the settings.xml
distribution: 'temurin'
java-version: 8
java-version: 17
server-id: ossrh
server-username: OSSRH_USERNAME
server-password: OSSRH_PASSWORD
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ See makefiles in [mk](mk) directory.
<dependency>
<groupId>com.wire</groupId>
<artifactId>cryptobox4j</artifactId>
<version>1.3.0</version>
<version>1.4.0</version>
</dependency>
```

Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:11-jdk as cryptobox
FROM eclipse-temurin:17-jdk as cryptobox

# disable prompts from the txdata
ENV DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -47,7 +47,7 @@ RUN make dist

ENV LD_LIBRARY_PATH=/wire/cryptobox/dist/lib

FROM eclipse-temurin:11-jre as runtime
FROM eclipse-temurin:17-jre as runtime

RUN mkdir -p /opt/wire/lib
# make Java to take this as java.library.path
Expand Down
2 changes: 1 addition & 1 deletion mk/prometheus-agent-src.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PROMETHEUS_AGENT_VERSION := 0.14.0
PROMETHEUS_AGENT_VERSION := 0.19.0
PROMETHEUS_AGENT_NAME := prometheus-java-agent
PROMETHEUS_AGENT_GIT_URL := https://github.com/prometheus/jmx_exporter.git

Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.wire</groupId>
<artifactId>cryptobox4j</artifactId>
<version>1.3.0</version>
<version>1.4.0</version>

<name>Cryptobox4J</name>
<description>CryptoBox for Wire Bots</description>
Expand Down Expand Up @@ -92,7 +92,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -105,7 +105,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version>
<version>3.5.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -118,7 +118,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
<configuration>
<!-- Prevent gpg from using pinentry programs -->
<gpgArguments>
Expand All @@ -140,7 +140,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M8</version>
<version>3.1.2</version>
</plugin>
</plugins>
</build>
Expand Down

0 comments on commit 25c65fd

Please sign in to comment.