Skip to content

Commit f9ac72b

Browse files
gkwan-ibmgkwan-ibm
authored
Merge prod to staging - Version update (#236) (#242)
* Version update (#236) * update versions * update versions * Update index.html * Update index.html * Create index.html * Update index.html * Update index.html * Update SystemReadinessCheck.java * Update SystemLivenessCheck.java * Update SystemReadinessCheck.java * Update SystemLivenessCheck.java * Update SystemReadinessCheck.java * Update SystemReadinessCheck.java * Update SystemReadinessCheck.java * Update pom.xml * Update pom.xml * use java11 OL docker image * update scripts/dockerImageTest.sh for using java11 docker image * update testApp.sh for java11 docker image * update cxf-rt-rs * rerun cloud-hosted guide converter * Update README.adoc (#243)
1 parent 80ee6f4 commit f9ac72b

File tree

14 files changed

+45
-46
lines changed

14 files changed

+45
-46
lines changed

‎README.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ You can see the server being updated in the server log displayed in your command
208208
[INFO] [AUDIT] CWWKZ0009I: The application io.openliberty.guides.getting-started has stopped successfully.
209209
[INFO] [AUDIT] CWWKG0017I: The server configuration was successfully updated in 0.284 seconds.
210210
[INFO] [AUDIT] CWWKT0016I: Web application available (default_host): http://foo:9080/health/
211-
[INFO] [AUDIT] CWWKF0012I: The server installed the following features: [mpHealth-2.2].
211+
[INFO] [AUDIT] CWWKF0012I: The server installed the following features: [mpHealth-3.0].
212212
[INFO] [AUDIT] CWWKF0008I: Feature update completed in 0.285 seconds.
213213
[INFO] [AUDIT] CWWKT0016I: Web application available (default_host): http://foo:9080/
214214
[INFO] [AUDIT] CWWKZ0003I: The application io.openliberty.guides.getting-started updated in 0.173 seconds.
@@ -399,7 +399,7 @@ Run the `mvn package` command from the `start` directory so that the `.war` file
399399
mvn package
400400
```
401401

402-
include::{common-includes}/ol-kernel-docker-pull.adoc[]
402+
include::{common-includes}/ol-full-docker-pull.adoc[]
403403

404404
To build and containerize the application, run the
405405
following Docker build command in the `start` directory:

‎finish/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openliberty/open-liberty:kernel-java8-openj9-ubi
1+
FROM openliberty/open-liberty:full-java11-openj9-ubi
22

33
ARG VERSION=1.0
44
ARG REVISION=SNAPSHOT

‎finish/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,27 @@
3030
<dependency>
3131
<groupId>org.eclipse.microprofile</groupId>
3232
<artifactId>microprofile</artifactId>
33-
<version>3.3</version>
33+
<version>4.0.1</version>
3434
<type>pom</type>
3535
<scope>provided</scope>
3636
</dependency>
3737
<!-- For tests -->
3838
<dependency>
3939
<groupId>org.junit.jupiter</groupId>
4040
<artifactId>junit-jupiter</artifactId>
41-
<version>5.6.2</version>
41+
<version>5.7.1</version>
4242
<scope>test</scope>
4343
</dependency>
4444
<dependency>
4545
<groupId>org.apache.cxf</groupId>
4646
<artifactId>cxf-rt-rs-client</artifactId>
47-
<version>3.3.6</version>
47+
<version>3.4.3</version>
4848
<scope>test</scope>
4949
</dependency>
5050
<dependency>
5151
<groupId>org.apache.cxf</groupId>
5252
<artifactId>cxf-rt-rs-extension-providers</artifactId>
53-
<version>3.3.6</version>
53+
<version>3.4.3</version>
5454
<scope>test</scope>
5555
</dependency>
5656
<dependency>
@@ -75,7 +75,7 @@
7575
<plugin>
7676
<groupId>org.apache.maven.plugins</groupId>
7777
<artifactId>maven-war-plugin</artifactId>
78-
<version>3.2.3</version>
78+
<version>3.3.1</version>
7979
</plugin>
8080
<plugin>
8181
<groupId>org.apache.maven.plugins</groupId>

‎finish/src/main/java/io/openliberty/sample/system/SystemLivenessCheck.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2019, 2020 IBM Corporation and others.
3+
* Copyright (c) 2019, 2021 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License v1.0
66
* which accompanies this distribution, and is available at
@@ -31,13 +31,13 @@ public HealthCheckResponse call() {
3131
MemoryMXBean memBean = ManagementFactory.getMemoryMXBean();
3232
long memUsed = memBean.getHeapMemoryUsage().getUsed();
3333
long memMax = memBean.getHeapMemoryUsage().getMax();
34-
34+
3535
return HealthCheckResponse.named(
3636
SystemResource.class.getSimpleName() + " Liveness Check")
3737
.withData("memory used", memUsed)
3838
.withData("memory max", memMax)
39-
.state(memUsed < memMax * 0.9).build();
39+
.status(memUsed < memMax * 0.9).build();
4040
}
41-
41+
4242
}
43-
// end::systemLivenessCheck[]
43+
// end::systemLivenessCheck[]

‎finish/src/main/java/io/openliberty/sample/system/SystemReadinessCheck.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// tag::copyright[]
22
/*******************************************************************************
3-
* Copyright (c) 2018, 2020 IBM Corporation and others.
3+
* Copyright (c) 2018, 2021 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License v1.0
66
* which accompanies this distribution, and is available at
@@ -21,27 +21,26 @@
2121
import org.eclipse.microprofile.health.Readiness;
2222
import org.eclipse.microprofile.health.HealthCheck;
2323
import org.eclipse.microprofile.health.HealthCheckResponse;
24-
import org.eclipse.microprofile.health.HealthCheckResponseBuilder;
2524

2625
@Readiness
2726
@ApplicationScoped
2827
// tag::systemReadinessCheck[]
2928
public class SystemReadinessCheck implements HealthCheck {
3029

31-
private static final String readinessCheck = SystemResource.class.getSimpleName()
30+
private static final String READINESS_CHECK = SystemResource.class.getSimpleName()
3231
+ " Readiness Check";
3332

3433
@Inject
3534
@ConfigProperty(name = "io_openliberty_guides_system_inMaintenance")
3635
Provider<String> inMaintenance;
37-
36+
3837
@Override
3938
public HealthCheckResponse call() {
4039
if (inMaintenance != null && inMaintenance.get().equalsIgnoreCase("true")) {
41-
return HealthCheckResponse.down(readinessCheck);
40+
return HealthCheckResponse.down(READINESS_CHECK);
4241
}
43-
return HealthCheckResponse.up(readinessCheck);
42+
return HealthCheckResponse.up(READINESS_CHECK);
4443
}
45-
44+
4645
}
4746
// end::systemReadinessCheck[]

‎finish/src/main/liberty/config/server.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<feature>jaxrs-2.1</feature>
55
<feature>jsonp-1.1</feature>
66
<feature>cdi-2.0</feature>
7-
<feature>mpMetrics-2.3</feature>
7+
<feature>mpMetrics-3.0</feature>
88
<!-- tag::mpHealth[] -->
9-
<feature>mpHealth-2.2</feature>
9+
<feature>mpHealth-3.0</feature>
1010
<!-- end::mpHealth[] -->
11-
<feature>mpConfig-1.4</feature>
11+
<feature>mpConfig-2.0</feature>
1212
</featureManager>
1313
<!-- end::features[] -->
1414

‎finish/src/main/webapp/index.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2016 IBM Corp.
2+
Copyright (c) 2016, 2021 IBM Corp.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -103,7 +103,7 @@ <h2>Want to learn more about Open Liberty and MicroProfile?</h2>
103103

104104

105105
</section>
106-
<section id="whereTo">
106+
<section id="whereToNext">
107107
<h2>Where to next, captain?</h2>
108108
<h4>Set course for the Open Liberty guides!</h4>
109109
<p>All of the info you need to continue your journey is here, laid out in easy to follow steps and examples. Searching our current selection makes it easy to find the guide that will help make your next project a reality.</p>
@@ -119,12 +119,12 @@ <h4>Set course for the Open Liberty guides!</h4>
119119

120120
<footer class="bodyFooter">
121121
<div class="bodyFooterLink">
122-
<a id="licenseLink"href="https://github.com/OpenLiberty/open-liberty/blob/master/LICENSE">License</a>
122+
<a id="licenseLink" href="https://github.com/OpenLiberty/open-liberty/blob/master/LICENSE">License</a>
123123
<a href="https://twitter.com/OpenLibertyIO">Twitter</a>
124124
<a href="https://github.com/OpenLiberty">GitHub</a>
125125
<a href="https://openliberty.io/">openliberty.io</a>
126126
</div>
127-
<p id="footer_text">an IBM open source project</p>
128-
<p id="footer_copyright">&copy;Copyright IBM Corp. 2018</p>
127+
<p id="footerText">an IBM open source project</p>
128+
<p id="footerCopyright">&copy;Copyright IBM Corp. 2018, 2021</p>
129129
</footer>
130130
</html>

‎scripts/dockerImageTest.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ echo "Testing daily Docker image"
1313
sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#a<configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER</runtimeUrl></install></configuration>" pom.xml
1414
cat pom.xml
1515

16-
sed -i "s;FROM openliberty/open-liberty:kernel-java8-openj9-ubi;FROM openliberty/daily:latest;g" Dockerfile
16+
sed -i "s;FROM openliberty/open-liberty:full-java11-openj9-ubi;FROM openliberty/daily:latest;g" Dockerfile
1717
cat Dockerfile
1818

1919
docker pull "openliberty/daily:latest"

‎scripts/testApp.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -euxo pipefail
44
# TEST 1: Running the application in a Docker container
55
mvn -q clean package
66

7-
docker pull openliberty/open-liberty:kernel-java8-openj9-ubi
7+
docker pull openliberty/open-liberty:full-java11-openj9-ubi
88

99
docker build -t openliberty-getting-started:1.0-SNAPSHOT .
1010

‎staging/server.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<feature>jaxrs-2.1</feature>
55
<feature>jsonp-1.1</feature>
66
<feature>cdi-2.0</feature>
7-
<feature>mpMetrics-2.3</feature>
7+
<feature>mpMetrics-3.0</feature>
88
<!-- tag::mpHealth[] -->
9-
<feature>mpHealth-2.2</feature>
9+
<feature>mpHealth-3.0</feature>
1010
<!-- end::mpHealth[] -->
11-
<feature>mpConfig-1.4</feature>
11+
<feature>mpConfig-2.0</feature>
1212
</featureManager>
1313
<!-- end::features[] -->
1414

0 commit comments

Comments
 (0)