From 47fb50ae058aae270462646288abd9edf17abba8 Mon Sep 17 00:00:00 2001
From: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Date: Thu, 21 Dec 2023 08:47:45 +0100
Subject: [PATCH 1/3] 4.x: Enable
 microprofile/tests/tck/tck-config/src/test/tck-suite.xml tests #8173

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
---
 microprofile/tests/server/pom.xml             | 21 +++++++++++++++++++
 .../tck/tck-config/src/test/tck-suite.xml     |  6 ------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/microprofile/tests/server/pom.xml b/microprofile/tests/server/pom.xml
index c2db9b4259f..8b0a771cd50 100644
--- a/microprofile/tests/server/pom.xml
+++ b/microprofile/tests/server/pom.xml
@@ -71,4 +71,25 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <!--
+                Override plugin to be executed every test in a new JVM.
+                This is required because there are some system property set.
+             -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <forkCount>1</forkCount>
+                    <reuseForks>false</reuseForks>
+                    <useModulePath>false</useModulePath>
+                    <trimStackTrace>false</trimStackTrace>
+                    <!-- DO NOT override argLine instead use surefire.argLine -->
+                    <argLine>${surefire.argLine} ${surefire.coverage.argline}</argLine>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/microprofile/tests/tck/tck-config/src/test/tck-suite.xml b/microprofile/tests/tck/tck-config/src/test/tck-suite.xml
index c0b3744854f..4e6bd55bd46 100644
--- a/microprofile/tests/tck/tck-config/src/test/tck-suite.xml
+++ b/microprofile/tests/tck/tck-config/src/test/tck-suite.xml
@@ -22,12 +22,6 @@
     <test name="microprofile-config TCK">
         <packages>
             <package name="org.eclipse.microprofile.config.tck.*">
-                <!-- 
-                    Currently failing because requires this PR:
-                    https://github.com/eclipse/microprofile-config/pull/743
-                    Ignoring meanwhile microprofile-config 3.1 is not released
-                -->
-                <exclude name="org.eclipse.microprofile.config.tck.broken"></exclude>
             </package>
         </packages>
     </test>

From e619c9a460d55808811184ad9fc2bef0e37378a3 Mon Sep 17 00:00:00 2001
From: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Date: Fri, 19 Jan 2024 06:07:10 +0100
Subject: [PATCH 2/3] Review comments 1

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
---
 microprofile/tests/tck/tck-config/src/test/tck-suite.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microprofile/tests/tck/tck-config/src/test/tck-suite.xml b/microprofile/tests/tck/tck-config/src/test/tck-suite.xml
index 4e6bd55bd46..16a0d9b259a 100644
--- a/microprofile/tests/tck/tck-config/src/test/tck-suite.xml
+++ b/microprofile/tests/tck/tck-config/src/test/tck-suite.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 <!--
 
-    Copyright (c) 2018, 2023 Oracle and/or its affiliates.
+    Copyright (c) 2018, 2024 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

From b1b24907cc563f21cfca285b4ac7552537694617 Mon Sep 17 00:00:00 2001
From: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Date: Mon, 24 Feb 2025 13:38:36 +0100
Subject: [PATCH 3/3] Review comments and copyright

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
---
 microprofile/tests/server/pom.xml             | 21 -------------------
 .../tck/tck-config/src/test/tck-suite.xml     |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/microprofile/tests/server/pom.xml b/microprofile/tests/server/pom.xml
index 8b0a771cd50..c2db9b4259f 100644
--- a/microprofile/tests/server/pom.xml
+++ b/microprofile/tests/server/pom.xml
@@ -71,25 +71,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <!--
-                Override plugin to be executed every test in a new JVM.
-                This is required because there are some system property set.
-             -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkCount>1</forkCount>
-                    <reuseForks>false</reuseForks>
-                    <useModulePath>false</useModulePath>
-                    <trimStackTrace>false</trimStackTrace>
-                    <!-- DO NOT override argLine instead use surefire.argLine -->
-                    <argLine>${surefire.argLine} ${surefire.coverage.argline}</argLine>
-                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/microprofile/tests/tck/tck-config/src/test/tck-suite.xml b/microprofile/tests/tck/tck-config/src/test/tck-suite.xml
index 16a0d9b259a..04887539b24 100644
--- a/microprofile/tests/tck/tck-config/src/test/tck-suite.xml
+++ b/microprofile/tests/tck/tck-config/src/test/tck-suite.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 <!--
 
-    Copyright (c) 2018, 2024 Oracle and/or its affiliates.
+    Copyright (c) 2018, 2025 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.