Skip to content

Commit aa42045

Browse files
committed
Bump java to 11
1 parent f540377 commit aa42045

File tree

6 files changed

+14
-13
lines changed

6 files changed

+14
-13
lines changed

.github/workflows/pr.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
java: [ 8 ]
11+
java: [ 11 ]
1212
steps:
1313
- name: Checkout
1414
uses: actions/[email protected]
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
strategy:
2828
matrix:
29-
java: [ 8 ]
29+
java: [ 11 ]
3030
openshift: [ v3.11.0 ]
3131
steps:
3232
- name: Checkout
@@ -69,7 +69,7 @@ jobs:
6969
runs-on: ubuntu-latest
7070
strategy:
7171
matrix:
72-
java: [ 8 ]
72+
java: [ 11 ]
7373
steps:
7474
- name: Checkout
7575
uses: actions/[email protected]

.openshiftio/application.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ metadata:
2020
ConfigMap is an object used by OpenShift to inject configuration data as simple key and value pairs into one or more Linux containers while keeping the containers independent of OpenShift.
2121
parameters:
2222
- name: RUNTIME_VERSION
23-
displayName: OpenJDK 8 image version to use
24-
description: Specifies which version of the OpenShift OpenJDK 8 image to use
25-
value: "1.3"
23+
displayName: OpenJDK 11 image version to use
24+
description: Specifies which version of the OpenShift OpenJDK 11 image to use
25+
value: "1.14"
2626
required: true
2727
- name: SOURCE_REPOSITORY_URL
2828
description: The source URL for the application
@@ -80,7 +80,7 @@ objects:
8080
- name: "${RUNTIME_VERSION}"
8181
from:
8282
kind: DockerImage
83-
name: registry.access.redhat.com/ubi8/openjdk-8:${RUNTIME_VERSION}
83+
name: registry.access.redhat.com/ubi8/openjdk-11:${RUNTIME_VERSION}
8484
- apiVersion: v1
8585
kind: BuildConfig
8686
metadata:

Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
FROM openjdk:8u171-alpine3.7
2-
RUN apk --no-cache add curl
1+
FROM openjdk:11
32
COPY target/*.jar configmap.jar
43
CMD java ${JAVA_OPTS} -jar configmap.jar

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
<name>Spring Boot - ConfigMap Example</name>
2828
<description>Spring Boot - ConfigMap Example</description>
2929
<properties>
30-
<maven.compiler.source>1.8</maven.compiler.source>
31-
<maven.compiler.target>1.8</maven.compiler.target>
30+
<maven.compiler.source>11</maven.compiler.source>
31+
<maven.compiler.target>11</maven.compiler.target>
3232
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
3333
<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
3434
<spring-boot.version>2.5.12</spring-boot.version>

run_tests_with_helm_in_ocp.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#!/usr/bin/env bash
22
SOURCE_REPOSITORY_URL=${1:-https://github.com/snowdrop/configmap-example}
33
SOURCE_REPOSITORY_REF=${2:-sb-2.5.x}
4+
S2I_BUILDER_IMAGE_REPO=registry.access.redhat.com/ubi8/openjdk-11
5+
S2I_BUILDER_IMAGE_TAG=1.14
46

57
source scripts/waitFor.sh
68

7-
helm install configmap ./helm --set app.route.expose=true --set app.s2i.source.repo=$SOURCE_REPOSITORY_URL --set app.s2i.source.ref=$SOURCE_REPOSITORY_REF
9+
helm install configmap ./helm --set app.route.expose=true --set app.s2i.source.repo=$SOURCE_REPOSITORY_URL --set app.s2i.source.ref=$SOURCE_REPOSITORY_REF --set app.s2i.builderImage.repo=$S2I_BUILDER_IMAGE_REPO --set app.s2i.builderImage.tag=$S2I_BUILDER_IMAGE_TAG
810
if [[ $(waitFor "configmap" "app") -eq 1 ]] ; then
911
echo "Application failed to deploy. Aborting"
1012
exit 1

src/main/resources/application.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ dekorate:
55
openshift:
66
expose: true
77
s2i:
8-
builder-image: registry.access.redhat.com/ubi8/openjdk-8:1.3
8+
builder-image: registry.access.redhat.com/ubi8/openjdk-11:1.14

0 commit comments

Comments
 (0)