Skip to content

Commit e298bb6

Browse files
wind57wind57
authored
Fix build failure source plugin (#1677)
1 parent f8b18ae commit e298bb6

File tree

6 files changed

+40
-104
lines changed
  • spring-cloud-kubernetes-controllers
    • pom.xml
    • spring-cloud-kubernetes-configserver
    • spring-cloud-kubernetes-configuration-watcher
    • spring-cloud-kubernetes-discoveryserver
  • spring-cloud-kubernetes-integration-tests

6 files changed

+40
-104
lines changed

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,41 @@
1818
<module>spring-cloud-kubernetes-configserver</module>
1919
</modules>
2020

21+
<build>
22+
<plugins>
23+
24+
<plugin>
25+
<groupId>org.springframework.boot</groupId>
26+
<artifactId>spring-boot-maven-plugin</artifactId>
27+
<configuration>
28+
<image>
29+
<name>${env.IMAGE}</name>
30+
</image>
31+
<goal>build-image</goal>
32+
</configuration>
33+
<executions>
34+
<execution>
35+
<id>build-image</id>
36+
<configuration>
37+
<skip>${skip.build.image}</skip>
38+
</configuration>
39+
<phase>package</phase>
40+
<goals>
41+
<goal>build-image-no-fork</goal>
42+
</goals>
43+
</execution>
44+
<execution>
45+
<id>repackage</id>
46+
<phase>package</phase>
47+
<goals>
48+
<goal>repackage</goal>
49+
</goals>
50+
</execution>
51+
</executions>
52+
</plugin>
53+
54+
</plugins>
55+
56+
</build>
57+
2158
</project>

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

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -59,40 +59,6 @@
5959
</dependency>
6060
</dependencies>
6161

62-
<build>
63-
<plugins>
64-
<plugin>
65-
<groupId>org.springframework.boot</groupId>
66-
<artifactId>spring-boot-maven-plugin</artifactId>
67-
<configuration>
68-
<image>
69-
<name>${env.IMAGE}</name>
70-
</image>
71-
<goal>build-image</goal>
72-
</configuration>
73-
<executions>
74-
<execution>
75-
<id>build-image</id>
76-
<configuration>
77-
<skip>${skip.build.image}</skip>
78-
</configuration>
79-
<phase>package</phase>
80-
<goals>
81-
<goal>build-image</goal>
82-
</goals>
83-
</execution>
84-
<execution>
85-
<id>repackage</id>
86-
<phase>package</phase>
87-
<goals>
88-
<goal>repackage</goal>
89-
</goals>
90-
</execution>
91-
</executions>
92-
</plugin>
93-
</plugins>
94-
</build>
95-
9662
<profiles>
9763
<profile>
9864
<id>dockerpush</id>

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

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -78,40 +78,6 @@
7878
</dependency>
7979
</dependencies>
8080

81-
<build>
82-
<plugins>
83-
<plugin>
84-
<groupId>org.springframework.boot</groupId>
85-
<artifactId>spring-boot-maven-plugin</artifactId>
86-
<configuration>
87-
<image>
88-
<name>${env.IMAGE}</name>
89-
</image>
90-
<goal>build-image</goal>
91-
</configuration>
92-
<executions>
93-
<execution>
94-
<id>build-image</id>
95-
<configuration>
96-
<skip>${skip.build.image}</skip>
97-
</configuration>
98-
<phase>package</phase>
99-
<goals>
100-
<goal>build-image</goal>
101-
</goals>
102-
</execution>
103-
<execution>
104-
<id>repackage</id>
105-
<phase>package</phase>
106-
<goals>
107-
<goal>repackage</goal>
108-
</goals>
109-
</execution>
110-
</executions>
111-
</plugin>
112-
</plugins>
113-
</build>
114-
11581
<profiles>
11682
<profile>
11783
<id>dockerpush</id>

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

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -51,40 +51,6 @@
5151
</dependency>
5252
</dependencies>
5353

54-
<build>
55-
<plugins>
56-
<plugin>
57-
<groupId>org.springframework.boot</groupId>
58-
<artifactId>spring-boot-maven-plugin</artifactId>
59-
<configuration>
60-
<image>
61-
<name>${env.IMAGE}</name>
62-
</image>
63-
<goal>build-image</goal>
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-
</plugins>
86-
</build>
87-
8854
<profiles>
8955
<profile>
9056
<id>dockerpush</id>

‎spring-cloud-kubernetes-integration-tests/README‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ you must name the image with the same name as the module. For example:
1818
</configuration>
1919
<phase>package</phase>
2020
<goals>
21-
<goal>build-image</goal>
21+
<goal>build-image-no-fork</goal>
2222
</goals>
2323
</execution>
2424
<execution>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
<build>
2525
<plugins>
26+
2627
<plugin>
2728
<groupId>org.apache.maven.plugins</groupId>
2829
<artifactId>maven-deploy-plugin</artifactId>
@@ -48,7 +49,7 @@
4849
</configuration>
4950
<phase>package</phase>
5051
<goals>
51-
<goal>build-image</goal>
52+
<goal>build-image-no-fork</goal>
5253
</goals>
5354
</execution>
5455
<execution>

0 commit comments

Comments
 (0)