Skip to content

Commit 34aaec7

Browse files
gkwan-ibmgkwan-ibm
authored
Merge pull request #57 from OpenLiberty/staging
Merge staging to prod: Update to MP6.1
2 parents 50cadd6 + 0fc63df commit 34aaec7

File tree

10 files changed

+65
-40
lines changed

10 files changed

+65
-40
lines changed

‎.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: maven
4+
directory: "/"
5+
schedule:
6+
interval: monthly
7+
open-pull-requests-limit: 50

‎.github/workflows/add-pr-to-project.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Add PRs to Dependabot PRs dashboard
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- labeled
8+
9+
jobs:
10+
add-to-project:
11+
name: Add PR to dashboard
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/[email protected]
15+
with:
16+
project-url: https://github.com/orgs/OpenLiberty/projects/26
17+
github-token: ${{ secrets.ADMIN_BACKLOG }}
18+
labeled: dependencies

‎finish/client/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1515
<!-- Liberty configuration -->
16-
<liberty.var.default.http.port>9080</liberty.var.default.http.port>
17-
<liberty.var.default.https.port>9443</liberty.var.default.https.port>
16+
<liberty.var.http.port>9080</liberty.var.http.port>
17+
<liberty.var.https.port>9443</liberty.var.https.port>
1818
</properties>
1919

2020
<dependencies>
@@ -43,7 +43,7 @@
4343
<plugin>
4444
<groupId>io.openliberty.tools</groupId>
4545
<artifactId>liberty-maven-plugin</artifactId>
46-
<version>3.8.2</version>
46+
<version>3.10</version>
4747
</plugin>
4848
</plugins>
4949
</build>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
<!-- end::features[] -->
99
</featureManager>
1010

11-
<variable name="default.http.port" defaultValue="9080"/>
12-
<variable name="default.https.port" defaultValue="9443"/>
11+
<variable name="http.port" defaultValue="9080"/>
12+
<variable name="https.port" defaultValue="9443"/>
1313

1414
<httpEndpoint
1515
host="*"
16-
httpPort="${default.http.port}"
17-
httpsPort="${default.https.port}"
16+
httpPort="${http.port}"
17+
httpsPort="${https.port}"
1818
id="defaultHttpEndpoint"
1919
/>
2020

‎finish/system/pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1717
<!-- Liberty configuration -->
18-
<liberty.var.default.http.port>9081</liberty.var.default.http.port>
19-
<liberty.var.default.https.port>9445</liberty.var.default.https.port>
18+
<liberty.var.http.port>9081</liberty.var.http.port>
19+
<liberty.var.https.port>9445</liberty.var.https.port>
2020
</properties>
2121

2222
<dependencies>
@@ -32,13 +32,13 @@
3232
<dependency>
3333
<groupId>org.junit.jupiter</groupId>
3434
<artifactId>junit-jupiter</artifactId>
35-
<version>5.9.2</version>
35+
<version>5.10.1</version>
3636
<scope>test</scope>
3737
</dependency>
3838
<dependency>
3939
<groupId>org.eclipse.jetty.websocket</groupId>
4040
<artifactId>websocket-jakarta-client</artifactId>
41-
<version>11.0.14</version>
41+
<version>11.0.19</version>
4242
<scope>test</scope>
4343
</dependency>
4444
<dependency>
@@ -50,13 +50,13 @@
5050
<dependency>
5151
<groupId>org.jboss.resteasy</groupId>
5252
<artifactId>resteasy-json-binding-provider</artifactId>
53-
<version>6.2.3.Final</version>
53+
<version>6.2.7.Final</version>
5454
<scope>test</scope>
5555
</dependency>
5656
<dependency>
5757
<groupId>org.slf4j</groupId>
5858
<artifactId>slf4j-reload4j</artifactId>
59-
<version>2.0.7</version>
59+
<version>2.0.11</version>
6060
<scope>test</scope>
6161
</dependency>
6262
</dependencies>
@@ -77,21 +77,21 @@
7777
<plugin>
7878
<groupId>io.openliberty.tools</groupId>
7979
<artifactId>liberty-maven-plugin</artifactId>
80-
<version>3.8.2</version>
80+
<version>3.10</version>
8181
</plugin>
8282

8383
<!-- Plugin to run unit tests -->
8484
<plugin>
8585
<groupId>org.apache.maven.plugins</groupId>
8686
<artifactId>maven-surefire-plugin</artifactId>
87-
<version>3.0.0</version>
87+
<version>3.2.5</version>
8888
</plugin>
8989

9090
<!-- Plugin to run integration tests -->
9191
<plugin>
9292
<groupId>org.apache.maven.plugins</groupId>
9393
<artifactId>maven-failsafe-plugin</artifactId>
94-
<version>3.0.0</version>
94+
<version>3.2.5</version>
9595
</plugin>
9696
</plugins>
9797
</build>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<!-- end::jsonB[] -->
1010
</featureManager>
1111

12-
<variable name="default.http.port" defaultValue="9081"/>
13-
<variable name="default.https.port" defaultValue="9444"/>
12+
<variable name="http.port" defaultValue="9081"/>
13+
<variable name="https.port" defaultValue="9444"/>
1414

15-
<httpEndpoint host="*" httpPort="${default.http.port}"
16-
httpsPort="${default.https.port}" id="defaultHttpEndpoint"/>
15+
<httpEndpoint host="*" httpPort="${http.port}"
16+
httpsPort="${https.port}" id="defaultHttpEndpoint"/>
1717

1818
<webApplication location="guide-jakarta-websocket-system.war" contextRoot="/"/>
1919

‎start/client/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1515
<!-- Liberty configuration -->
16-
<liberty.var.default.http.port>9080</liberty.var.default.http.port>
17-
<liberty.var.default.https.port>9443</liberty.var.default.https.port>
16+
<liberty.var.http.port>9080</liberty.var.http.port>
17+
<liberty.var.https.port>9443</liberty.var.https.port>
1818
</properties>
1919

2020
<dependencies>
@@ -43,7 +43,7 @@
4343
<plugin>
4444
<groupId>io.openliberty.tools</groupId>
4545
<artifactId>liberty-maven-plugin</artifactId>
46-
<version>3.8.2</version>
46+
<version>3.10</version>
4747
</plugin>
4848
</plugins>
4949
</build>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
<!-- end::features[] -->
99
</featureManager>
1010

11-
<variable name="default.http.port" defaultValue="9080"/>
12-
<variable name="default.https.port" defaultValue="9443"/>
11+
<variable name="http.port" defaultValue="9080"/>
12+
<variable name="https.port" defaultValue="9443"/>
1313

1414
<httpEndpoint
1515
host="*"
16-
httpPort="${default.http.port}"
17-
httpsPort="${default.https.port}"
16+
httpPort="${http.port}"
17+
httpsPort="${https.port}"
1818
id="defaultHttpEndpoint"
1919
/>
2020

‎start/system/pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1717
<!-- Liberty configuration -->
18-
<liberty.var.default.http.port>9081</liberty.var.default.http.port>
19-
<liberty.var.default.https.port>9445</liberty.var.default.https.port>
18+
<liberty.var.http.port>9081</liberty.var.http.port>
19+
<liberty.var.https.port>9445</liberty.var.https.port>
2020
</properties>
2121

2222
<dependencies>
@@ -32,13 +32,13 @@
3232
<dependency>
3333
<groupId>org.junit.jupiter</groupId>
3434
<artifactId>junit-jupiter</artifactId>
35-
<version>5.9.2</version>
35+
<version>5.10.1</version>
3636
<scope>test</scope>
3737
</dependency>
3838
<dependency>
3939
<groupId>org.eclipse.jetty.websocket</groupId>
4040
<artifactId>websocket-jakarta-client</artifactId>
41-
<version>11.0.14</version>
41+
<version>11.0.19</version>
4242
<scope>test</scope>
4343
</dependency>
4444
<dependency>
@@ -50,13 +50,13 @@
5050
<dependency>
5151
<groupId>org.jboss.resteasy</groupId>
5252
<artifactId>resteasy-json-binding-provider</artifactId>
53-
<version>6.2.3.Final</version>
53+
<version>6.2.7.Final</version>
5454
<scope>test</scope>
5555
</dependency>
5656
<dependency>
5757
<groupId>org.slf4j</groupId>
5858
<artifactId>slf4j-reload4j</artifactId>
59-
<version>2.0.7</version>
59+
<version>2.0.11</version>
6060
<scope>test</scope>
6161
</dependency>
6262
</dependencies>
@@ -77,21 +77,21 @@
7777
<plugin>
7878
<groupId>io.openliberty.tools</groupId>
7979
<artifactId>liberty-maven-plugin</artifactId>
80-
<version>3.8.2</version>
80+
<version>3.10</version>
8181
</plugin>
8282

8383
<!-- Plugin to run unit tests -->
8484
<plugin>
8585
<groupId>org.apache.maven.plugins</groupId>
8686
<artifactId>maven-surefire-plugin</artifactId>
87-
<version>3.0.0</version>
87+
<version>3.2.5</version>
8888
</plugin>
8989

9090
<!-- Plugin to run integration tests -->
9191
<plugin>
9292
<groupId>org.apache.maven.plugins</groupId>
9393
<artifactId>maven-failsafe-plugin</artifactId>
94-
<version>3.0.0</version>
94+
<version>3.2.5</version>
9595
</plugin>
9696
</plugins>
9797
</build>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<!-- end::jsonB[] -->
1010
</featureManager>
1111

12-
<variable name="default.http.port" defaultValue="9081"/>
13-
<variable name="default.https.port" defaultValue="9444"/>
12+
<variable name="http.port" defaultValue="9081"/>
13+
<variable name="https.port" defaultValue="9444"/>
1414

15-
<httpEndpoint host="*" httpPort="${default.http.port}"
16-
httpsPort="${default.https.port}" id="defaultHttpEndpoint"/>
15+
<httpEndpoint host="*" httpPort="${http.port}"
16+
httpsPort="${https.port}" id="defaultHttpEndpoint"/>
1717

1818
<webApplication location="guide-jakarta-websocket-system.war" contextRoot="/"/>
1919

0 commit comments

Comments
 (0)