boot24 update

monitoring-samples/task-apps/task-demo-metrics-wavefront/Dockerfile

@@ -0,0 +1,5 @@
+FROM springcloud/baseimage:1.0.0
+ARG JAR_FILE=target/*.jar
+COPY ${JAR_FILE} app.jar
+VOLUME ["/tmp"]
+ENTRYPOINT ["java","-jar","/app.jar"]

monitoring-samples/task-apps/task-demo-metrics-wavefront/README.md

@@ -96,8 +96,25 @@ Follow the [Task Monitoring](https://dataflow.spring.io/docs/feature-guides/batc
 
 Build and publish docker image
 
+## Fabric8 - Maven plugin
 ```
 ./mvnw clean install docker:build
 ./mvnw docker:push
 
 ```
+
+## Jib - Maven plugin
+```
+./mvnw clean install jib:build
+```
+or for test purposes build a local image:
+```
+./mvnw clean install jib:dockerBuild
+```
+
+## Dockerfile
+
+```
+./mvnw clean install
+docker build -t springcloud/task-demo-metrics-wavefront:dockerfile .
+```

monitoring-samples/task-apps/task-demo-metrics-wavefront/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.1.RELEASE</version> 
+		<version>2.4.3</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -17,7 +17,8 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Hoxton.SR6</spring-cloud.version>
+		<spring-cloud.version>2020.0.0</spring-cloud.version>
+		<fabric8.generator.from>registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:latest</fabric8.generator.from>
 	</properties>
 
 	<dependencies>
@@ -70,15 +71,6 @@
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-registry-wavefront</artifactId>
 		</dependency>
-
-		<!-- Override the WF SDK dependency coming with micrometer to resolve
-		 the https://github.com/wavefrontHQ/wavefront-sdk-java/pull/152 makes it
-		 to Micrometer (likely 1.5.3) and Boot-->
-		<dependency>
-			<groupId>com.wavefront</groupId>
-			<artifactId>wavefront-sdk-java</artifactId>
-			<version>2.6.0</version>
-		</dependency>
 	</dependencies>
 
 	<dependencyManagement>
@@ -99,6 +91,20 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>fabric8-maven-plugin</artifactId>
+				<version>4.4.1</version>
+				<configuration>
+					<namespace>test-ns</namespace>
+					<images>
+						<image>
+							<name>task-demo-metrics-wavefront:s2i</name>
+						</image>
+					</images>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
@@ -127,6 +133,31 @@
 					</images>
 				</configuration>
 			</plugin>
+
+			<plugin>
+				<groupId>com.google.cloud.tools</groupId>
+				<artifactId>jib-maven-plugin</artifactId>
+				<version>2.8.0</version>
+				<configuration>
+					<from>
+						<image>springcloud/baseimage:1.0.0</image>
+					</from>
+					<to>
+						<image>springcloud/${project.artifactId}</image>
+						<tags>
+							<tag>jib-${project.version}</tag>
+						</tags>
+					</to>
+					<container>
+						<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
+						<format>Docker</format>
+						<labels>
+							<application.name>${project.artifactId}</application.name>
+							<application.version>${project.version}</application.version>
+						</labels>
+					</container>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

monitoring-samples/task-apps/task-demo-metrics-wavefront/src/main/java/com/example/task/taskdemometrics/TaskDemoMetricsApplication.java

@@ -17,6 +17,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.task.configuration.EnableTask;
 import org.springframework.context.annotation.Bean;
+import org.springframework.util.StringUtils;
 
 @SpringBootApplication
 @EnableTask
@@ -32,6 +33,7 @@ public class TaskDemoMetricsApplication {
 	private Random random = new Random();
 
 	public static void main(String[] args) {
+		System.out.println("ARGS: " + StringUtils.arrayToCommaDelimitedString(args));
 		SpringApplication.run(TaskDemoMetricsApplication.class, args);
 	}