Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Ryan Baxter
2025-01-31 11:04:32 -05:00
3 changed files with 15 additions and 50 deletions

View File

@@ -11,6 +11,11 @@
<artifactId>spring-cloud-kubernetes-fabric8-client-catalog-watcher</artifactId>
<properties>
<spring-boot.repackage.skip>true</spring-boot.repackage.skip>
<spring-boot.build-image.skip>true</spring-boot.build-image.skip>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
@@ -42,22 +47,5 @@
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<id>build-image</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -11,6 +11,11 @@
<artifactId>spring-cloud-kubernetes-fabric8-client-discovery</artifactId>
<properties>
<spring-boot.repackage.skip>true</spring-boot.repackage.skip>
<spring-boot.build-image.skip>true</spring-boot.build-image.skip>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
@@ -50,21 +55,6 @@
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<id>build-image</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -11,6 +11,11 @@
<artifactId>spring-cloud-kubernetes-k8s-client-catalog-watcher</artifactId>
<properties>
<spring-boot.repackage.skip>true</spring-boot.repackage.skip>
<spring-boot.build-image.skip>true</spring-boot.build-image.skip>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
@@ -42,23 +47,5 @@
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<id>build-image</id>
<configuration>
<skip>true</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>