Skip to content

Commit

Permalink
Merge pull request #198 from scireum/feature/jvo/jdk18
Browse files Browse the repository at this point in the history
Java 18
  • Loading branch information
jakobvogel authored Apr 30, 2022
2 parents dcc1df8 + b2a96b2 commit 12ca7c1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ clone:

steps:
- name: compile
image: scireum/sirius-build-jdk17:latest
image: scireum/sirius-build-jdk18:latest
commands:
- mvn clean compile
volumes: *scireum_volumes
Expand All @@ -26,7 +26,7 @@ steps:
- push

- name: test
image: scireum/sirius-build-jdk17:latest
image: scireum/sirius-build-jdk18:latest
commands:
- mvn clean test
volumes: *scireum_volumes
Expand All @@ -35,7 +35,7 @@ steps:
- pull_request

- name: sonar
image: scireum/sirius-build-jdk17:latest
image: scireum/sirius-build-jdk18:latest
commands:
- "sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml"
- "mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test sonar:sonar -Dsonar.projectKey=${DRONE_REPO_NAME}"
Expand All @@ -45,7 +45,7 @@ steps:
- tag

- name: package
image: scireum/sirius-build-jdk17:latest
image: scireum/sirius-build-jdk18:latest
commands:
- "sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml"
- mvn clean package -DskipTests
Expand Down Expand Up @@ -75,7 +75,7 @@ steps:
- tag

- name: site
image: scireum/sirius-build-jdk17:latest
image: scireum/sirius-build-jdk18:latest
commands:
- "echo \"$SSH_KEY\" > /tmp/sshkey"
- chmod 600 /tmp/sshkey
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM scireum/sirius-runtime-jdk17:53
FROM scireum/sirius-runtime-jdk18:58

RUN mkdir /home/sirius/data && \
mkdir /home/sirius/multipart && \
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.scireum</groupId>
<artifactId>sirius-parent</artifactId>
<version>9.0.1</version>
<version>10.0.0</version>
</parent>
<artifactId>s3ninja</artifactId>
<version>DEVELOPMENT-SNAPSHOT</version>
Expand All @@ -16,8 +16,8 @@
<url>http://s3ninja.net</url>

<properties>
<sirius.kernel>dev-28.4.1</sirius.kernel>
<sirius.web>dev-45.4.0</sirius.web>
<sirius.kernel>dev-30.0.0</sirius.kernel>
<sirius.web>dev-48.0.0</sirius.web>
</properties>

<repositories>
Expand Down

0 comments on commit 12ca7c1

Please sign in to comment.