Skip to content

Commit

Permalink
Merge branch '3.0.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryanjbaxter
ryanjbaxter committed Sep 6, 2023
2 parents a72b5fd + d8aca5b commit 35c3e06
Show file tree
Hide file tree
Showing 12 changed files with 0 additions and 305 deletions.
42 changes: 0 additions & 42 deletions spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,49 +105,7 @@
</execution>
</executions>
</plugin>

</plugins>

</build>

<profiles>
<profile>
<id>skaffold</id>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<image>
<name>${env.IMAGE}</name>
</image>
<goal>build-image</goal>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>build-image</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>imagename</id>
<activation>
<property>
<name>!env.IMAGE</name>
</property>
</activation>
<properties>
<env.IMAGE>springcloud/${project.artifactId}:${project.version}</env.IMAGE>
</properties>
</profile>

</profiles>

</project>
14 changes: 0 additions & 14 deletions ...ng-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,4 @@
</plugins>
</build>

<profiles>
<profile>
<id>imagename</id>
<activation>
<property>
<name>!env.IMAGE</name>
</property>
</activation>
<properties>
<env.IMAGE>springcloud/${project.artifactId}:${project.version}</env.IMAGE>
</properties>
</profile>
</profiles>

</project>
40 changes: 0 additions & 40 deletions ...cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,46 +105,6 @@
</configuration>
</plugin>
</plugins>

</build>

<profiles>
<profile>
<id>skaffold</id>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<image>
<name>${env.IMAGE}</name>
</image>
<goal>build-image</goal>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>build-image</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>imagename</id>
<activation>
<property>
<name>!env.IMAGE</name>
</property>
</activation>
<properties>
<env.IMAGE>springcloud/${project.artifactId}:${project.version}</env.IMAGE>
</properties>
</profile>
</profiles>

</project>
41 changes: 0 additions & 41 deletions ...etes-integration-tests/spring-cloud-kubernetes-client-reactive-discoveryclient-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,47 +101,6 @@
</configuration>
</plugin>
</plugins>

</build>

<profiles>
<profile>
<id>skaffold</id>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<image>
<name>${env.IMAGE}</name>
</image>
<goal>build-image</goal>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>build-image</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>imagename</id>
<activation>
<property>
<name>!env.IMAGE</name>
</property>
</activation>
<properties>
<env.IMAGE>springcloud/${project.artifactId}:${project.version}</env.IMAGE>
</properties>
</profile>
</profiles>


</project>
40 changes: 0 additions & 40 deletions spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,46 +100,6 @@
</configuration>
</plugin>
</plugins>

</build>

<profiles>
<profile>
<id>skaffold</id>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<image>
<name>${env.IMAGE}</name>
</image>
<goal>build-image</goal>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>build-image</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>imagename</id>
<activation>
<property>
<name>!env.IMAGE</name>
</property>
</activation>
<properties>
<env.IMAGE>springcloud/${project.artifactId}:${project.version}</env.IMAGE>
</properties>
</profile>
</profiles>

</project>
40 changes: 0 additions & 40 deletions spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,46 +106,6 @@
</configuration>
</plugin>
</plugins>

</build>

<profiles>
<profile>
<id>skaffold</id>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<image>
<name>${env.IMAGE}</name>
</image>
<goal>build-image</goal>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>build-image</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>imagename</id>
<activation>
<property>
<name>!env.IMAGE</name>
</property>
</activation>
<properties>
<env.IMAGE>springcloud/${project.artifactId}:${project.version}</env.IMAGE>
</properties>
</profile>
</profiles>

</project>
15 changes: 0 additions & 15 deletions ...oud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,21 +100,6 @@
</configuration>
</plugin>
</plugins>

</build>

<profiles>
<profile>
<id>imagename</id>
<activation>
<property>
<name>!env.IMAGE</name>
</property>
</activation>
<properties>
<env.IMAGE>springcloud/${project.artifactId}:${project.version}</env.IMAGE>
</properties>
</profile>
</profiles>

</project>
14 changes: 0 additions & 14 deletions ...integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,4 @@
</plugins>
</build>

<profiles>
<profile>
<id>imagename</id>
<activation>
<property>
<name>!env.IMAGE</name>
</property>
</activation>
<properties>
<env.IMAGE>springcloud/${project.artifactId}:${project.version}</env.IMAGE>
</properties>
</profile>
</profiles>

</project>
14 changes: 0 additions & 14 deletions ...oud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,18 +102,4 @@
</plugins>
</build>

<profiles>
<profile>
<id>imagename</id>
<activation>
<property>
<name>!env.IMAGE</name>
</property>
</activation>
<properties>
<env.IMAGE>springcloud/${project.artifactId}:${project.version}</env.IMAGE>
</properties>
</profile>
</profiles>

</project>
15 changes: 0 additions & 15 deletions ...-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,21 +100,6 @@
</configuration>
</plugin>
</plugins>

</build>

<profiles>
<profile>
<id>imagename</id>
<activation>
<property>
<name>!env.IMAGE</name>
</property>
</activation>
<properties>
<env.IMAGE>springcloud/${project.artifactId}:${project.version}</env.IMAGE>
</properties>
</profile>
</profiles>

</project>
15 changes: 0 additions & 15 deletions ...d-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,21 +100,6 @@
</configuration>
</plugin>
</plugins>

</build>

<profiles>
<profile>
<id>imagename</id>
<activation>
<property>
<name>!env.IMAGE</name>
</property>
</activation>
<properties>
<env.IMAGE>springcloud/${project.artifactId}:${project.version}</env.IMAGE>
</properties>
</profile>
</profiles>

</project>
15 changes: 0 additions & 15 deletions spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,21 +100,6 @@
</configuration>
</plugin>
</plugins>

</build>

<profiles>
<profile>
<id>imagename</id>
<activation>
<property>
<name>!env.IMAGE</name>
</property>
</activation>
<properties>
<env.IMAGE>springcloud/${project.artifactId}:${project.version}</env.IMAGE>
</properties>
</profile>
</profiles>

</project>

0 comments on commit 35c3e06

Please sign in to comment.