Browse Source

Merge remote-tracking branch 'origin/main'

# Conflicts:
#	pom.xml
pull/3067/head
sgibb 12 months ago
parent
commit
138a49afa0
No known key found for this signature in database
GPG Key ID: 7788A47380690861
  1. 2
      .github/workflows/maven.yml
  2. 6
      pom.xml
  3. 4
      spring-cloud-gateway-integration-tests/grpc/pom.xml
  4. 4
      spring-cloud-gateway-server/pom.xml

2
.github/workflows/maven.yml

@ -31,7 +31,7 @@ jobs:
- name: Build with Maven - 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 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 - 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 if: always() # always run even if the previous step fails
with: with:
report_paths: '**/surefire-reports/TEST-*.xml' report_paths: '**/surefire-reports/TEST-*.xml'

6
pom.xml

@ -51,13 +51,13 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <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> <blockhound.version>1.0.6.RELEASE</blockhound.version>
<java.version>17</java.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-circuitbreaker.version>3.1.0-SNAPSHOT</spring-cloud-circuitbreaker.version>
<spring-cloud-commons.version>4.1.0-SNAPSHOT</spring-cloud-commons.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> </properties>
<dependencyManagement> <dependencyManagement>

4
spring-cloud-gateway-integration-tests/grpc/pom.xml

@ -11,7 +11,7 @@
<description>Spring Cloud Gateway gRPC Integration Test</description> <description>Spring Cloud Gateway gRPC Integration Test</description>
<properties> <properties>
<grpc.version>1.47.0</grpc.version> <grpc.version>1.58.0</grpc.version>
</properties> </properties>
<parent> <parent>
@ -97,7 +97,7 @@
<extension> <extension>
<groupId>kr.motd.maven</groupId> <groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId> <artifactId>os-maven-plugin</artifactId>
<version>1.6.2</version> <version>1.7.1</version>
</extension> </extension>
</extensions> </extensions>
<plugins> <plugins>

4
spring-cloud-gateway-server/pom.xml

@ -16,7 +16,7 @@
<description>Spring Cloud Gateway Server</description> <description>Spring Cloud Gateway Server</description>
<properties> <properties>
<main.basedir>${basedir}/..</main.basedir> <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> <context-propagation.version>1.0.0</context-propagation.version>
</properties> </properties>
@ -310,7 +310,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>

Loading…
Cancel
Save