From 743da56b2c86a8000616cc656df77e5b95bd0464 Mon Sep 17 00:00:00 2001
From: "Kim, Joo Hyuk" <beanskobe@gmail.com>
Date: Wed, 11 Dec 2024 10:09:40 +0900
Subject: [PATCH] Merge `test-jdk17` tests into main post [databind#4820]
 (#694)

---
 pom.xml                                       | 54 -------------------
 .../records}/XmlWrapperRecord517Test.java     |  2 +-
 .../xml/jdk17/Java17CollectionsTest.java      |  0
 3 files changed, 1 insertion(+), 55 deletions(-)
 rename src/{test-jdk17/java/tools/jackson/dataformat/xml/records/failing => test/java/tools/jackson/dataformat/xml/failing/records}/XmlWrapperRecord517Test.java (96%)
 rename src/{test-jdk17 => test}/java/tools/jackson/dataformat/xml/jdk17/Java17CollectionsTest.java (100%)

diff --git a/pom.xml b/pom.xml
index 3f7e19b4..75f4ed65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,60 +145,6 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
     </repository>
   </repositories>
 
-  <profiles>
-    <profile>
-      <!-- And different set up for JDK 17 -->
-      <id>java17</id>
-      <activation>
-        <jdk>17</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>add-test-source</id>
-                <phase>generate-test-sources</phase>
-                <goals>
-                  <goal>add-test-source</goal>
-                </goals>
-                <configuration>
-                  <sources>
-                    <source>src/test-jdk17/java</source>
-                  </sources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <inherited>true</inherited>
-            <configuration>
-              <!-- Enable Java 17 for all sources so that Intellij picks the right language level -->
-              <source>17</source>
-              <release>17</release>
-              <compilerArgs>
-                <arg>-parameters</arg>
-                <arg>--add-opens=java.base/java.lang=ALL-UNNAMED</arg>
-                <arg>--add-opens=java.base/java.util=ALL-UNNAMED</arg>
-              </compilerArgs>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED</argLine>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
   <build>
     <plugins>
       <plugin>
diff --git a/src/test-jdk17/java/tools/jackson/dataformat/xml/records/failing/XmlWrapperRecord517Test.java b/src/test/java/tools/jackson/dataformat/xml/failing/records/XmlWrapperRecord517Test.java
similarity index 96%
rename from src/test-jdk17/java/tools/jackson/dataformat/xml/records/failing/XmlWrapperRecord517Test.java
rename to src/test/java/tools/jackson/dataformat/xml/failing/records/XmlWrapperRecord517Test.java
index 85a2594e..5da5b6fb 100644
--- a/src/test-jdk17/java/tools/jackson/dataformat/xml/records/failing/XmlWrapperRecord517Test.java
+++ b/src/test/java/tools/jackson/dataformat/xml/failing/records/XmlWrapperRecord517Test.java
@@ -1,4 +1,4 @@
-package tools.jackson.dataformat.xml.records.failing;
+package tools.jackson.dataformat.xml.failing.records;
 
 import java.util.List;
 
diff --git a/src/test-jdk17/java/tools/jackson/dataformat/xml/jdk17/Java17CollectionsTest.java b/src/test/java/tools/jackson/dataformat/xml/jdk17/Java17CollectionsTest.java
similarity index 100%
rename from src/test-jdk17/java/tools/jackson/dataformat/xml/jdk17/Java17CollectionsTest.java
rename to src/test/java/tools/jackson/dataformat/xml/jdk17/Java17CollectionsTest.java