Skip to content

Commit 84128cd

Browse files
ryanjbaxterryanjbaxter
committed
Merge branch '3.0.x'
2 parents ad6a0fe + edca796 commit 84128cd

File tree

17 files changed

+98
-716
lines changed
  • spring-cloud-kubernetes-integration-tests
    • pom.xml
    • spring-cloud-kubernetes-fabric8-client-catalog-watcher
    • spring-cloud-kubernetes-fabric8-client-discovery
    • spring-cloud-kubernetes-fabric8-client-istio
    • spring-cloud-kubernetes-fabric8-client-reload
    • spring-cloud-kubernetes-k8s-client-catalog-watcher
    • spring-cloud-kubernetes-k8s-client-configuration-watcher
    • spring-cloud-kubernetes-k8s-client-discovery-server
    • spring-cloud-kubernetes-k8s-client-discovery
    • spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps
    • spring-cloud-kubernetes-k8s-client-loadbalancer
    • spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps
    • spring-cloud-kubernetes-k8s-client-reload

17 files changed

+98
-716
lines changed

‎spring-cloud-kubernetes-integration-tests/pom.xml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,63 @@
3131
<skip>true</skip>
3232
</configuration>
3333
</plugin>
34+
35+
<!-- build image in the 'package' phase, and ignore plain tests -->
36+
<!-- via maven-surefire-plugin::skipTests -->
37+
<plugin>
38+
<groupId>org.springframework.boot</groupId>
39+
<artifactId>spring-boot-maven-plugin</artifactId>
40+
<configuration>
41+
<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
42+
</configuration>
43+
<executions>
44+
<execution>
45+
<id>build-image</id>
46+
<configuration>
47+
<skip>${skip.build.image}</skip>
48+
</configuration>
49+
<phase>package</phase>
50+
<goals>
51+
<goal>build-image</goal>
52+
</goals>
53+
</execution>
54+
<execution>
55+
<id>repackage</id>
56+
<phase>package</phase>
57+
<goals>
58+
<goal>repackage</goal>
59+
</goals>
60+
</execution>
61+
</executions>
62+
</plugin>
63+
64+
<!-- ignore plain tests (in the 'test' phase), so that we could build the image first, see above -->
65+
<plugin>
66+
<groupId>org.apache.maven.plugins</groupId>
67+
<artifactId>maven-surefire-plugin</artifactId>
68+
<configuration>
69+
<skipTests>true</skipTests>
70+
</configuration>
71+
</plugin>
72+
73+
<!-- run tests in the 'integration-tests' phase, one that is after 'package' (where we build the image) -->
74+
<plugin>
75+
<groupId>org.apache.maven.plugins</groupId>
76+
<artifactId>maven-failsafe-plugin</artifactId>
77+
<executions>
78+
<execution>
79+
<goals>
80+
<goal>integration-test</goal>
81+
</goals>
82+
</execution>
83+
</executions>
84+
<configuration>
85+
<includes>
86+
<include>${testsToRun}</include>
87+
</includes>
88+
</configuration>
89+
</plugin>
90+
3491
</plugins>
3592

3693
</build>

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -42,64 +42,6 @@
4242
<filtering>true</filtering>
4343
</resource>
4444
</resources>
45-
46-
<plugins>
47-
<!-- build image in the 'package' phase, and ignore plain tests -->
48-
<!-- via maven-surefire-plugin::skipTests -->
49-
<plugin>
50-
<groupId>org.springframework.boot</groupId>
51-
<artifactId>spring-boot-maven-plugin</artifactId>
52-
<configuration>
53-
<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
54-
</configuration>
55-
<executions>
56-
<execution>
57-
<id>build-image</id>
58-
<configuration>
59-
<skip>${skip.build.image}</skip>
60-
</configuration>
61-
<phase>package</phase>
62-
<goals>
63-
<goal>build-image</goal>
64-
</goals>
65-
</execution>
66-
<execution>
67-
<id>repackage</id>
68-
<phase>package</phase>
69-
<goals>
70-
<goal>repackage</goal>
71-
</goals>
72-
</execution>
73-
</executions>
74-
</plugin>
75-
76-
<!-- ignore plain tests (in the 'test' phase), so that we could build the image first, see above -->
77-
<plugin>
78-
<groupId>org.apache.maven.plugins</groupId>
79-
<artifactId>maven-surefire-plugin</artifactId>
80-
<configuration>
81-
<skipTests>true</skipTests>
82-
</configuration>
83-
</plugin>
84-
85-
<!-- run tests in the 'integration-tests' phase, one that is after 'package' (where we build the image) -->
86-
<plugin>
87-
<groupId>org.apache.maven.plugins</groupId>
88-
<artifactId>maven-failsafe-plugin</artifactId>
89-
<executions>
90-
<execution>
91-
<goals>
92-
<goal>integration-test</goal>
93-
</goals>
94-
</execution>
95-
</executions>
96-
<configuration>
97-
<includes>
98-
<include>${testsToRun}</include>
99-
</includes>
100-
</configuration>
101-
</plugin>
102-
</plugins>
10345
</build>
10446

10547
</project>

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -50,64 +50,6 @@
5050
<filtering>true</filtering>
5151
</resource>
5252
</resources>
53-
54-
<plugins>
55-
<!-- build image in the 'package' phase, and ignore plain tests -->
56-
<!-- via maven-surefire-plugin::skipTests -->
57-
<plugin>
58-
<groupId>org.springframework.boot</groupId>
59-
<artifactId>spring-boot-maven-plugin</artifactId>
60-
<configuration>
61-
<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
62-
</configuration>
63-
<executions>
64-
<execution>
65-
<id>build-image</id>
66-
<configuration>
67-
<skip>${skip.build.image}</skip>
68-
</configuration>
69-
<phase>package</phase>
70-
<goals>
71-
<goal>build-image</goal>
72-
</goals>
73-
</execution>
74-
<execution>
75-
<id>repackage</id>
76-
<phase>package</phase>
77-
<goals>
78-
<goal>repackage</goal>
79-
</goals>
80-
</execution>
81-
</executions>
82-
</plugin>
83-
84-
<!-- ignore plain tests (in the 'test' phase), so that we could build the image first, see above -->
85-
<plugin>
86-
<groupId>org.apache.maven.plugins</groupId>
87-
<artifactId>maven-surefire-plugin</artifactId>
88-
<configuration>
89-
<skipTests>true</skipTests>
90-
</configuration>
91-
</plugin>
92-
93-
<!-- run tests in the 'integration-tests' phase, one that is after 'package' (where we build the image) -->
94-
<plugin>
95-
<groupId>org.apache.maven.plugins</groupId>
96-
<artifactId>maven-failsafe-plugin</artifactId>
97-
<executions>
98-
<execution>
99-
<goals>
100-
<goal>integration-test</goal>
101-
</goals>
102-
</execution>
103-
</executions>
104-
<configuration>
105-
<includes>
106-
<include>${testsToRun}</include>
107-
</includes>
108-
</configuration>
109-
</plugin>
110-
</plugins>
11153
</build>
11254

11355
</project>

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml‎

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -42,65 +42,6 @@
4242
<filtering>true</filtering>
4343
</resource>
4444
</resources>
45-
46-
<plugins>
47-
48-
<!-- build image in the 'package' phase, and ignore plain tests -->
49-
<!-- via maven-surefire-plugin::skipTests -->
50-
<plugin>
51-
<groupId>org.springframework.boot</groupId>
52-
<artifactId>spring-boot-maven-plugin</artifactId>
53-
<configuration>
54-
<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
55-
</configuration>
56-
<executions>
57-
<execution>
58-
<id>build-image</id>
59-
<configuration>
60-
<skip>${skip.build.image}</skip>
61-
</configuration>
62-
<phase>package</phase>
63-
<goals>
64-
<goal>build-image</goal>
65-
</goals>
66-
</execution>
67-
<execution>
68-
<id>repackage</id>
69-
<phase>package</phase>
70-
<goals>
71-
<goal>repackage</goal>
72-
</goals>
73-
</execution>
74-
</executions>
75-
</plugin>
76-
77-
<!-- ignore plain tests (in the 'test' phase), so that we could build the image first, see above -->
78-
<plugin>
79-
<groupId>org.apache.maven.plugins</groupId>
80-
<artifactId>maven-surefire-plugin</artifactId>
81-
<configuration>
82-
<skipTests>true</skipTests>
83-
</configuration>
84-
</plugin>
85-
86-
<!-- run tests in the 'integration-tests' phase, one that is after 'package' (where we build the image) -->
87-
<plugin>
88-
<groupId>org.apache.maven.plugins</groupId>
89-
<artifactId>maven-failsafe-plugin</artifactId>
90-
<executions>
91-
<execution>
92-
<goals>
93-
<goal>integration-test</goal>
94-
</goals>
95-
</execution>
96-
</executions>
97-
<configuration>
98-
<includes>
99-
<include>${testsToRun}</include>
100-
</includes>
101-
</configuration>
102-
</plugin>
103-
</plugins>
10445
</build>
10546

10647
</project>

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml‎

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -52,65 +52,6 @@
5252
<filtering>true</filtering>
5353
</resource>
5454
</resources>
55-
56-
<plugins>
57-
<!-- build image in the 'package' phase, and ignore plain tests -->
58-
<!-- via maven-surefire-plugin::skipTests -->
59-
<plugin>
60-
<groupId>org.springframework.boot</groupId>
61-
<artifactId>spring-boot-maven-plugin</artifactId>
62-
<configuration>
63-
<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
64-
</configuration>
65-
<executions>
66-
<execution>
67-
<id>build-image</id>
68-
<configuration>
69-
<skip>${skip.build.image}</skip>
70-
</configuration>
71-
<phase>package</phase>
72-
<goals>
73-
<goal>build-image</goal>
74-
</goals>
75-
</execution>
76-
<execution>
77-
<id>repackage</id>
78-
<phase>package</phase>
79-
<goals>
80-
<goal>repackage</goal>
81-
</goals>
82-
</execution>
83-
</executions>
84-
</plugin>
85-
86-
<!-- ignore plain tests (in the 'test' phase), so that we could build the image first, see above -->
87-
<plugin>
88-
<groupId>org.apache.maven.plugins</groupId>
89-
<artifactId>maven-surefire-plugin</artifactId>
90-
<configuration>
91-
<skipTests>true</skipTests>
92-
</configuration>
93-
</plugin>
94-
95-
<!-- run tests in the 'integration-tests' phase, one that is after 'package' (where we build the image) -->
96-
<plugin>
97-
<groupId>org.apache.maven.plugins</groupId>
98-
<artifactId>maven-failsafe-plugin</artifactId>
99-
<executions>
100-
<execution>
101-
<goals>
102-
<goal>integration-test</goal>
103-
</goals>
104-
</execution>
105-
</executions>
106-
<configuration>
107-
<includes>
108-
<include>${testsToRun}</include>
109-
</includes>
110-
</configuration>
111-
</plugin>
112-
</plugins>
113-
11455
</build>
11556

11657
</project>

‎spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -42,64 +42,6 @@
4242
<filtering>true</filtering>
4343
</resource>
4444
</resources>
45-
46-
<plugins>
47-
<!-- build image in the 'package' phase, and ignore plain tests -->
48-
<!-- via maven-surefire-plugin::skipTests -->
49-
<plugin>
50-
<groupId>org.springframework.boot</groupId>
51-
<artifactId>spring-boot-maven-plugin</artifactId>
52-
<configuration>
53-
<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>
54-
</configuration>
55-
<executions>
56-
<execution>
57-
<id>build-image</id>
58-
<configuration>
59-
<skip>${skip.build.image}</skip>
60-
</configuration>
61-
<phase>package</phase>
62-
<goals>
63-
<goal>build-image</goal>
64-
</goals>
65-
</execution>
66-
<execution>
67-
<id>repackage</id>
68-
<phase>package</phase>
69-
<goals>
70-
<goal>repackage</goal>
71-
</goals>
72-
</execution>
73-
</executions>
74-
</plugin>
75-
76-
<!-- ignore plain tests (in the 'test' phase), so that we could build the image first, see above -->
77-
<plugin>
78-
<groupId>org.apache.maven.plugins</groupId>
79-
<artifactId>maven-surefire-plugin</artifactId>
80-
<configuration>
81-
<skipTests>true</skipTests>
82-
</configuration>
83-
</plugin>
84-
85-
<!-- run tests in the 'integration-tests' phase, one that is after 'package' (where we build the image) -->
86-
<plugin>
87-
<groupId>org.apache.maven.plugins</groupId>
88-
<artifactId>maven-failsafe-plugin</artifactId>
89-
<executions>
90-
<execution>
91-
<goals>
92-
<goal>integration-test</goal>
93-
</goals>
94-
</execution>
95-
</executions>
96-
<configuration>
97-
<includes>
98-
<include>${testsToRun}</include>
99-
</includes>
100-
</configuration>
101-
</plugin>
102-
</plugins>
10345
</build>
10446

10547

0 commit comments

Comments
 (0)