Skip to content

Commit 805068b

Browse files
gkwan-ibmgkwan-ibm
authored
Merge pull request #65 from OpenLiberty/staging
Merge staging to prod: Update to MP6 and JEE10
2 parents cfd4802 + 3bcac70 commit 805068b

File tree

30 files changed

+992
-315
lines changed

30 files changed

+992
-315
lines changed

‎LICENSE‎

Lines changed: 675 additions & 0 deletions
Large diffs are not rendered by default.

‎README.adoc‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2022 IBM Corporation and others.
1+
// Copyright (c) 2022, 2023 IBM Corporation and others.
22
// Licensed under Creative Commons Attribution-NoDerivatives
33
// 4.0 International (CC BY-ND 4.0)
44
// https://creativecommons.org/licenses/by-nd/4.0/
@@ -110,6 +110,10 @@ endif::[]
110110
[role=command]
111111
include::{common-includes}/devmode-lmp33-start.adoc[]
112112

113+
ifndef::cloud-hosted[]
114+
Navigate back to the `start` directory.
115+
endif::[]
116+
113117
ifdef::cloud-hosted[]
114118
Open a new command-line session.
115119
endif::[]
@@ -203,9 +207,13 @@ The generated pact file is named `Inventory-System.json` and is located in the `
203207
}
204208
----
205209

206-
Open a new command-line session and navigate to the `start/inventory` directory.
210+
ifndef::cloud-hosted[]
211+
Now, navigate to the `start/inventory` directory again.
212+
endif::[]
207213

208214
ifdef::cloud-hosted[]
215+
Open a new command-line session and navigate to the `start/inventory` directory.
216+
209217
```bash
210218
cd /home/project/guide-contract-testing/start/inventory
211219
```
@@ -286,6 +294,10 @@ After you see the following message, your application server in dev mode is read
286294
----
287295
{empty} +
288296

297+
ifndef::cloud-hosted[]
298+
Open another command-line session and navigate back to the `start` directory to continue.
299+
endif::[]
300+
289301
ifdef::cloud-hosted[]
290302
Open a new command-line session.
291303
endif::[]
@@ -424,8 +436,8 @@ endif::[]
424436
[role='command']
425437
```
426438
docker-compose -f "pact-broker/docker-compose.yml" down
427-
docker rmi postgres:12
428-
docker rmi pactfoundation/pact-broker:2.62.0.0
439+
docker rmi postgres:15
440+
docker rmi pactfoundation/pact-broker:2.106.0.1
429441
docker volume rm pact-broker_postgres-volume
430442
```
431443

‎finish/inventory/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
14-
<maven.compiler.source>1.8</maven.compiler.source>
15-
<maven.compiler.target>1.8</maven.compiler.target>
14+
<maven.compiler.source>11</maven.compiler.source>
15+
<maven.compiler.target>11</maven.compiler.target>
1616
<!-- Liberty configuration -->
1717
<liberty.var.default.http.port>9081</liberty.var.default.http.port>
1818
<liberty.var.default.https.port>9443</liberty.var.default.https.port>
@@ -22,14 +22,14 @@
2222
<dependency>
2323
<groupId>org.eclipse.microprofile</groupId>
2424
<artifactId>microprofile</artifactId>
25-
<version>5.0</version>
25+
<version>6.0</version>
2626
<type>pom</type>
2727
<scope>provided</scope>
2828
</dependency>
2929
<dependency>
3030
<groupId>jakarta.platform</groupId>
3131
<artifactId>jakarta.jakartaee-api</artifactId>
32-
<version>9.1.0</version>
32+
<version>10.0.0</version>
3333
<scope>provided</scope>
3434
</dependency>
3535
<!-- For tests -->
@@ -43,12 +43,12 @@
4343
<dependency>
4444
<groupId>org.slf4j</groupId>
4545
<artifactId>slf4j-simple</artifactId>
46-
<version>1.7.33</version>
46+
<version>2.0.7</version>
4747
</dependency>
4848
<dependency>
4949
<groupId>org.jboss.resteasy</groupId>
5050
<artifactId>resteasy-client</artifactId>
51-
<version>6.0.0.Final</version>
51+
<version>6.2.3.Final</version>
5252
<scope>test</scope>
5353
</dependency>
5454
</dependencies>
@@ -60,7 +60,7 @@
6060
<plugin>
6161
<groupId>au.com.dius.pact.provider</groupId>
6262
<artifactId>maven</artifactId>
63-
<version>4.3.4</version>
63+
<version>4.5.6</version>
6464
<configuration>
6565
<serviceProviders>
6666
// tag::serviceProvider[]
@@ -94,7 +94,7 @@
9494
<plugin>
9595
<groupId>org.apache.maven.plugins</groupId>
9696
<artifactId>maven-failsafe-plugin</artifactId>
97-
<version>2.22.2</version>
97+
<version>3.0.0</version>
9898
<configuration>
9999
<systemPropertyVariables>
100100
<http.port>${liberty.var.default.http.port}</http.port>

‎finish/inventory/src/main/java/io/openliberty/guides/inventory/Inventory.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
/*******************************************************************************
33
* Copyright (c) 2021, 2022 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
5-
* are made available under the terms of the Eclipse Public License v1.0
5+
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
7-
* http://www.eclipse.org/legal/epl-v10.html
7+
* http://www.eclipse.org/legal/epl-2.0/
88
*
9-
* Contributors:
10-
* IBM Corporation - Initial implementation
9+
* SPDX-License-Identifier: EPL-2.0
1110
*******************************************************************************/
1211
// end::copyright[]
1312
package io.openliberty.guides.inventory;

‎finish/inventory/src/main/java/io/openliberty/guides/inventory/InventoryApplication.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
/*******************************************************************************
33
* Copyright (c) 2021, 2022 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
5-
* are made available under the terms of the Eclipse Public License v1.0
5+
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
7-
* http://www.eclipse.org/legal/epl-v10.html
7+
* http://www.eclipse.org/legal/epl-2.0/
88
*
9-
* Contributors:
10-
* IBM Corporation - Initial implementation
9+
* SPDX-License-Identifier: EPL-2.0
1110
*******************************************************************************/
1211
// end::copyright[]
1312
package io.openliberty.guides.inventory;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<server description="Sample Liberty server">
22

33
<featureManager>
4-
<feature>restfulWS-3.0</feature>
5-
<feature>jsonb-2.0</feature>
4+
<feature>restfulWS-3.1</feature>
5+
<feature>jsonb-3.0</feature>
66
</featureManager>
77

88
<variable name="default.http.port" defaultValue="9081"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h2>Eclipse MicroProfile</h2>
2929
</p>
3030
<p>
3131
For more information about the features used in this application, see the Open Liberty documentation:
32-
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.0.html">Java RESTful Services 3.0</a></li>
32+
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html">Jakarta RESTful Web Services 3.1</a></li>
3333
</p>
3434
</div>
3535
</body>

‎finish/inventory/src/test/java/io/openliberty/guides/inventory/InventoryPactIT.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
/*******************************************************************************
33
* Copyright (c) 2021 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
5-
* are made available under the terms of the Eclipse Public License v1.0
5+
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
7-
* http://www.eclipse.org/legal/epl-v10.html
7+
* http://www.eclipse.org/legal/epl-2.0/
88
*
9-
* Contributors:
10-
* IBM Corporation - initial API and implementation
9+
* SPDX-License-Identifier: EPL-2.0
1110
*******************************************************************************/
1211
// end::copyright[]
1312

‎finish/system/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<packaging>war</packaging>
1111

1212
<properties>
13-
<maven.compiler.source>1.8</maven.compiler.source>
14-
<maven.compiler.target>1.8</maven.compiler.target>
13+
<maven.compiler.source>11</maven.compiler.source>
14+
<maven.compiler.target>11</maven.compiler.target>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1717
<!-- Liberty configuration -->
@@ -25,32 +25,32 @@
2525
<dependency>
2626
<groupId>org.eclipse.microprofile</groupId>
2727
<artifactId>microprofile</artifactId>
28-
<version>5.0</version>
28+
<version>6.0</version>
2929
<type>pom</type>
3030
<scope>provided</scope>
3131
</dependency>
3232
<dependency>
3333
<groupId>jakarta.platform</groupId>
3434
<artifactId>jakarta.jakartaee-api</artifactId>
35-
<version>9.1.0</version>
35+
<version>10.0.0</version>
3636
<scope>provided</scope>
3737
</dependency>
3838
<!-- tag::pactDependency[] -->
3939
<dependency>
4040
<groupId>au.com.dius.pact.provider</groupId>
4141
<artifactId>junit5</artifactId>
42-
<version>4.3.4</version>
42+
<version>4.5.6</version>
4343
</dependency>
4444
<!-- end::pactDependency[] -->
4545
<dependency>
4646
<groupId>org.slf4j</groupId>
4747
<artifactId>slf4j-simple</artifactId>
48-
<version>1.7.33</version>
48+
<version>2.0.7</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>org.jboss.resteasy</groupId>
5252
<artifactId>resteasy-client</artifactId>
53-
<version>6.0.0.Final</version>
53+
<version>6.2.3.Final</version>
5454
<scope>test</scope>
5555
</dependency>
5656
</dependencies>
@@ -75,7 +75,7 @@
7575
<plugin>
7676
<groupId>org.apache.maven.plugins</groupId>
7777
<artifactId>maven-failsafe-plugin</artifactId>
78-
<version>3.0.0-M5</version>
78+
<version>3.0.0</version>
7979
<configuration>
8080
<systemPropertyVariables>
8181
<http.port>${liberty.var.default.http.port}</http.port>

‎finish/system/src/main/java/io/openliberty/guides/system/SystemApplication.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
/*******************************************************************************
33
* Copyright (c) 2021, 2022 IBM Corporation and others.
44
* All rights reserved. This program and the accompanying materials
5-
* are made available under the terms of the Eclipse Public License v1.0
5+
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
7-
* http://www.eclipse.org/legal/epl-v10.html
7+
* http://www.eclipse.org/legal/epl-2.0/
88
*
9-
* Contributors:
10-
* IBM Corporation - Initial implementation
9+
* SPDX-License-Identifier: EPL-2.0
1110
*******************************************************************************/
1211
// end::copyright[]
1312
package io.openliberty.guides.system;

0 commit comments

Comments
 (0)