Skip to content

Commit bbdc52f

Browse files
gkwan-ibmgkwan-ibm
authored
Merge pull request #242 from OpenLiberty/staging
Merge staging to prod - Use versionless feature and MP7
2 parents 91a5920 + 05b43c2 commit bbdc52f

File tree

11 files changed

+54
-42
lines changed

11 files changed

+54
-42
lines changed

‎.github/workflows/test.yml

+14-8
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
@@ -47,10 +47,11 @@ jobs:
4747
run:
4848
working-directory: finish
4949
steps:
50-
- uses: actions/checkout@v2
50+
- uses: actions/checkout@v4
5151
- name: Set up JDK 11
52-
uses: actions/setup-java@v1
52+
uses: actions/setup-java@v4
5353
with:
54+
distribution: 'semeru'
5455
java-version: 11
5556
- run: unset _JAVA_OPTIONS
5657
- name: Run tests
@@ -62,10 +63,15 @@ jobs:
6263
< "$logsPath" grep Launching
6364
logsPath=$(find . -name "console.log" | grep system);
6465
< "$logsPath" grep Launching
65-
- name: Archive server logs if failed
66+
- name: Archive system server logs if failed
6667
if: failure()
6768
uses: actions/upload-artifact@v4
6869
with:
69-
name: server-logs
70-
path: finish/target/liberty/wlp/usr/servers/defaultServer/logs/
71-
70+
name: system-server-logs
71+
path: finish/system/target/liberty/wlp/usr/servers/defaultServer/logs/
72+
- name: Archive query server logs if failed
73+
if: failure()
74+
uses: actions/upload-artifact@v4
75+
with:
76+
name: query-server-logs
77+
path: finish/query/target/liberty/wlp/usr/servers/defaultServer/logs/

‎finish/query/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>org.eclipse.microprofile</groupId>
3434
<artifactId>microprofile</artifactId>
35-
<version>6.1</version>
35+
<version>7.0</version>
3636
<type>pom</type>
3737
<scope>provided</scope>
3838
</dependency>
@@ -46,13 +46,13 @@
4646
<dependency>
4747
<groupId>io.grpc</groupId>
4848
<artifactId>grpc-protobuf</artifactId>
49-
<version>1.69.0</version>
49+
<version>1.70.0</version>
5050
<scope>provided</scope>
5151
</dependency>
5252
<dependency>
5353
<groupId>io.grpc</groupId>
5454
<artifactId>grpc-stub</artifactId>
55-
<version>1.69.0</version>
55+
<version>1.70.0</version>
5656
<scope>provided</scope>
5757
</dependency>
5858

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

+8-6
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
<server description="query service">
33

44
<featureManager>
5-
<feature>restfulWS-3.1</feature>
6-
<feature>jsonp-2.1</feature>
7-
<feature>jsonb-3.0</feature>
8-
<feature>cdi-4.0</feature>
9-
<feature>mpConfig-3.1</feature>
5+
<platform>jakartaee-10.0</platform>
6+
<platform>microprofile-7.0</platform>
7+
<feature>restfulWS</feature>
8+
<feature>jsonp</feature>
9+
<feature>jsonb</feature>
10+
<feature>cdi</feature>
11+
<feature>mpConfig</feature>
1012
<!-- tag::grpcClient[] -->
1113
<feature>grpcClient-1.0</feature>
1214
<!-- end::grpcClient[] -->
@@ -29,4 +31,4 @@
2931
<webApplication contextRoot="/" location="guide-grpc-intro-query.war"/>
3032

3133
<logging consoleLogLevel="INFO"/>
32-
</server>
34+
</server>

‎finish/system/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>org.eclipse.microprofile</groupId>
2929
<artifactId>microprofile</artifactId>
30-
<version>6.1</version>
30+
<version>7.0</version>
3131
<type>pom</type>
3232
<scope>provided</scope>
3333
</dependency>
@@ -49,13 +49,13 @@
4949
<dependency>
5050
<groupId>io.grpc</groupId>
5151
<artifactId>grpc-protobuf</artifactId>
52-
<version>1.69.0</version>
52+
<version>1.70.0</version>
5353
<scope>provided</scope>
5454
</dependency>
5555
<dependency>
5656
<groupId>io.grpc</groupId>
5757
<artifactId>grpc-stub</artifactId>
58-
<version>1.69.0</version>
58+
<version>1.70.0</version>
5959
<scope>provided</scope>
6060
</dependency>
6161

@@ -70,15 +70,15 @@
7070
<dependency>
7171
<groupId>io.grpc</groupId>
7272
<artifactId>grpc-testing</artifactId>
73-
<version>1.69.0</version>
73+
<version>1.70.0</version>
7474
<scope>test</scope>
7575
</dependency>
7676
<!-- end::grpc-testing[] -->
7777
<!-- tag::mockito-core[] -->
7878
<dependency>
7979
<groupId>org.mockito</groupId>
8080
<artifactId>mockito-core</artifactId>
81-
<version>5.14.2</version>
81+
<version>5.15.2</version>
8282
<scope>test</scope>
8383
</dependency>
8484
<!-- end::mockito-core[] -->

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<server description="system service">
33

44
<featureManager>
5-
<feature>restfulWS-3.1</feature>
5+
<platform>jakartaee-10.0</platform>
6+
<feature>restfulWS</feature>
67
<!-- tag::grpc[] -->
78
<feature>grpc-1.0</feature>
89
<!-- end::grpc[] -->
@@ -17,4 +18,4 @@
1718
<webApplication contextRoot="/" location="guide-grpc-intro-system.war"/>
1819

1920
<logging consoleLogLevel="INFO"/>
20-
</server>
21+
</server>

‎finish/systemproto/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
<dependency>
2626
<groupId>io.grpc</groupId>
2727
<artifactId>grpc-protobuf</artifactId>
28-
<version>1.69.0</version>
28+
<version>1.70.0</version>
2929
<scope>provided</scope>
3030
</dependency>
3131
<!-- end::grpc[] -->
3232
<!-- tag::grpc-stub[] -->
3333
<dependency>
3434
<groupId>io.grpc</groupId>
3535
<artifactId>grpc-stub</artifactId>
36-
<version>1.69.0</version>
36+
<version>1.70.0</version>
3737
<scope>provided</scope>
3838
</dependency>
3939
<!-- end::grpc-stub[] -->

‎start/query/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>org.eclipse.microprofile</groupId>
3434
<artifactId>microprofile</artifactId>
35-
<version>6.1</version>
35+
<version>7.0</version>
3636
<type>pom</type>
3737
<scope>provided</scope>
3838
</dependency>
@@ -46,13 +46,13 @@
4646
<dependency>
4747
<groupId>io.grpc</groupId>
4848
<artifactId>grpc-protobuf</artifactId>
49-
<version>1.69.0</version>
49+
<version>1.70.0</version>
5050
<scope>provided</scope>
5151
</dependency>
5252
<dependency>
5353
<groupId>io.grpc</groupId>
5454
<artifactId>grpc-stub</artifactId>
55-
<version>1.69.0</version>
55+
<version>1.70.0</version>
5656
<scope>provided</scope>
5757
</dependency>
5858

‎start/query/src/main/liberty/config/server.xml

+7-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
<server description="query service">
33

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

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

‎start/system/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>org.eclipse.microprofile</groupId>
2929
<artifactId>microprofile</artifactId>
30-
<version>6.1</version>
30+
<version>7.0</version>
3131
<type>pom</type>
3232
<scope>provided</scope>
3333
</dependency>
@@ -49,13 +49,13 @@
4949
<dependency>
5050
<groupId>io.grpc</groupId>
5151
<artifactId>grpc-protobuf</artifactId>
52-
<version>1.69.0</version>
52+
<version>1.70.0</version>
5353
<scope>provided</scope>
5454
</dependency>
5555
<dependency>
5656
<groupId>io.grpc</groupId>
5757
<artifactId>grpc-stub</artifactId>
58-
<version>1.69.0</version>
58+
<version>1.70.0</version>
5959
<scope>provided</scope>
6060
</dependency>
6161

@@ -64,15 +64,15 @@
6464
<dependency>
6565
<groupId>io.grpc</groupId>
6666
<artifactId>grpc-testing</artifactId>
67-
<version>1.69.0</version>
67+
<version>1.70.0</version>
6868
<scope>test</scope>
6969
</dependency>
7070
<!-- end::grpc-testing[] -->
7171
<!-- tag::mockito-core[] -->
7272
<dependency>
7373
<groupId>org.mockito</groupId>
7474
<artifactId>mockito-core</artifactId>
75-
<version>5.14.2</version>
75+
<version>5.15.2</version>
7676
<scope>test</scope>
7777
</dependency>
7878
<!-- end::mockito-core[] -->

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<server description="system service">
33

44
<featureManager>
5-
<feature>restfulWS-3.1</feature>
5+
<platform>jakartaee-10.0</platform>
6+
<feature>restfulWS</feature>
67
</featureManager>
78

89
<applicationManager autoExpand="true"/>

‎start/systemproto/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
<dependency>
2525
<groupId>io.grpc</groupId>
2626
<artifactId>grpc-protobuf</artifactId>
27-
<version>1.69.0</version>
27+
<version>1.70.0</version>
2828
<scope>provided</scope>
2929
</dependency>
3030
<dependency>
3131
<groupId>io.grpc</groupId>
3232
<artifactId>grpc-stub</artifactId>
33-
<version>1.69.0</version>
33+
<version>1.70.0</version>
3434
<scope>provided</scope>
3535
</dependency>
3636
<dependency>

0 commit comments

Comments
 (0)