From 4edf8c69e8d525548f353ebc68938ad41ce33191 Mon Sep 17 00:00:00 2001
From: yilims <brightmonkeyli@163.com>
Date: Mon, 5 Feb 2024 16:32:58 +0800
Subject: [PATCH 1/3] fix test source code for java

---
 .../source_built_using_buildpack_java/pom.xml | 30 +++++--------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/pom.xml b/src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/pom.xml
index 1554f446d93..c3b57156eeb 100644
--- a/src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/pom.xml
+++ b/src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/pom.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.11</version>
-		<relativePath /> <!-- lookup parent from repository -->
+		<version>3.2.2</version>
+		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-	<groupId>io.paketo</groupId>
+	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
-		<java.version>8</java.version>
+		<java.version>17</java.version>
 	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -30,17 +30,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.junit.vintage</groupId>
-					<artifactId>junit-vintage-engine</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-test</artifactId>
-			<scope>test</scope>
 		</dependency>
 	</dependencies>
 
@@ -49,11 +38,6 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<layers>
-						<enabled>true</enabled>
-					</layers>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>

From 6ebb805166e16caa229e52dbef5d39bea26b5072 Mon Sep 17 00:00:00 2001
From: yilims <brightmonkeyli@163.com>
Date: Mon, 5 Feb 2024 17:20:23 +0800
Subject: [PATCH 2/3] clean up java test code

---
 .../example}/demo/DemoApplication.java              |  2 +-
 .../java/io/paketo/demo/DemoApplicationTests.java   | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 rename src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/src/main/java/{io/paketo => com/example}/demo/DemoApplication.java (95%)
 delete mode 100644 src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/src/test/java/io/paketo/demo/DemoApplicationTests.java

diff --git a/src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/src/main/java/io/paketo/demo/DemoApplication.java b/src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/src/main/java/com/example/demo/DemoApplication.java
similarity index 95%
rename from src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/src/main/java/io/paketo/demo/DemoApplication.java
rename to src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/src/main/java/com/example/demo/DemoApplication.java
index 3318048a011..302ac77ce31 100644
--- a/src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/src/main/java/io/paketo/demo/DemoApplication.java
+++ b/src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/src/main/java/com/example/demo/DemoApplication.java
@@ -1,4 +1,4 @@
-package io.paketo.demo;
+package com.example.demo;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/src/test/java/io/paketo/demo/DemoApplicationTests.java b/src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/src/test/java/io/paketo/demo/DemoApplicationTests.java
deleted file mode 100644
index 83a5baf91ac..00000000000
--- a/src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/src/test/java/io/paketo/demo/DemoApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.paketo.demo;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class DemoApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}

From e4d0b00046ad910778b8ce706d341c5353c887fc Mon Sep 17 00:00:00 2001
From: yilims <brightmonkeyli@163.com>
Date: Mon, 26 Feb 2024 15:29:51 +0800
Subject: [PATCH 3/3] upgrade spring boot version to fix CVE issue in test case

---
 .../tests/latest/data/source_built_using_buildpack_java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/pom.xml b/src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/pom.xml
index c3b57156eeb..de653ac2a08 100644
--- a/src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/pom.xml
+++ b/src/containerapp/azext_containerapp/tests/latest/data/source_built_using_buildpack_java/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.2.2</version>
+		<version>3.2.3</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>