From 0def8c8fff7446721832648345b93fe96299faa2 Mon Sep 17 00:00:00 2001
From: Min Zhu <zhumin@google.com>
Date: Mon, 15 May 2023 17:38:22 -0400
Subject: [PATCH] chore: cleanup and remove unsed pom entries related to
 firestore native sample. (#1851)

This pr cleans up setups in pom for `spring-cloud-gcp-data-firestore-sample` related to native support (configured with outdated `org.springframework.experimental:spring-native-configuration`). It reverts what's added for the sample in https://github.com/GoogleCloudPlatform/spring-cloud-gcp/pull/508.
The relevant native support module has stopped working for a while and was deleted in #1287. So it should be safe to also remove these setups in sample.
---
 spring-cloud-gcp-samples/pom.xml              |  15 --
 .../pom.xml                                   | 147 ------------------
 2 files changed, 162 deletions(-)

diff --git a/spring-cloud-gcp-samples/pom.xml b/spring-cloud-gcp-samples/pom.xml
index 092b7011ab..600c9ea56d 100644
--- a/spring-cloud-gcp-samples/pom.xml
+++ b/spring-cloud-gcp-samples/pom.xml
@@ -20,10 +20,6 @@
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
 
-		<!-- Dependency versions -->
-		<google-cloud-graalvm-support.version>0.7.0</google-cloud-graalvm-support.version>
-		<testcontainers.version>1.18.0</testcontainers.version>
-
 		<!-- Checkstyle versions. Keep in sync with ../pom.xml -->
 		<maven-checkstyle-plugin.version>3.2.2</maven-checkstyle-plugin.version>
 		<checkstyle-rules.version>9.3</checkstyle-rules.version>
@@ -107,17 +103,6 @@
 		</profile>
 	</profiles>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.testcontainers</groupId>
-				<artifactId>testcontainers-bom</artifactId>
-				<version>${testcontainers.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
 	<dependencies>
 		<!-- Needed for running JUnit 4 tests when depending on Spring Boot Ilford. -->
 		<dependency>
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-data-firestore-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-data-firestore-sample/pom.xml
index 1bbf8de696..d3a2bb4a0b 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-data-firestore-sample/pom.xml
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-data-firestore-sample/pom.xml
@@ -13,10 +13,6 @@
   <name>Spring Framework on Google Cloud Code Sample - Spring Data Firestore</name>
   <artifactId>spring-cloud-gcp-data-firestore-sample</artifactId>
 
-  <properties>
-    <integration-test.tags.exclude>native</integration-test.tags.exclude>
-  </properties>
-
   <!-- The Spring Framework on Google Cloud BOM will manage spring-cloud-gcp version numbers for you. -->
   <dependencyManagement>
     <dependencies>
@@ -35,10 +31,6 @@
       <groupId>com.google.cloud</groupId>
       <artifactId>spring-cloud-gcp-starter-data-firestore</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.cloud</groupId>
-      <artifactId>spring-cloud-gcp-autoconfigure</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -56,31 +48,12 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <!-- JUnit5 is required for Test Containers. -->
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>gcloud</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
@@ -98,124 +71,4 @@
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <id>native</id>
-      <activation>
-          <property>
-            <name>it.native</name>
-          </property>
-      </activation>
-      <properties>
-        <!-- Include only native tests, exclude all others -->
-        <integration-test.tags.include>native</integration-test.tags.include>
-        <integration-test.tags.exclude/>
-
-        <!-- Native build args -->
-        <native.build.args>
-          --enable-url-protocols=http,https
-          --no-fallback
-          --no-server
-        </native.build.args>
-
-        <!-- Paketo buildpacks used for building native image -->
-        <builder>paketobuildpacks/builder:tiny</builder>
-      </properties>
-
-      <dependencies>
-        <dependency>
-          <groupId>org.springframework.experimental</groupId>
-          <artifactId>spring-native</artifactId>
-          <version>${spring-native.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>com.google.cloud</groupId>
-          <artifactId>google-cloud-graalvm-support</artifactId>
-          <version>${google-cloud-graalvm-support.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-context-indexer</artifactId>
-          <optional>true</optional>
-        </dependency>
-      </dependencies>
-
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.springframework.experimental</groupId>
-            <artifactId>spring-aot-maven-plugin</artifactId>
-            <version>${spring-native.version}</version>
-            <dependencies>
-              <dependency>
-                <groupId>com.google.cloud</groupId>
-                <artifactId>spring-cloud-gcp-native-support</artifactId>
-                <version>${project.version}</version>
-              </dependency>
-            </dependencies>
-            <executions>
-              <execution>
-                <id>test-generate</id>
-                <goals>
-                  <goal>test-generate</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>generate</id>
-                <goals>
-                  <goal>generate</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-maven-plugin</artifactId>
-            <configuration>
-              <classifier>${classifier}</classifier>
-              <image>
-                <builder>${builder}</builder>
-                <name>${project.artifactId}:test</name>
-                <env>
-                  <BP_NATIVE_IMAGE>true</BP_NATIVE_IMAGE>
-                  <BP_NATIVE_IMAGE_BUILD_ARGUMENTS>${native.build.args}</BP_NATIVE_IMAGE_BUILD_ARGUMENTS>
-                </env>
-                <pullPolicy>IF_NOT_PRESENT</pullPolicy>
-              </image>
-            </configuration>
-            <executions>
-              <execution>
-                <id>build-docker-image-before-integration-tests</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>build-image</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-      <repositories>
-        <repository>
-          <id>spring-releases</id>
-          <name>Spring Releases</name>
-          <url>https://repo.spring.io/release</url>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>spring-releases</id>
-          <name>Spring Releases</name>
-          <url>https://repo.spring.io/release</url>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-
-  </profiles>
 </project>