Skip to content

Commit 31f299a

Browse files
ryanjbaxterryanjbaxter
committed
Merge branch '3.3.x'
2 parents 76e852b + c30e916 commit 31f299a

File tree

2 files changed

+62
-36
lines changed

2 files changed

+62
-36
lines changed

‎scripts/deploy.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
set -e
33

44
./mvnw deploy -DskipTests -B -Pfast,deploy ${@}
5+
./mvnw clean package -pl :spring-cloud-kubernetes-configuration-watcher,:spring-cloud-kubernetes-discoveryserver,:spring-cloud-kubernetes-configserver -Pexecutable -DskipTests
56
./mvnw dockerfile:push -pl :spring-cloud-kubernetes-configuration-watcher -Pdockerpush ${@}
67
./mvnw dockerfile:push -pl :spring-cloud-kubernetes-discoveryserver -Pdockerpush ${@}
78
./mvnw dockerfile:push -pl :spring-cloud-kubernetes-configserver -Pdockerpush ${@}

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

Lines changed: 61 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -21,45 +21,70 @@
2121

2222
<build>
2323
<plugins>
24-
2524
<plugin>
26-
<groupId>org.springframework.boot</groupId>
27-
<artifactId>spring-boot-maven-plugin</artifactId>
28-
<configuration>
29-
<image>
30-
<env>
31-
<BP_SPRING_CLOUD_BINDINGS_DISABLED>true</BP_SPRING_CLOUD_BINDINGS_DISABLED>
32-
</env>
33-
<name>${env.IMAGE}</name>
34-
<pullPolicy>IF_NOT_PRESENT</pullPolicy>
35-
</image>
36-
<goal>build-image</goal>
37-
</configuration>
38-
<executions>
39-
<execution>
40-
<id>build-image</id>
41-
<phase>package</phase>
42-
<goals>
43-
<goal>build-image-no-fork</goal>
44-
</goals>
45-
</execution>
46-
<execution>
47-
<id>repackage</id>
48-
<phase>package</phase>
49-
<goals>
50-
<goal>repackage</goal>
51-
</goals>
52-
</execution>
53-
<execution>
54-
<goals>
55-
<goal>repackage</goal>
56-
</goals>
57-
</execution>
58-
</executions>
25+
<groupId>org.apache.maven.plugins</groupId>
26+
<artifactId>maven-jar-plugin</artifactId>
5927
</plugin>
60-
6128
</plugins>
62-
6329
</build>
6430

31+
<profiles>
32+
<profile>
33+
<id>executable</id>
34+
<activation>
35+
<property>
36+
<name>!skipExecutable</name>
37+
</property>
38+
</activation>
39+
<build>
40+
<plugins>
41+
<plugin>
42+
<groupId>org.springframework.boot</groupId>
43+
<artifactId>spring-boot-maven-plugin</artifactId>
44+
<configuration>
45+
<image>
46+
<env>
47+
<BP_SPRING_CLOUD_BINDINGS_DISABLED>true</BP_SPRING_CLOUD_BINDINGS_DISABLED>
48+
</env>
49+
<name>${env.IMAGE}</name>
50+
<pullPolicy>IF_NOT_PRESENT</pullPolicy>
51+
</image>
52+
<goal>build-image</goal>
53+
</configuration>
54+
<executions>
55+
<execution>
56+
<id>build-image</id>
57+
<phase>package</phase>
58+
<goals>
59+
<goal>build-image-no-fork</goal>
60+
</goals>
61+
</execution>
62+
<execution>
63+
<id>repackage</id>
64+
<phase>package</phase>
65+
<goals>
66+
<goal>repackage</goal>
67+
</goals>
68+
<configuration>
69+
<classifier>exec</classifier>
70+
<!-- DO NOT attach the executable JAR - this prevents deployment -->
71+
<attach>false</attach>
72+
</configuration>
73+
</execution>
74+
<execution>
75+
<goals>
76+
<goal>repackage</goal>
77+
</goals>
78+
<configuration>
79+
<classifier>exec</classifier>
80+
<!-- DO NOT attach the executable JAR - this prevents deployment -->
81+
<attach>false</attach>
82+
</configuration>
83+
</execution>
84+
</executions>
85+
</plugin>
86+
</plugins>
87+
</build>
88+
</profile>
89+
</profiles>
6590
</project>

0 commit comments

Comments
 (0)