Skip to content

Commit

Permalink
Merge pull request #174 from OpenLiberty/staging
Browse files Browse the repository at this point in the history 
Merge staging to prod - Dependabot Bump
  • Loading branch information
@gkwan-ibm
gkwan-ibm authored Sep 5, 2024
2 parents 8ec9f56 + 8e4aab3 commit caf0d3a
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
< "$logsPath" grep Launching
- name: Archive server logs if failed
if: failure()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: server-logs
path: finish/target/liberty/wlp/usr/servers/defaultServer/logs/
Expand Down
16 changes: 8 additions & 8 deletions finish/query/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,39 +40,39 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.15.0</version>
<version>3.17.0</version>
</dependency>
<!-- grpc compile dependencies; provided by Liberty at runtime -->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.65.1</version>
<version>1.66.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.65.1</version>
<version>1.66.0</version>
<scope>provided</scope>
</dependency>

<!-- For tests -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.10.3</version>
<version>5.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<version>6.2.9.Final</version>
<version>6.2.10.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-json-binding-provider</artifactId>
<version>6.2.9.Final</version>
<version>6.2.10.Final</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -98,13 +98,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.3.1</version>
<version>3.5.0</version>
</plugin>
<!-- Plugin to run functional tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.3.1</version>
<version>3.5.0</version>
<configuration>
<systemPropertyVariables>
<http.port>${liberty.var.http.port}</http.port>
Expand Down
14 changes: 7 additions & 7 deletions finish/system/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,43 +42,43 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.15.0</version>
<version>3.17.0</version>
</dependency>

<!-- grpc compile dependencies; provided by Liberty at runtime -->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.65.1</version>
<version>1.66.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.65.1</version>
<version>1.66.0</version>
<scope>provided</scope>
</dependency>

<!-- For tests -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.10.3</version>
<version>5.11.0</version>
<scope>test</scope>
</dependency>
<!-- tag::grpc-testing[] -->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing</artifactId>
<version>1.65.1</version>
<version>1.66.0</version>
<scope>test</scope>
</dependency>
<!-- end::grpc-testing[] -->
<!-- tag::mockito-core[] -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.12.0</version>
<version>5.13.0</version>
<scope>test</scope>
</dependency>
<!-- end::mockito-core[] -->
Expand All @@ -100,7 +100,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.3.1</version>
<version>3.5.0</version>
</plugin>
</plugins>
</build>
Expand Down
4 changes: 2 additions & 2 deletions finish/systemproto/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.65.1</version>
<version>1.66.0</version>
<scope>provided</scope>
</dependency>
<!-- end::grpc[] -->
<!-- tag::grpc-stub[] -->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.65.1</version>
<version>1.66.0</version>
<scope>provided</scope>
</dependency>
<!-- end::grpc-stub[] -->
Expand Down
16 changes: 8 additions & 8 deletions start/query/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,39 +40,39 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.15.0</version>
<version>3.17.0</version>
</dependency>
<!-- grpc compile dependencies; provided by Liberty at runtime -->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.65.1</version>
<version>1.66.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.65.1</version>
<version>1.66.0</version>
<scope>provided</scope>
</dependency>

<!-- For tests -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.10.3</version>
<version>5.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<version>6.2.9.Final</version>
<version>6.2.10.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-json-binding-provider</artifactId>
<version>6.2.9.Final</version>
<version>6.2.10.Final</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -98,13 +98,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.3.1</version>
<version>3.5.0</version>
</plugin>
<!-- Plugin to run functional tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.3.1</version>
<version>3.5.0</version>
<configuration>
<systemPropertyVariables>
<http.port>${liberty.var.http.port}</http.port>
Expand Down
14 changes: 7 additions & 7 deletions start/system/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.15.0</version>
<version>3.17.0</version>
</dependency>

<!-- grpc compile dependencies; provided by Liberty at runtime -->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.65.1</version>
<version>1.66.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.65.1</version>
<version>1.66.0</version>
<scope>provided</scope>
</dependency>

Expand All @@ -64,22 +64,22 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing</artifactId>
<version>1.65.1</version>
<version>1.66.0</version>
<scope>test</scope>
</dependency>
<!-- end::grpc-testing[] -->
<!-- tag::mockito-core[] -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.12.0</version>
<version>5.13.0</version>
<scope>test</scope>
</dependency>
<!-- end::mockito-core[] -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.10.3</version>
<version>5.11.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -100,7 +100,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.3.1</version>
<version>3.5.0</version>
</plugin>
</plugins>
</build>
Expand Down
4 changes: 2 additions & 2 deletions start/systemproto/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.65.1</version>
<version>1.66.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.65.1</version>
<version>1.66.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit caf0d3a

Please sign in to comment.