Skip to content

Commit 5889832

Browse files
gkwan-ibmgkwan-ibm
authored
Use versionless features (#326)
* use versionless feature Signed-off-by: Gilbert Kwan <[email protected]> * use versionless feature Signed-off-by: Gilbert Kwan <[email protected]> * use versionless feature Signed-off-by: Gilbert Kwan <[email protected]> --------- Signed-off-by: Gilbert Kwan <[email protected]>
1 parent 032d58f commit 5889832

File tree

17 files changed

+61
-52
lines changed

17 files changed

+61
-52
lines changed

Diff for: ‎.github/workflows/test.yml

+5-4
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

Diff for: ‎finish/inventory/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>org.eclipse.microprofile</groupId>
4444
<artifactId>microprofile</artifactId>
45-
<version>6.1</version>
45+
<version>7.0</version>
4646
<type>pom</type>
4747
<scope>provided</scope>
4848
</dependency>

Diff for: ‎finish/inventory/src/main/liberty/config/server.xml

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<server description="Sample Liberty server">
22

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

1214
<variable name="http.port" defaultValue="9090" />

Diff for: ‎finish/inventory/src/main/webapp/favicon.ico

14.7 KB
Binary file not shown.

Diff for: ‎finish/inventory/src/main/webapp/index.html

+6-6
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/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
35-
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection 4.0</a></li>
36-
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
37-
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON 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/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
35+
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</a></li>
36+
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
37+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</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>

Diff for: ‎finish/system/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>org.eclipse.microprofile</groupId>
3636
<artifactId>microprofile</artifactId>
37-
<version>6.1</version>
37+
<version>7.0</version>
3838
<type>pom</type>
3939
<scope>provided</scope>
4040
</dependency>

Diff for: ‎finish/system/src/main/liberty/config/server.xml

+7-5
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>jsonb-3.0</feature>
6-
<feature>cdi-4.0</feature>
7-
<feature>jsonp-2.1</feature>
8-
<feature>mpHealth-4.0</feature>
4+
<platform>jakartaee-10.0</platform>
5+
<platform>microprofile-7.0</platform>
6+
<feature>restfulWS</feature>
7+
<feature>jsonb</feature>
8+
<feature>cdi</feature>
9+
<feature>jsonp</feature>
10+
<feature>mpHealth</feature>
911
</featureManager>
1012

1113
<variable name="http.port" defaultValue="9090" />

Diff for: ‎finish/system/src/main/webapp/favicon.ico

14.7 KB
Binary file not shown.

Diff for: ‎finish/system/src/main/webapp/index.html

+5-5
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/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
35-
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection 4.0</a></li>
36-
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON 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/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
35+
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</a></li>
36+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</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>

Diff for: ‎start/inventory/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>org.eclipse.microprofile</groupId>
3939
<artifactId>microprofile</artifactId>
40-
<version>6.1</version>
40+
<version>7.0</version>
4141
<type>pom</type>
4242
<scope>provided</scope>
4343
</dependency>

Diff for: ‎start/inventory/src/main/liberty/config/server.xml

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<server description="Sample Liberty server">
22

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

1214
<variable name="http.port" defaultValue="9090" />

Diff for: ‎start/inventory/src/main/webapp/favicon.ico

14.7 KB
Binary file not shown.

Diff for: ‎start/inventory/src/main/webapp/index.html

+6-6
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/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
35-
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection 4.0</a></li>
36-
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig-3.1.html" target="_blank" rel="noopener noreferrer">MicroProfile Config 3.1</a></li>
37-
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON 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/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
35+
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</a></li>
36+
<li><a href="https://openliberty.io/docs/ref/feature/#mpConfig.html" target="_blank" rel="noopener noreferrer">MicroProfile Config</a></li>
37+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</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>

Diff for: ‎start/system/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>org.eclipse.microprofile</groupId>
3636
<artifactId>microprofile</artifactId>
37-
<version>6.1</version>
37+
<version>7.0</version>
3838
<type>pom</type>
3939
<scope>provided</scope>
4040
</dependency>

Diff for: ‎start/system/src/main/liberty/config/server.xml

+7-5
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>jsonb-3.0</feature>
6-
<feature>cdi-4.0</feature>
7-
<feature>jsonp-2.1</feature>
8-
<feature>mpHealth-4.0</feature>
4+
<platform>jakartaee-10.0</platform>
5+
<platform>microprofile-7.0</platform>
6+
<feature>restfulWS</feature>
7+
<feature>jsonb</feature>
8+
<feature>cdi</feature>
9+
<feature>jsonp</feature>
10+
<feature>mpHealth</feature>
911
</featureManager>
1012

1113
<variable name="http.port" defaultValue="9090" />

Diff for: ‎start/system/src/main/webapp/favicon.ico

14.7 KB
Binary file not shown.

Diff for: ‎start/system/src/main/webapp/index.html

+5-5
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/#restfulWS-3.1.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services 3.1</a></li>
35-
<li><a href="https://openliberty.io/docs/ref/feature/#cdi-4.0.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection 4.0</a></li>
36-
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp-2.1.html" target="_blank" rel="noopener noreferrer">Jakarta JSON 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/#restfulWS.html" target="_blank" rel="noopener noreferrer">Jakarta RESTful Web Services</a></li>
35+
<li><a href="https://openliberty.io/docs/ref/feature/#cdi.html" target="_blank" rel="noopener noreferrer">Jakarta Contexts and Dependency Injection</a></li>
36+
<li><a href="https://openliberty.io/docs/ref/feature/#jsonp.html" target="_blank" rel="noopener noreferrer">Jakarta JSON Processing</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>

0 commit comments

Comments
 (0)