Merge pull request #24574 from gsmet/move-test-extension

Move the test extension out of the core module
quarkusio · Mar 26, 2022 · 7399136 · 7399136
2 parents b051eb9 + ad20601
commit 7399136
Show file tree

Hide file tree

Showing 168 changed files with 211 additions and 140 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -18,7 +18,6 @@
         <module>runtime</module>
         <module>processor</module>
         <module>builder</module>
-        <module>test-extension</module>
         <module>devmode-spi</module>
         <module>launcher</module>
         <module>class-change-agent</module>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -2716,7 +2716,7 @@
                             <script>${project.basedir}/../.github/quarkusbuilditemdoc.java</script>
                             <args>
                                 <arg>--outputFile ${project.basedir}/../target/asciidoc/generated/config/quarkus-all-build-items.adoc</arg>
-                                <arg>--dirs ${project.basedir}/../core/deployment ${project.basedir}/../core/test-extension ${project.basedir}/../extensions</arg>
+                                <arg>--dirs ${project.basedir}/../core/deployment ${project.basedir}/../extensions</arg>
                             </args>
                         </configuration>
                     </execution>

diff --git a/docs/src/main/asciidoc/writing-extensions.adoc b/docs/src/main/asciidoc/writing-extensions.adoc
@@ -2214,7 +2214,7 @@ Otherwise, Quarkus attempts to monitor the extension classes and this may result
 Remember to add `IndexDependencyBuildItem` artifacts to your `@BuildStep`.
 
 === Sample Test Extension
-We have an extension that is used to test for regressions in the extension processing. It is located in {quarkus-tree-url}/core/test-extension directory. In this section we touch on some of the tasks an extension
+We have an extension that is used to test for regressions in the extension processing. It is located in {quarkus-tree-url}/integration-tests/test-extension/extension directory. In this section we touch on some of the tasks an extension
 author will typically need to perform using the test-extension code to illustrate how the task could be done.
 
 ==== Features and Capabilities
@@ -2538,7 +2538,7 @@ Now that you have recorded the creation of a service during the build phase, you
 <6> Runtime recorder registers an invocation of the service instance `stopService` method with the Quarkus `ShutdownContext`.
 
 The code for the `RuntimeXmlConfigService` can be viewed here:
-{quarkus-blob-url}/core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/RuntimeXmlConfigService.java[RuntimeXmlConfigService.java]
+{quarkus-blob-url}/integration-tests/test-extension/extension/runtime/src/main/java/io/quarkus/extest/runtime/RuntimeXmlConfigService.java[RuntimeXmlConfigService.java]
 
 The testcase for validating that the `RuntimeXmlConfigService` has started can be found in the `testRuntimeXmlConfigService` test of `ConfiguredBeanTest` and `NativeImageIT`.
 

diff --git a/...cts/enforcer-rules/src/main/java/io/quarkus/enforcer/DeploymentDependencyRuleSupport.java b/...cts/enforcer-rules/src/main/java/io/quarkus/enforcer/DeploymentDependencyRuleSupport.java
@@ -5,6 +5,8 @@
 import java.io.InputStreamReader;
 import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Properties;
@@ -107,14 +109,26 @@ private Optional<String> parseDeploymentGAV(Artifact artifact) {
         }
 
         Properties extProperties = new Properties();
-        try (ZipFile zipFile = new ZipFile(artifactFile)) {
-            ZipEntry entry = zipFile.getEntry(EXT_PROPERTIES_PATH);
-            if (entry == null) {
-                return Optional.empty();
+        if (artifactFile.isDirectory()) {
+            Path extPropertiesPath = artifactFile.toPath().resolve(EXT_PROPERTIES_PATH);
+            try (InputStreamReader isr = new InputStreamReader(Files.newInputStream(extPropertiesPath),
+                    StandardCharsets.UTF_8)) {
+                extProperties.load(isr);
+            } catch (IOException e) {
+                throw new UncheckedIOException("Failed to read " + EXT_PROPERTIES_PATH + " from " + artifactFile, e);
+            }
+        } else {
+            try (ZipFile zipFile = new ZipFile(artifactFile)) {
+                ZipEntry entry = zipFile.getEntry(EXT_PROPERTIES_PATH);
+                if (entry == null) {
+                    return Optional.empty();
+                }
+                try (InputStreamReader isr = new InputStreamReader(zipFile.getInputStream(entry), StandardCharsets.UTF_8)) {
+                    extProperties.load(isr);
+                }
+            } catch (IOException e) {
+                throw new UncheckedIOException("Failed to read " + EXT_PROPERTIES_PATH + " from " + artifactFile, e);
             }
-            extProperties.load(new InputStreamReader(zipFile.getInputStream(entry), StandardCharsets.UTF_8));
-        } catch (IOException e) {
-            throw new UncheckedIOException("Failed to read " + EXT_PROPERTIES_PATH + " from " + artifactFile, e);
         }
 
         String deploymentGAV = extProperties.getProperty("deployment-artifact");

diff --git a/integration-tests/avro-reload/pom.xml b/integration-tests/avro-reload/pom.xml
@@ -10,8 +10,8 @@
         <version>999-SNAPSHOT</version>
     </parent>
 
-    <artifactId>quarkus-avro-reload-test</artifactId>
-    <name>Quarkus - Integration Test - Avro code generation and reload</name>
+    <artifactId>quarkus-integration-test-avro-reload</artifactId>
+    <name>Quarkus - Integration Tests - Avro code generation and reload</name>
 
     <properties>
         <avro.codegen.avsc.imports>imports,directImport/PrivacyDirectImport.avsc</avro.codegen.avsc.imports>

diff --git a/core/test-extension/README.adoc → ...ests/test-extension/extension/README.adoc b/core/test-extension/README.adoc → ...ests/test-extension/extension/README.adoc
diff --git a/core/test-extension/deployment/pom.xml → ...st-extension/extension/deployment/pom.xml b/core/test-extension/deployment/pom.xml → ...st-extension/extension/deployment/pom.xml
@@ -3,14 +3,14 @@
          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">
     <parent>
-        <artifactId>quarkus-test-extension-parent</artifactId>
+        <artifactId>quarkus-integration-test-test-extension-extension-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-test-extension-deployment</artifactId>
-    <name>Quarkus - Core - Test Extension - Deployment</name>
+    <artifactId>quarkus-integration-test-test-extension-extension-deployment</artifactId>
+    <name>Quarkus - Integration Tests - Test Extension - Extension - Deployment</name>
 
     <properties>
         <xml-combiner.version>3.0.0</xml-combiner.version>
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-test-extension</artifactId>
+            <artifactId>quarkus-integration-test-test-extension-extension</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

diff --git a/...ent/ClasspathEntryRecordingBuildStep.java → ...ent/ClasspathEntryRecordingBuildStep.java b/...ent/ClasspathEntryRecordingBuildStep.java → ...ent/ClasspathEntryRecordingBuildStep.java
diff --git a/...ployment/MapBuildTimeConfigBuildStep.java → ...ployment/MapBuildTimeConfigBuildStep.java b/...ployment/MapBuildTimeConfigBuildStep.java → ...ployment/MapBuildTimeConfigBuildStep.java
diff --git a/...deployment/PrefixConfigTestProcessor.java → ...deployment/PrefixConfigTestProcessor.java b/...deployment/PrefixConfigTestProcessor.java → ...deployment/PrefixConfigTestProcessor.java
diff --git a/...extest/deployment/PublicKeyBuildItem.java → ...extest/deployment/PublicKeyBuildItem.java b/...extest/deployment/PublicKeyBuildItem.java → ...extest/deployment/PublicKeyBuildItem.java
diff --git a/...t/deployment/RuntimeServiceBuildItem.java → ...t/deployment/RuntimeServiceBuildItem.java b/...t/deployment/RuntimeServiceBuildItem.java → ...t/deployment/RuntimeServiceBuildItem.java
diff --git a/.../extest/deployment/TestBeanBuildItem.java → .../extest/deployment/TestBeanBuildItem.java b/.../extest/deployment/TestBeanBuildItem.java → .../extest/deployment/TestBeanBuildItem.java
diff --git a/...rkus/extest/deployment/TestProcessor.java → ...rkus/extest/deployment/TestProcessor.java b/...rkus/extest/deployment/TestProcessor.java → ...rkus/extest/deployment/TestProcessor.java
diff --git a/...st/deployment/UberJarConfigBuildStep.java → ...st/deployment/UberJarConfigBuildStep.java b/...st/deployment/UberJarConfigBuildStep.java → ...st/deployment/UberJarConfigBuildStep.java
diff --git a/...t/src/main/resources/DSAPublicKey.encoded → ...t/src/main/resources/DSAPublicKey.encoded b/...t/src/main/resources/DSAPublicKey.encoded → ...t/src/main/resources/DSAPublicKey.encoded
diff --git a/...pplication-additional-handlers.properties → ...pplication-additional-handlers.properties b/...pplication-additional-handlers.properties → ...pplication-additional-handlers.properties
diff --git a/.../application-async-console-log.properties → .../application-async-console-log.properties b/.../application-async-console-log.properties → .../application-async-console-log.properties
diff --git a/...ces/application-async-file-log.properties → ...ces/application-async-file-log.properties b/...ces/application-async-file-log.properties → ...ces/application-async-file-log.properties
diff --git a/...urces/application-async-syslog.properties → ...urces/application-async-syslog.properties b/...urces/application-async-syslog.properties → ...urces/application-async-syslog.properties
diff --git a/...ory-configured-handlers-output.properties → ...ory-configured-handlers-output.properties b/...ory-configured-handlers-output.properties → ...ory-configured-handlers-output.properties
diff --git a/...lid-configured-handlers-output.properties → ...lid-configured-handlers-output.properties b/...lid-configured-handlers-output.properties → ...lid-configured-handlers-output.properties
diff --git a/...ces/application-console-output.properties → ...ces/application-console-output.properties b/...ces/application-console-output.properties → ...ces/application-console-output.properties
diff --git a/...es/application-file-output-log.properties → ...es/application-file-output-log.properties b/...es/application-file-output-log.properties → ...es/application-file-output-log.properties
diff --git a/...ion-periodic-file-log-rotating.properties → ...ion-periodic-file-log-rotating.properties b/...ion-periodic-file-log-rotating.properties → ...ion-periodic-file-log-rotating.properties
diff --git a/...le-log-rotating-rotate-on-boot.properties → ...le-log-rotating-rotate-on-boot.properties b/...le-log-rotating-rotate-on-boot.properties → ...le-log-rotating-rotate-on-boot.properties
diff --git a/...eriodic-size-file-log-rotating.properties → ...eriodic-size-file-log-rotating.properties b/...eriodic-size-file-log-rotating.properties → ...eriodic-size-file-log-rotating.properties
diff --git a/...ication-size-file-log-rotating.properties → ...ication-size-file-log-rotating.properties b/...ication-size-file-log-rotating.properties → ...ication-size-file-log-rotating.properties
diff --git a/...rces/application-syslog-output.properties → ...rces/application-syslog-output.properties b/...rces/application-syslog-output.properties → ...rces/application-syslog-output.properties
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/.../deployment/src/main/resources/config.xml → .../deployment/src/main/resources/config.xml b/.../deployment/src/main/resources/config.xml → .../deployment/src/main/resources/config.xml
diff --git a/...io/quarkus/commandmode/BothTypesMain.java → ...io/quarkus/commandmode/BothTypesMain.java b/...io/quarkus/commandmode/BothTypesMain.java → ...io/quarkus/commandmode/BothTypesMain.java
diff --git a/.../DefaultProfileInjectingMainTestCase.java → .../DefaultProfileInjectingMainTestCase.java b/.../DefaultProfileInjectingMainTestCase.java → .../DefaultProfileInjectingMainTestCase.java
diff --git a/...ExceptionHandlingCommandModeTestCase.java → ...ExceptionHandlingCommandModeTestCase.java b/...ExceptionHandlingCommandModeTestCase.java → ...ExceptionHandlingCommandModeTestCase.java
diff --git a/...ExceptionThrowingCommandModeTestCase.java → ...ExceptionThrowingCommandModeTestCase.java b/...ExceptionThrowingCommandModeTestCase.java → ...ExceptionThrowingCommandModeTestCase.java
diff --git a/...us/commandmode/ExceptionThrowingMain.java → ...us/commandmode/ExceptionThrowingMain.java b/...us/commandmode/ExceptionThrowingMain.java → ...us/commandmode/ExceptionThrowingMain.java
diff --git a/...quarkus/commandmode/ExitCodeTestCase.java → ...quarkus/commandmode/ExitCodeTestCase.java b/...quarkus/commandmode/ExitCodeTestCase.java → ...quarkus/commandmode/ExitCodeTestCase.java
diff --git a/...o/quarkus/commandmode/HelloWorldMain.java → ...o/quarkus/commandmode/HelloWorldMain.java b/...o/quarkus/commandmode/HelloWorldMain.java → ...o/quarkus/commandmode/HelloWorldMain.java
diff --git a/.../quarkus/commandmode/HelloWorldNamed.java → .../quarkus/commandmode/HelloWorldNamed.java b/.../quarkus/commandmode/HelloWorldNamed.java → .../quarkus/commandmode/HelloWorldNamed.java
diff --git a/...kus/commandmode/HelloWorldNonDefault.java → ...kus/commandmode/HelloWorldNonDefault.java b/...kus/commandmode/HelloWorldNonDefault.java → ...kus/commandmode/HelloWorldNonDefault.java
diff --git a/...commandmode/InvalidNamedMainTestCase.java → ...commandmode/InvalidNamedMainTestCase.java b/...commandmode/InvalidNamedMainTestCase.java → ...commandmode/InvalidNamedMainTestCase.java
diff --git a/...java/io/quarkus/commandmode/JavaMain.java → ...java/io/quarkus/commandmode/JavaMain.java b/...java/io/quarkus/commandmode/JavaMain.java → ...java/io/quarkus/commandmode/JavaMain.java
diff --git a/...dmode/JavaMainFullyQualifiedTestCase.java → ...dmode/JavaMainFullyQualifiedTestCase.java b/...dmode/JavaMainFullyQualifiedTestCase.java → ...dmode/JavaMainFullyQualifiedTestCase.java
diff --git a/...quarkus/commandmode/JavaMainTestCase.java → ...quarkus/commandmode/JavaMainTestCase.java b/...quarkus/commandmode/JavaMainTestCase.java → ...quarkus/commandmode/JavaMainTestCase.java
diff --git a/...ava/io/quarkus/commandmode/NamedMain.java → ...ava/io/quarkus/commandmode/NamedMain.java b/...ava/io/quarkus/commandmode/NamedMain.java → ...ava/io/quarkus/commandmode/NamedMain.java
diff --git a/...uarkus/commandmode/NamedMainTestCase.java → ...uarkus/commandmode/NamedMainTestCase.java b/...uarkus/commandmode/NamedMainTestCase.java → ...uarkus/commandmode/NamedMainTestCase.java
diff --git a/...erriddenProfileInjectingMainTestCase.java → ...erriddenProfileInjectingMainTestCase.java b/...erriddenProfileInjectingMainTestCase.java → ...erriddenProfileInjectingMainTestCase.java
diff --git a/...us/commandmode/PropertyInjectingMain.java → ...us/commandmode/PropertyInjectingMain.java b/...us/commandmode/PropertyInjectingMain.java → ...us/commandmode/PropertyInjectingMain.java
diff --git a/...e/SimpleCommandModeBothMainsTestCase.java → ...e/SimpleCommandModeBothMainsTestCase.java b/...e/SimpleCommandModeBothMainsTestCase.java → ...e/SimpleCommandModeBothMainsTestCase.java
diff --git a/...ommandmode/SimpleCommandModeTestCase.java → ...ommandmode/SimpleCommandModeTestCase.java b/...ommandmode/SimpleCommandModeTestCase.java → ...ommandmode/SimpleCommandModeTestCase.java
diff --git a/...ommandmode/ThrowExceptionApplication.java → ...ommandmode/ThrowExceptionApplication.java b/...ommandmode/ThrowExceptionApplication.java → ...ommandmode/ThrowExceptionApplication.java
diff --git a/...ndmode/ThrowExceptionApplicationMain.java → ...ndmode/ThrowExceptionApplicationMain.java b/...ndmode/ThrowExceptionApplicationMain.java → ...ndmode/ThrowExceptionApplicationMain.java
diff --git a/...o/quarkus/config/BuildTimeConfigTest.java → ...o/quarkus/config/BuildTimeConfigTest.java b/...o/quarkus/config/BuildTimeConfigTest.java → ...o/quarkus/config/BuildTimeConfigTest.java
diff --git a/.../io/quarkus/config/ConfigBuilderTest.java → .../io/quarkus/config/ConfigBuilderTest.java b/.../io/quarkus/config/ConfigBuilderTest.java → .../io/quarkus/config/ConfigBuilderTest.java
diff --git a/...a/io/quarkus/config/RenameConfigTest.java → ...a/io/quarkus/config/RenameConfigTest.java b/...a/io/quarkus/config/RenameConfigTest.java → ...a/io/quarkus/config/RenameConfigTest.java
diff --git a/...onfig/RuntimeInitConfigSourceFactory.java → ...onfig/RuntimeInitConfigSourceFactory.java b/...onfig/RuntimeInitConfigSourceFactory.java → ...onfig/RuntimeInitConfigSourceFactory.java
diff --git a/...g/StaticInitConfigMappingInvalidTest.java → ...g/StaticInitConfigMappingInvalidTest.java b/...g/StaticInitConfigMappingInvalidTest.java → ...g/StaticInitConfigMappingInvalidTest.java
diff --git a/...s/config/StaticInitConfigMappingTest.java → ...s/config/StaticInitConfigMappingTest.java b/...s/config/StaticInitConfigMappingTest.java → ...s/config/StaticInitConfigMappingTest.java
diff --git a/...config/StaticInitConfigSourceFactory.java → ...config/StaticInitConfigSourceFactory.java b/...config/StaticInitConfigSourceFactory.java → ...config/StaticInitConfigSourceFactory.java
diff --git a/...ditem/GeneratedResourceBuildItemTest.java → ...ditem/GeneratedResourceBuildItemTest.java b/...ditem/GeneratedResourceBuildItemTest.java → ...ditem/GeneratedResourceBuildItemTest.java
diff --git a/.../UberJarIgnoredResourceBuildItemTest.java → .../UberJarIgnoredResourceBuildItemTest.java b/.../UberJarIgnoredResourceBuildItemTest.java → .../UberJarIgnoredResourceBuildItemTest.java
diff --git a/...m/UberJarMergedResourceBuildItemTest.java → ...m/UberJarMergedResourceBuildItemTest.java b/...m/UberJarMergedResourceBuildItemTest.java → ...m/UberJarMergedResourceBuildItemTest.java
diff --git a/...arkus/extest/AdditionalLocationsTest.java → ...arkus/extest/AdditionalLocationsTest.java b/...arkus/extest/AdditionalLocationsTest.java → ...arkus/extest/AdditionalLocationsTest.java
diff --git a/.../io/quarkus/extest/ConfigMappingTest.java → .../io/quarkus/extest/ConfigMappingTest.java b/.../io/quarkus/extest/ConfigMappingTest.java → .../io/quarkus/extest/ConfigMappingTest.java
diff --git a/...ava/io/quarkus/extest/ConfiguredBean.java → ...ava/io/quarkus/extest/ConfiguredBean.java b/...ava/io/quarkus/extest/ConfiguredBean.java → ...ava/io/quarkus/extest/ConfiguredBean.java
diff --git a/...io/quarkus/extest/ConfiguredBeanTest.java → ...io/quarkus/extest/ConfiguredBeanTest.java b/...io/quarkus/extest/ConfiguredBeanTest.java → ...io/quarkus/extest/ConfiguredBeanTest.java
diff --git a/...st/java/io/quarkus/extest/DSAKeyUtil.java → ...st/java/io/quarkus/extest/DSAKeyUtil.java b/...st/java/io/quarkus/extest/DSAKeyUtil.java → ...st/java/io/quarkus/extest/DSAKeyUtil.java
diff --git a/...va/io/quarkus/extest/PackageTestCase.java → ...va/io/quarkus/extest/PackageTestCase.java b/...va/io/quarkus/extest/PackageTestCase.java → ...va/io/quarkus/extest/PackageTestCase.java
diff --git a/...o/quarkus/extest/RuntimeDefaultsTest.java → ...o/quarkus/extest/RuntimeDefaultsTest.java b/...o/quarkus/extest/RuntimeDefaultsTest.java → ...o/quarkus/extest/RuntimeDefaultsTest.java
diff --git a/...quarkus/extest/StaticInitSourcesTest.java → ...quarkus/extest/StaticInitSourcesTest.java b/...quarkus/extest/StaticInitSourcesTest.java → ...quarkus/extest/StaticInitSourcesTest.java
diff --git a/...uarkus/extest/UnknownBuildConfigTest.java → ...uarkus/extest/UnknownBuildConfigTest.java b/...uarkus/extest/UnknownBuildConfigTest.java → ...uarkus/extest/UnknownBuildConfigTest.java
diff --git a/.../io/quarkus/extest/UnknownConfigTest.java → .../io/quarkus/extest/UnknownConfigTest.java b/.../io/quarkus/extest/UnknownConfigTest.java → .../io/quarkus/extest/UnknownConfigTest.java
diff --git a/...rkus/forkjoin/ForkJoinPoolAssertions.java → ...rkus/forkjoin/ForkJoinPoolAssertions.java b/...rkus/forkjoin/ForkJoinPoolAssertions.java → ...rkus/forkjoin/ForkJoinPoolAssertions.java
diff --git a/...us/forkjoin/ForkJoinProdModeTestCase.java → ...us/forkjoin/ForkJoinProdModeTestCase.java b/...us/forkjoin/ForkJoinProdModeTestCase.java → ...us/forkjoin/ForkJoinProdModeTestCase.java
diff --git a/...forkjoin/ProductionModeTestsEndpoint.java → ...forkjoin/ProductionModeTestsEndpoint.java b/...forkjoin/ProductionModeTestsEndpoint.java → ...forkjoin/ProductionModeTestsEndpoint.java
diff --git a/...arkus/logging/AdditionalHandlersTest.java → ...arkus/logging/AdditionalHandlersTest.java b/...arkus/logging/AdditionalHandlersTest.java → ...arkus/logging/AdditionalHandlersTest.java
diff --git a/...rkus/logging/AsyncConsoleHandlerTest.java → ...rkus/logging/AsyncConsoleHandlerTest.java b/...rkus/logging/AsyncConsoleHandlerTest.java → ...rkus/logging/AsyncConsoleHandlerTest.java
diff --git a/...quarkus/logging/AsyncFileHandlerTest.java → ...quarkus/logging/AsyncFileHandlerTest.java b/...quarkus/logging/AsyncFileHandlerTest.java → ...quarkus/logging/AsyncFileHandlerTest.java
diff --git a/...arkus/logging/AsyncSyslogHandlerTest.java → ...arkus/logging/AsyncSyslogHandlerTest.java b/...arkus/logging/AsyncSyslogHandlerTest.java → ...arkus/logging/AsyncSyslogHandlerTest.java
diff --git a/...dlerInvalidDueToMultipleHandlersTest.java → ...dlerInvalidDueToMultipleHandlersTest.java b/...dlerInvalidDueToMultipleHandlersTest.java → ...dlerInvalidDueToMultipleHandlersTest.java
diff --git a/...ogging/CategoryConfiguredHandlerTest.java → ...ogging/CategoryConfiguredHandlerTest.java b/...ogging/CategoryConfiguredHandlerTest.java → ...ogging/CategoryConfiguredHandlerTest.java
diff --git a/...o/quarkus/logging/ConsoleHandlerTest.java → ...o/quarkus/logging/ConsoleHandlerTest.java b/...o/quarkus/logging/ConsoleHandlerTest.java → ...o/quarkus/logging/ConsoleHandlerTest.java
diff --git a/...a/io/quarkus/logging/FileHandlerTest.java → ...a/io/quarkus/logging/FileHandlerTest.java b/...a/io/quarkus/logging/FileHandlerTest.java → ...a/io/quarkus/logging/FileHandlerTest.java
diff --git a/...o/quarkus/logging/LoggingTestsHelper.java → ...o/quarkus/logging/LoggingTestsHelper.java b/...o/quarkus/logging/LoggingTestsHelper.java → ...o/quarkus/logging/LoggingTestsHelper.java
diff --git a/.../logging/PeriodicRotatingLoggingTest.java → .../logging/PeriodicRotatingLoggingTest.java b/.../logging/PeriodicRotatingLoggingTest.java → .../logging/PeriodicRotatingLoggingTest.java
diff --git a/...cSizeRotatingLoggingRotateOnBootTest.java → ...cSizeRotatingLoggingRotateOnBootTest.java b/...cSizeRotatingLoggingRotateOnBootTest.java → ...cSizeRotatingLoggingRotateOnBootTest.java
diff --git a/...ging/PeriodicSizeRotatingLoggingTest.java → ...ging/PeriodicSizeRotatingLoggingTest.java b/...ging/PeriodicSizeRotatingLoggingTest.java → ...ging/PeriodicSizeRotatingLoggingTest.java
diff --git a/...rkus/logging/SizeRotatingLoggingTest.java → ...rkus/logging/SizeRotatingLoggingTest.java b/...rkus/logging/SizeRotatingLoggingTest.java → ...rkus/logging/SizeRotatingLoggingTest.java
diff --git a/...io/quarkus/logging/SyslogHandlerTest.java → ...io/quarkus/logging/SyslogHandlerTest.java b/...io/quarkus/logging/SyslogHandlerTest.java → ...io/quarkus/logging/SyslogHandlerTest.java
diff --git a/...o/quarkus/naming/DisableJNDITestCase.java → ...o/quarkus/naming/DisableJNDITestCase.java b/...o/quarkus/naming/DisableJNDITestCase.java → ...o/quarkus/naming/DisableJNDITestCase.java
diff --git a/core/test-extension/pom.xml → ...on-tests/test-extension/extension/pom.xml b/core/test-extension/pom.xml → ...on-tests/test-extension/extension/pom.xml
@@ -3,14 +3,14 @@
          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">
     <parent>
+        <artifactId>quarkus-integration-test-test-extension</artifactId>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-core-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-test-extension-parent</artifactId>
-    <name>Quarkus - Core - Test Extension</name>
+    <artifactId>quarkus-integration-test-test-extension-extension-parent</artifactId>
+    <name>Quarkus - Integration Tests - Test Extension - Extension</name>
     <packaging>pom</packaging>
 
     <properties>
@@ -35,6 +35,4 @@
             </plugin>
         </plugins>
     </build>
-
-
 </project>
diff --git a/core/test-extension/runtime/pom.xml → .../test-extension/extension/runtime/pom.xml b/core/test-extension/runtime/pom.xml → .../test-extension/extension/runtime/pom.xml
@@ -3,14 +3,14 @@
          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">
     <parent>
-        <artifactId>quarkus-test-extension-parent</artifactId>
+        <artifactId>quarkus-integration-test-test-extension-extension-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-test-extension</artifactId>
-    <name>Quarkus - Core - Test Extension - Runtime</name>
+    <artifactId>quarkus-integration-test-test-extension-extension</artifactId>
+    <name>Quarkus - Integration Tests - Test Extension - Extension - Runtime</name>
 
     <dependencies>
         <dependency>
@@ -63,6 +63,46 @@
             <groupId>com.sun.activation</groupId>
             <artifactId>jakarta.activation</artifactId>
         </dependency>
+        <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...t/runtime/FinalFieldReflectionObject.java → ...t/runtime/FinalFieldReflectionObject.java b/...t/runtime/FinalFieldReflectionObject.java → ...t/runtime/FinalFieldReflectionObject.java
diff --git a/...arkus/extest/runtime/IConfigConsumer.java → ...arkus/extest/runtime/IConfigConsumer.java b/...arkus/extest/runtime/IConfigConsumer.java → ...arkus/extest/runtime/IConfigConsumer.java
diff --git a/...test/runtime/RuntimeXmlConfigService.java → ...test/runtime/RuntimeXmlConfigService.java b/...test/runtime/RuntimeXmlConfigService.java → ...test/runtime/RuntimeXmlConfigService.java
diff --git a/.../quarkus/extest/runtime/TestRecorder.java → .../quarkus/extest/runtime/TestRecorder.java b/.../quarkus/extest/runtime/TestRecorder.java → .../quarkus/extest/runtime/TestRecorder.java
diff --git a/.../extest/runtime/beans/CommandServlet.java → .../extest/runtime/beans/CommandServlet.java b/.../extest/runtime/beans/CommandServlet.java → .../extest/runtime/beans/CommandServlet.java
diff --git a/...test/runtime/beans/PublicKeyProducer.java → ...test/runtime/beans/PublicKeyProducer.java b/...test/runtime/beans/PublicKeyProducer.java → ...test/runtime/beans/PublicKeyProducer.java
diff --git a/...e/classpath/ClasspathEntriesRecorder.java → ...e/classpath/ClasspathEntriesRecorder.java b/...e/classpath/ClasspathEntriesRecorder.java → ...e/classpath/ClasspathEntriesRecorder.java
diff --git a/...e/classpath/RecordedClasspathEntries.java → ...e/classpath/RecordedClasspathEntries.java b/...e/classpath/RecordedClasspathEntries.java → ...e/classpath/RecordedClasspathEntries.java
diff --git a/...xtest/runtime/config/AllValuesConfig.java → ...xtest/runtime/config/AllValuesConfig.java b/...xtest/runtime/config/AllValuesConfig.java → ...xtest/runtime/config/AllValuesConfig.java
diff --git a/...t/runtime/config/AnotherPrefixConfig.java → ...t/runtime/config/AnotherPrefixConfig.java b/...t/runtime/config/AnotherPrefixConfig.java → ...t/runtime/config/AnotherPrefixConfig.java
diff --git a/...time/config/EnvBuildTimeConfigSource.java → ...time/config/EnvBuildTimeConfigSource.java b/...time/config/EnvBuildTimeConfigSource.java → ...time/config/EnvBuildTimeConfigSource.java
diff --git a/...test/runtime/config/FooRuntimeConfig.java → ...test/runtime/config/FooRuntimeConfig.java b/...test/runtime/config/FooRuntimeConfig.java → ...test/runtime/config/FooRuntimeConfig.java
diff --git a/...s/extest/runtime/config/MapMapConfig.java → ...s/extest/runtime/config/MapMapConfig.java b/...s/extest/runtime/config/MapMapConfig.java → ...s/extest/runtime/config/MapMapConfig.java
diff --git a/...quarkus/extest/runtime/config/MyEnum.java → ...quarkus/extest/runtime/config/MyEnum.java b/...quarkus/extest/runtime/config/MyEnum.java → ...quarkus/extest/runtime/config/MyEnum.java
diff --git a/...s/extest/runtime/config/NestedConfig.java → ...s/extest/runtime/config/NestedConfig.java b/...s/extest/runtime/config/NestedConfig.java → ...s/extest/runtime/config/NestedConfig.java
diff --git a/.../extest/runtime/config/ObjectOfValue.java → .../extest/runtime/config/ObjectOfValue.java b/.../extest/runtime/config/ObjectOfValue.java → .../extest/runtime/config/ObjectOfValue.java
diff --git a/.../extest/runtime/config/ObjectValueOf.java → .../extest/runtime/config/ObjectValueOf.java b/.../extest/runtime/config/ObjectValueOf.java → .../extest/runtime/config/ObjectValueOf.java
diff --git a/...config/OverrideBuildTimeConfigSource.java → ...config/OverrideBuildTimeConfigSource.java b/...config/OverrideBuildTimeConfigSource.java → ...config/OverrideBuildTimeConfigSource.java
diff --git a/...runtime/config/PrefixBuildTimeConfig.java → ...runtime/config/PrefixBuildTimeConfig.java b/...runtime/config/PrefixBuildTimeConfig.java → ...runtime/config/PrefixBuildTimeConfig.java
diff --git a/...s/extest/runtime/config/PrefixConfig.java → ...s/extest/runtime/config/PrefixConfig.java b/...s/extest/runtime/config/PrefixConfig.java → ...s/extest/runtime/config/PrefixConfig.java
diff --git a/.../runtime/config/RunTimeConfigBuilder.java → .../runtime/config/RunTimeConfigBuilder.java b/.../runtime/config/RunTimeConfigBuilder.java → .../runtime/config/RunTimeConfigBuilder.java
diff --git a/...ntime/config/StaticInitConfigBuilder.java → ...ntime/config/StaticInitConfigBuilder.java b/...ntime/config/StaticInitConfigBuilder.java → ...ntime/config/StaticInitConfigBuilder.java
diff --git a/...config/StaticInitNotSafeConfigSource.java → ...config/StaticInitNotSafeConfigSource.java b/...config/StaticInitNotSafeConfigSource.java → ...config/StaticInitNotSafeConfigSource.java
diff --git a/...me/config/StaticInitSafeConfigSource.java → ...me/config/StaticInitSafeConfigSource.java b/...me/config/StaticInitSafeConfigSource.java → ...me/config/StaticInitSafeConfigSource.java
diff --git a/...test/runtime/config/StringBasedValue.java → ...test/runtime/config/StringBasedValue.java b/...test/runtime/config/StringBasedValue.java → ...test/runtime/config/StringBasedValue.java
diff --git a/...ime/config/TestBuildAndRunTimeConfig.java → ...ime/config/TestBuildAndRunTimeConfig.java b/...ime/config/TestBuildAndRunTimeConfig.java → ...ime/config/TestBuildAndRunTimeConfig.java
diff --git a/...t/runtime/config/TestBuildTimeConfig.java → ...t/runtime/config/TestBuildTimeConfig.java b/...t/runtime/config/TestBuildTimeConfig.java → ...t/runtime/config/TestBuildTimeConfig.java
diff --git a/...extest/runtime/config/TestConfigRoot.java → ...extest/runtime/config/TestConfigRoot.java b/...extest/runtime/config/TestConfigRoot.java → ...extest/runtime/config/TestConfigRoot.java
diff --git a/.../runtime/config/TestMappingBuildTime.java → .../runtime/config/TestMappingBuildTime.java b/.../runtime/config/TestMappingBuildTime.java → .../runtime/config/TestMappingBuildTime.java
diff --git a/...e/config/TestMappingBuildTimeRunTime.java → ...e/config/TestMappingBuildTimeRunTime.java b/...e/config/TestMappingBuildTimeRunTime.java → ...e/config/TestMappingBuildTimeRunTime.java
diff --git a/...st/runtime/config/TestMappingRunTime.java → ...st/runtime/config/TestMappingRunTime.java b/...st/runtime/config/TestMappingRunTime.java → ...st/runtime/config/TestMappingRunTime.java
diff --git a/...est/runtime/config/TestRunTimeConfig.java → ...est/runtime/config/TestRunTimeConfig.java b/...est/runtime/config/TestRunTimeConfig.java → ...est/runtime/config/TestRunTimeConfig.java
diff --git a/...st/runtime/config/TopLevelRootConfig.java → ...st/runtime/config/TopLevelRootConfig.java b/...st/runtime/config/TopLevelRootConfig.java → ...st/runtime/config/TopLevelRootConfig.java
diff --git a/.../runtime/config/WholeNumberConverter.java → .../runtime/config/WholeNumberConverter.java b/.../runtime/config/WholeNumberConverter.java → .../runtime/config/WholeNumberConverter.java
diff --git a/...uarkus/extest/runtime/config/XConfig.java → ...uarkus/extest/runtime/config/XConfig.java b/...uarkus/extest/runtime/config/XConfig.java → ...uarkus/extest/runtime/config/XConfig.java
diff --git a/.../quarkus/extest/runtime/config/XData.java → .../quarkus/extest/runtime/config/XData.java b/.../quarkus/extest/runtime/config/XData.java → .../quarkus/extest/runtime/config/XData.java
diff --git a/...rkus/extest/runtime/config/XmlConfig.java → ...rkus/extest/runtime/config/XmlConfig.java b/...rkus/extest/runtime/config/XmlConfig.java → ...rkus/extest/runtime/config/XmlConfig.java
diff --git a/...uarkus/extest/runtime/config/XmlData.java → ...uarkus/extest/runtime/config/XmlData.java b/...uarkus/extest/runtime/config/XmlData.java → ...uarkus/extest/runtime/config/XmlData.java
diff --git a/...extest/runtime/config/YesNoConverter.java → ...extest/runtime/config/YesNoConverter.java b/...extest/runtime/config/YesNoConverter.java → ...extest/runtime/config/YesNoConverter.java
diff --git a/...ntime/config/named/PrefixNamedConfig.java → ...ntime/config/named/PrefixNamedConfig.java b/...ntime/config/named/PrefixNamedConfig.java → ...ntime/config/named/PrefixNamedConfig.java
diff --git a/...nfig/named/TestBuildAndRunTimeConfig.java → ...nfig/named/TestBuildAndRunTimeConfig.java b/...nfig/named/TestBuildAndRunTimeConfig.java → ...nfig/named/TestBuildAndRunTimeConfig.java
diff --git a/...t/runtime/config/rename/RenameConfig.java → ...t/runtime/config/rename/RenameConfig.java b/...t/runtime/config/rename/RenameConfig.java → ...t/runtime/config/rename/RenameConfig.java
diff --git a/...name/RenameConfigFallbackInterceptor.java → ...name/RenameConfigFallbackInterceptor.java b/...name/RenameConfigFallbackInterceptor.java → ...name/RenameConfigFallbackInterceptor.java
diff --git a/...name/RenameConfigRelocateInterceptor.java → ...name/RenameConfigRelocateInterceptor.java b/...name/RenameConfigRelocateInterceptor.java → ...name/RenameConfigRelocateInterceptor.java
diff --git a/...ime/config/rename/RenameConfigSource.java → ...ime/config/rename/RenameConfigSource.java b/...ime/config/rename/RenameConfigSource.java → ...ime/config/rename/RenameConfigSource.java
diff --git a/...fig/rename/RenameConfigSourceFactory.java → ...fig/rename/RenameConfigSourceFactory.java b/...fig/rename/RenameConfigSourceFactory.java → ...fig/rename/RenameConfigSourceFactory.java
diff --git a/...nownBuildPropertyConfigSourceFactory.java → ...nownBuildPropertyConfigSourceFactory.java b/...nownBuildPropertyConfigSourceFactory.java → ...nownBuildPropertyConfigSourceFactory.java
diff --git a/...xtest/runtime/graal/Target_XmlConfig.java → ...xtest/runtime/graal/Target_XmlConfig.java b/...xtest/runtime/graal/Target_XmlConfig.java → ...xtest/runtime/graal/Target_XmlConfig.java
diff --git a/.../extest/runtime/graal/Target_XmlData.java → .../extest/runtime/graal/Target_XmlData.java b/.../extest/runtime/graal/Target_XmlData.java → .../extest/runtime/graal/Target_XmlData.java
diff --git a/...ing/AdditionalLogHandlerValueFactory.java → ...ing/AdditionalLogHandlerValueFactory.java b/...ing/AdditionalLogHandlerValueFactory.java → ...ing/AdditionalLogHandlerValueFactory.java
diff --git a/...lizedpackage/RuntimeInitializedClass.java → ...lizedpackage/RuntimeInitializedClass.java b/...lizedpackage/RuntimeInitializedClass.java → ...lizedpackage/RuntimeInitializedClass.java
diff --git a/...subst/DSAPublicKeyObjectSubstitution.java → ...subst/DSAPublicKeyObjectSubstitution.java b/...subst/DSAPublicKeyObjectSubstitution.java → ...subst/DSAPublicKeyObjectSubstitution.java
diff --git a/...uarkus/extest/runtime/subst/KeyProxy.java → ...uarkus/extest/runtime/subst/KeyProxy.java b/...uarkus/extest/runtime/subst/KeyProxy.java → ...uarkus/extest/runtime/subst/KeyProxy.java
diff --git a/...es/io.smallrye.config.ConfigSourceFactory → ...es/io.smallrye.config.ConfigSourceFactory b/...es/io.smallrye.config.ConfigSourceFactory → ...es/io.smallrye.config.ConfigSourceFactory
diff --git a/...o.smallrye.config.ConfigSourceInterceptor → ...o.smallrye.config.ConfigSourceInterceptor b/...o.smallrye.config.ConfigSourceInterceptor → ...o.smallrye.config.ConfigSourceInterceptor
diff --git a/integration-tests/test-extension/pom.xml b/integration-tests/test-extension/pom.xml
@@ -2,122 +2,19 @@
 <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">
-  <parent>
-    <artifactId>quarkus-integration-tests-parent</artifactId>
-    <groupId>io.quarkus</groupId>
-    <version>999-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>quarkus-test-extension-nativetests</artifactId>
-  <name>Quarkus - Integration Tests - Test Extension Native Tests</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-undertow</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-test-extension</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- test dependencies -->
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.rest-assured</groupId>
-      <artifactId>rest-assured</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Minimal test dependencies to *-deployment artifacts for consistent build order -->
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-test-extension-deployment</artifactId>
-      <version>${project.version}</version>
-      <type>pom</type>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-undertow-deployment</artifactId>
-      <version>${project.version}</version>
-      <type>pom</type>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
+    <parent>
+        <artifactId>quarkus-integration-tests-parent</artifactId>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>build</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <!-- See io.quarkus.extest.runtime.classpath.RecordedClasspathEntries -->
-            <classpathEntriesRecordingFile>${project.build.directory}/recorded-classpath-entries-surefire.txt</classpathEntriesRecordingFile>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <!-- See io.quarkus.extest.runtime.classpath.RecordedClasspathEntries -->
-            <classpathEntriesRecordingFile>${project.build.directory}/recorded-classpath-entries-failsafe.txt</classpathEntriesRecordingFile>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
 
-  <profiles>
-    <profile>
-      <id>no-native</id>
-      <activation>
-        <property>
-          <name>!native</name>
-        </property>
-      </activation>
-      <!-- these properties must not be defined in the general properties,
-           otherwise the native profile in the parent pom is not able to override them -->
-      <properties>
-        <quarkus.package.type>uber-jar</quarkus.package.type>
-      </properties>
-    </profile>
-  </profiles>
+    <artifactId>quarkus-integration-test-test-extension</artifactId>
+    <name>Quarkus - Integration Tests - Test Extension</name>
+    <packaging>pom</packaging>
 
+    <modules>
+        <module>extension</module>
+        <module>tests</module>
+    </modules>
 </project>