Skip to content

Commit b79ff11

Browse files
gkwan-ibmgkwan-ibm
authored
Merge pull request #162 from OpenLiberty/staging
Merge staging to prod - Use versionless feature and MP7
2 parents 05d65b4 + 3a28ed2 commit b79ff11

File tree

17 files changed

+55
-48
lines changed

17 files changed

+55
-48
lines changed

‎.github/workflows/test.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
canSkip: ${{ steps.Checker.outputs.canSkip }}
1313
steps:
1414
- name: Get files
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616
- name: Get tools
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
with:
1919
path: tools/
2020
repository: openliberty/guides-common
@@ -46,10 +46,11 @@ jobs:
4646
run:
4747
working-directory: finish
4848
steps:
49-
- uses: actions/checkout@v2
49+
- uses: actions/checkout@v4
5050
- name: Set up JDK 11
51-
uses: actions/setup-java@v1
51+
uses: actions/setup-java@v4
5252
with:
53+
distribution: 'semeru'
5354
java-version: 11
5455
- run: unset _JAVA_OPTIONS
5556
- name: Run tests

‎finish/inventory/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>org.eclipse.microprofile</groupId>
4747
<artifactId>microprofile</artifactId>
48-
<version>6.1</version>
48+
<version>7.0</version>
4949
<type>pom</type>
5050
<scope>provided</scope>
5151
</dependency>

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

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

33
<featureManager>
4-
<feature>restfulWS-3.1</feature>
5-
<feature>jsonp-2.1</feature>
6-
<feature>jsonb-3.0</feature>
7-
<feature>cdi-4.0</feature>
8-
<feature>mpConfig-3.1</feature>
4+
<platform>jakartaee-10.0</platform>
5+
<platform>microprofile-7.0</platform>
6+
<feature>restfulWS</feature>
7+
<feature>jsonp</feature>
8+
<feature>jsonb</feature>
9+
<feature>cdi</feature>
10+
<feature>mpConfig</feature>
911
</featureManager>
1012

1113
<variable name="system.node.port" defaultValue="9080"/>

‎finish/inventory/src/main/webapp/favicon.ico‎

14.7 KB
Binary file not shown.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ <h2>Eclipse MicroProfile</h2>
3030
<p>
3131
For more information about the features used in this application, see the Open Liberty documentation:
3232
<ul>
33-
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
34-
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
35-
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 4.0</a></li>
36-
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
37-
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">JavaScript Object Notation Processing 2.1</a></li>
38-
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding 3.0</a></li>
33+
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</a></li>
34+
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
35+
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection</a></li>
36+
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
37+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">JavaScript Object Notation Processing 2.1</a></li>
38+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
3939
</ul>
4040
</p>
4141
</div>

‎finish/system/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>org.eclipse.microprofile</groupId>
3737
<artifactId>microprofile</artifactId>
38-
<version>6.1</version>
38+
<version>7.0</version>
3939
<type>pom</type>
4040
<scope>provided</scope>
4141
</dependency>

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

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

33
<featureManager>
4-
<feature>restfulWS-3.1</feature>
5-
<feature>jsonp-2.1</feature>
6-
<feature>jsonb-3.0</feature>
7-
<feature>cdi-4.0</feature>
4+
<platform>jakartaee-10.0</platform>
5+
<feature>restfulWS</feature>
6+
<feature>jsonp</feature>
7+
<feature>jsonb</feature>
8+
<feature>cdi</feature>
89
</featureManager>
910

1011
<variable name="http.port" defaultValue="9080"/>

‎finish/system/src/main/webapp/favicon.ico‎

14.7 KB
Binary file not shown.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ <h2>Eclipse MicroProfile</h2>
3030
<p>
3131
For more information about the features used in this application, see the Open Liberty documentation:
3232
<ul>
33-
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile-6.1.html" target="_blank" rel="noopener noreferrer">MicroProfile 6.1</a></li>
34-
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection 4.0</a></li>
35-
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
36-
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">JavaScript Object Notation Processing 2.1</a></li>
37-
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb-3.0.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding 3.0</a></li>
33+
<li><a href="https://openliberty.io/docs/ref/feature/#microProfile.html" target="_blank" rel="noopener noreferrer">MicroProfile</a></li>
34+
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Contexts and Dependency Injection</a></li>
35+
<li><a href="https://openliberty.io/docs/ref/feature/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
36+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">JavaScript Object Notation Processing 2.1</a></li>
37+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonb.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Binding</a></li>
3838
</ul>
3939
</p>
4040
</div>

‎start/inventory/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>org.eclipse.microprofile</groupId>
4747
<artifactId>microprofile</artifactId>
48-
<version>6.1</version>
48+
<version>7.0</version>
4949
<type>pom</type>
5050
<scope>provided</scope>
5151
</dependency>

0 commit comments

Comments
 (0)