Skip to content

Commit c512cbd

Browse files
committed
Merge branch 'main' into drop-constructors-from-default-kubernetes-service-instance
2 parents 5f64d96 + debd44c commit c512cbd

File tree

4 files changed

+3
-12
lines changed
  • spring-cloud-kubernetes-controllers
    • spring-cloud-kubernetes-configserver
    • spring-cloud-kubernetes-configuration-watcher
    • spring-cloud-kubernetes-discoveryserver

4 files changed

+3
-12
lines changed

pom.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
<spring-cloud-commons.version>5.0.0-SNAPSHOT</spring-cloud-commons.version>
9696
<spring-cloud-config.version>5.0.0-SNAPSHOT</spring-cloud-config.version>
9797
<spring-cloud-bus.version>5.0.0-SNAPSHOT</spring-cloud-bus.version>
98-
<spring-cloud-contract.version>5.0.0-SNAPSHOT</spring-cloud-contract.version>
9998

10099
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
101100
<maven-checkstyle-plugin.failsOnViolation>true
@@ -169,14 +168,6 @@
169168
<scope>import</scope>
170169
</dependency>
171170

172-
<dependency>
173-
<groupId>org.springframework.cloud</groupId>
174-
<artifactId>spring-cloud-contract-dependencies</artifactId>
175-
<version>${spring-cloud-contract.version}</version>
176-
<type>pom</type>
177-
<scope>import</scope>
178-
</dependency>
179-
180171
<dependency>
181172
<groupId>org.codehaus.groovy</groupId>
182173
<artifactId>groovy-all</artifactId>

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<properties>
1616
<docker.registry.organization>springcloud</docker.registry.organization>
17-
<plexus-archiver.version>4.10.2</plexus-archiver.version>
17+
<plexus-archiver.version>4.10.3</plexus-archiver.version>
1818
</properties>
1919

2020
<dependencies>

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<properties>
1616
<docker.registry.organization>springcloud</docker.registry.organization>
17-
<plexus-archiver.version>4.10.2</plexus-archiver.version>
17+
<plexus-archiver.version>4.10.3</plexus-archiver.version>
1818
</properties>
1919

2020
<dependencies>

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<properties>
1616
<docker.registry.organization>springcloud</docker.registry.organization>
17-
<plexus-archiver.version>4.10.2</plexus-archiver.version>
17+
<plexus-archiver.version>4.10.3</plexus-archiver.version>
1818
</properties>
1919

2020
<dependencies>

0 commit comments

Comments
 (0)