Skip to content

Commit c67e5bb

Browse files
SiaaG-devSiaaG-dev
committed
update junit and resteasy
Signed-off-by: Siaa Gor <[email protected]>
1 parent 6b10eb1 commit c67e5bb

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ jobs:
4848
working-directory: finish
4949
steps:
5050
- uses: actions/checkout@v4
51-
- name: Set up JDK 11
51+
- name: Set up JDK 17
5252
uses: actions/setup-java@v4
5353
with:
5454
distribution: 'semeru'
55-
java-version: 11
55+
java-version: 17
5656
- run: unset _JAVA_OPTIONS
5757
- name: Run tests
5858
run: ../scripts/testApp.sh

‎README.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ Verify that the `cart-app:1.0-SNAPSHOT` image is listed among the Docker images,
340340
----
341341
REPOSITORY TAG
342342
cart-app 1.0-SNAPSHOT
343-
icr.io/appcafe/open-liberty kernel-slim-java11-openj9-ubi
343+
icr.io/appcafe/open-liberty kernel-slim-java17-openj9-ubi
344344
----
345345

346346

‎finish/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
1+
FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi
22

33

44
ARG VERSION=1.0

‎finish/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1111
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
12-
<maven.compiler.source>11</maven.compiler.source>
13-
<maven.compiler.target>11</maven.compiler.target>
12+
<maven.compiler.source>17</maven.compiler.source>
13+
<maven.compiler.target>17</maven.compiler.target>
1414
<!-- Liberty configuration -->
1515
<hazelcast.path>${user.home}/.m2/repository/com/hazelcast/hazelcast/</hazelcast.path>
1616
<liberty.var.http.port>9090</liberty.var.http.port>
@@ -46,19 +46,19 @@
4646
<dependency>
4747
<groupId>org.junit.jupiter</groupId>
4848
<artifactId>junit-jupiter</artifactId>
49-
<version>5.14.0</version>
49+
<version>6.0.1</version>
5050
<scope>test</scope>
5151
</dependency>
5252
<dependency>
5353
<groupId>org.jboss.resteasy</groupId>
5454
<artifactId>resteasy-client</artifactId>
55-
<version>6.2.14.Final</version>
55+
<version>7.0.0.Final</version>
5656
<scope>test</scope>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.jboss.resteasy</groupId>
6060
<artifactId>resteasy-json-binding-provider</artifactId>
61-
<version>6.2.14.Final</version>
61+
<version>7.0.0.Final</version>
6262
<scope>test</scope>
6363
</dependency>
6464
<dependency>

‎scripts/dailyBuild.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sed -i "\#</copyDependencies>#a<install><runtimeUrl>https://public.dhe.ibm.com/i
1616
cat pom.xml
1717

1818
if [[ "$DOCKER_USERNAME" != "" ]]; then
19-
sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" Dockerfile
19+
sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" Dockerfile
2020
sed -i "s;RUN features.sh;#RUN features.sh;g" Dockerfile
2121
cat Dockerfile
2222
fi

‎scripts/dockerImageTest.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ sed -i "\#</copyDependencies>#a<install><runtimeUrl>https://public.dhe.ibm.com/i
1515
cat pom.xml
1616

1717
if [[ "$OL_LEVEL" != "" ]]; then
18-
sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java11-openj9-ubi;g" Dockerfile
18+
sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java17-openj9-ubi;g" Dockerfile
1919
else
20-
sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi;g" Dockerfile
20+
sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-daily:full-java17-openj9-ubi;g" Dockerfile
2121
fi
2222
sed -i "s;RUN features.sh;#RUN features.sh;g" Dockerfile
2323
cat Dockerfile
2424

2525
echo "$DOCKER_PASSWORD" | sudo -u runner docker login -u "$DOCKER_USERNAME" --password-stdin cp.stg.icr.io
2626
if [[ "$OL_LEVEL" != "" ]]; then
27-
sudo -u runner docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java11-openj9-ubi"
28-
sudo -u runner echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" "cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java11-openj9-ubi"
27+
sudo -u runner docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java17-openj9-ubi"
28+
sudo -u runner echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" "cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java17-openj9-ubi"
2929
else
30-
sudo -u runner docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi"
31-
sudo -u runner echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi"
30+
sudo -u runner docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java17-openj9-ubi"
31+
sudo -u runner echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java17-openj9-ubi"
3232
fi
3333

3434
#sudo ../scripts/startMinikube.sh

‎start/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
1+
FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi
22

33
ARG VERSION=1.0
44
ARG REVISION=SNAPSHOT

‎start/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1111
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
12-
<maven.compiler.source>11</maven.compiler.source>
13-
<maven.compiler.target>11</maven.compiler.target>
12+
<maven.compiler.source>17</maven.compiler.source>
13+
<maven.compiler.target>17</maven.compiler.target>
1414
<!-- Liberty configuration -->
1515
<hazelcast.path>${user.home}/.m2/repository/com/hazelcast/hazelcast/</hazelcast.path>
1616
<liberty.var.http.port>9090</liberty.var.http.port>
@@ -46,19 +46,19 @@
4646
<dependency>
4747
<groupId>org.junit.jupiter</groupId>
4848
<artifactId>junit-jupiter</artifactId>
49-
<version>5.14.0</version>
49+
<version>6.0.1</version>
5050
<scope>test</scope>
5151
</dependency>
5252
<dependency>
5353
<groupId>org.jboss.resteasy</groupId>
5454
<artifactId>resteasy-client</artifactId>
55-
<version>6.2.14.Final</version>
55+
<version>7.0.0.Final</version>
5656
<scope>test</scope>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.jboss.resteasy</groupId>
6060
<artifactId>resteasy-json-binding-provider</artifactId>
61-
<version>6.2.14.Final</version>
61+
<version>7.0.0.Final</version>
6262
<scope>test</scope>
6363
</dependency>
6464
<dependency>

0 commit comments

Comments
 (0)