Merge remote-tracking branch 'origin/main'
# Conflicts: # pom.xml
This commit is contained in:
2
.github/workflows/maven.yml
vendored
2
.github/workflows/maven.yml
vendored
@@ -31,7 +31,7 @@ jobs:
|
||||
- name: Build with Maven
|
||||
run: ./mvnw clean install -B -U -Pspring -Dmaven.test.redirectTestOutputToFile=true -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
|
||||
- name: Publish Test Report
|
||||
uses: mikepenz/action-junit-report@v2
|
||||
uses: mikepenz/action-junit-report@v4
|
||||
if: always() # always run even if the previous step fails
|
||||
with:
|
||||
report_paths: '**/surefire-reports/TEST-*.xml'
|
||||
|
||||
6
pom.xml
6
pom.xml
@@ -51,13 +51,13 @@
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<bucket4j.version>8.3.0</bucket4j.version>
|
||||
<bucket4j.version>8.5.0</bucket4j.version>
|
||||
<blockhound.version>1.0.6.RELEASE</blockhound.version>
|
||||
<java.version>17</java.version>
|
||||
<junit-pioneer.version>1.6.2</junit-pioneer.version>
|
||||
<junit-pioneer.version>1.9.1</junit-pioneer.version>
|
||||
<spring-cloud-circuitbreaker.version>3.1.0-SNAPSHOT</spring-cloud-circuitbreaker.version>
|
||||
<spring-cloud-commons.version>4.1.0-SNAPSHOT</spring-cloud-commons.version>
|
||||
<testcontainers.version>1.17.3</testcontainers.version>
|
||||
<testcontainers.version>1.19.1</testcontainers.version>
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<description>Spring Cloud Gateway gRPC Integration Test</description>
|
||||
|
||||
<properties>
|
||||
<grpc.version>1.47.0</grpc.version>
|
||||
<grpc.version>1.58.0</grpc.version>
|
||||
</properties>
|
||||
|
||||
<parent>
|
||||
@@ -97,7 +97,7 @@
|
||||
<extension>
|
||||
<groupId>kr.motd.maven</groupId>
|
||||
<artifactId>os-maven-plugin</artifactId>
|
||||
<version>1.6.2</version>
|
||||
<version>1.7.1</version>
|
||||
</extension>
|
||||
</extensions>
|
||||
<plugins>
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<description>Spring Cloud Gateway Server</description>
|
||||
<properties>
|
||||
<main.basedir>${basedir}/..</main.basedir>
|
||||
<grpc.version>1.47.0</grpc.version>
|
||||
<grpc.version>1.58.0</grpc.version>
|
||||
<context-propagation.version>1.0.0</context-propagation.version>
|
||||
</properties>
|
||||
|
||||
@@ -310,7 +310,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.2.0</version>
|
||||
<version>3.3.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
|
||||
Reference in New Issue
Block a user