Merge branch '3.2.x' into 3.3.x

Author: ryanjbaxter

scripts/deploy.sh

@@ -2,6 +2,7 @@
 set -e
 
 ./mvnw deploy -DskipTests -B -Pfast,deploy ${@}
+./mvnw clean package -pl :spring-cloud-kubernetes-configuration-watcher,:spring-cloud-kubernetes-discoveryserver,:spring-cloud-kubernetes-configserver -Pexecutable -DskipTests
 ./mvnw dockerfile:push -pl :spring-cloud-kubernetes-configuration-watcher -Pdockerpush ${@}
 ./mvnw dockerfile:push -pl :spring-cloud-kubernetes-discoveryserver -Pdockerpush ${@}
 ./mvnw dockerfile:push -pl :spring-cloud-kubernetes-configserver -Pdockerpush ${@}

spring-cloud-kubernetes-controllers/pom.xml

@@ -21,42 +21,67 @@
 
 	<build>
 		<plugins>
-
 			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<image>
-						<name>${env.IMAGE}</name>
-						<pullPolicy>IF_NOT_PRESENT</pullPolicy>
-					</image>
-					<goal>build-image</goal>
-				</configuration>
-				<executions>
-					<execution>
-						<id>build-image</id>
-						<phase>package</phase>
-						<goals>
-							<goal>build-image-no-fork</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>repackage</id>
-						<phase>package</phase>
-						<goals>
-							<goal>repackage</goal>
-						</goals>
-					</execution>
-					<execution>
-						<goals>
-							<goal>repackage</goal>
-						</goals>
-					</execution>
-				</executions>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
 			</plugin>
-
 		</plugins>
-
 	</build>
 
+	<profiles>
+		<profile>
+			<id>executable</id>
+			<activation>
+				<property>
+					<name>!skipExecutable</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+				<plugin>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-maven-plugin</artifactId>
+					<configuration>
+						<image>
+							<name>${env.IMAGE}</name>
+							<pullPolicy>IF_NOT_PRESENT</pullPolicy>
+						</image>
+						<goal>build-image</goal>
+					</configuration>
+					<executions>
+						<execution>
+							<id>build-image</id>
+							<phase>package</phase>
+							<goals>
+								<goal>build-image-no-fork</goal>
+							</goals>
+						</execution>
+						<execution>
+							<id>repackage</id>
+							<phase>package</phase>
+							<goals>
+								<goal>repackage</goal>
+							</goals>
+							<configuration>
+								<classifier>exec</classifier>
+								<!-- DO NOT attach the executable JAR - this prevents deployment -->
+								<attach>false</attach>
+							</configuration>
+						</execution>
+						<execution>
+							<goals>
+								<goal>repackage</goal>
+							</goals>
+							<configuration>
+								<classifier>exec</classifier>
+								<!-- DO NOT attach the executable JAR - this prevents deployment -->
+								<attach>false</attach>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+			</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>