diff --git a/docs/pom.xml b/docs/pom.xml
index 79b0da9db78a0..766e9508ec3b6 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -23,7 +23,8 @@
https://quarkus.io
https://github.com/quarkusio/quarkus
https://github.com/quarkusio/quarkus-quickstarts
- ${project.basedir}/../target/asciidoc/examples
+ ${project.basedir}/../target/asciidoc/generated
+ ${generated-dir}/examples
Quarkus - Documentation
@@ -2871,7 +2872,7 @@
${skipDocs}
io.quarkus.docs.generation.QuarkusBuildItemDoc
- ${project.basedir}/../target/asciidoc/generated/config/quarkus-all-build-items.adoc
+ ${generated-dir}/config/quarkus-all-build-items.adoc
${project.basedir}/../core/deployment
${project.basedir}/../extensions
@@ -2890,7 +2891,7 @@
${skipDocs}
io.quarkus.docs.generation.CopyExampleSource
- ${code-example-dir}
+ ${code-examples-dir}
${project.basedir}/..
${project.basedir}/target/asciidoc/sources
@@ -2933,8 +2934,8 @@
target/asciidoc/sources
true
- ${project.basedir}/../target/asciidoc/generated
- ${code-example-dir}
+ ${generated-dir}
+ ${code-examples-dir}
./images
font
true
diff --git a/docs/src/main/asciidoc/_attributes-local.adoc b/docs/src/main/asciidoc/_attributes-local.adoc
index 0f530d6c0e4ae..a4156b8461ce2 100644
--- a/docs/src/main/asciidoc/_attributes-local.adoc
+++ b/docs/src/main/asciidoc/_attributes-local.adoc
@@ -4,10 +4,10 @@
:idprefix:
:idseparator: -
:icons: font
-:code-examples: ../../../../target/asciidoc/examples
+:generated-dir: ../../../../target/asciidoc/generated
+:code-examples: {generated-dir}/examples
:doc-guides: ./
:doc-examples: ./_examples
-:generated-dir: ../../../../target/asciidoc/generated
:imagesdir: ./images
:includes: ./_includes
:toc: preamble
diff --git a/docs/src/main/asciidoc/_examples/_attributes.adoc b/docs/src/main/asciidoc/_examples/_attributes.adoc
index 03eff399e165a..42046d8d2d471 100644
--- a/docs/src/main/asciidoc/_examples/_attributes.adoc
+++ b/docs/src/main/asciidoc/_examples/_attributes.adoc
@@ -3,7 +3,7 @@
:idprefix:
:idseparator: -
:icons: font
-:code-examples: ../../../../../target/asciidoc/examples
+:code-examples: ../../../../../target/asciidoc/generated/examples
:doc-guides: ..
:doc-examples: .
:imagesdir: ./images
diff --git a/docs/src/main/asciidoc/_templates/_attributes.adoc b/docs/src/main/asciidoc/_templates/_attributes.adoc
index f7d6d8046196d..689056c055cec 100644
--- a/docs/src/main/asciidoc/_templates/_attributes.adoc
+++ b/docs/src/main/asciidoc/_templates/_attributes.adoc
@@ -3,7 +3,7 @@
:idprefix:
:idseparator: -
:icons: font
-:code-examples: ../../../../../target/asciidoc/examples
+:code-examples: ../../../../../target/asciidoc/generated/examples
:doc-guides: ..
:doc-examples: ../_examples
:imagesdir: ../images
diff --git a/docs/sync-web-site.sh b/docs/sync-web-site.sh
index 94690c129d300..44036ce5cb3c8 100755
--- a/docs/sync-web-site.sh
+++ b/docs/sync-web-site.sh
@@ -37,10 +37,10 @@ fi
if [ $BRANCH == "main" ] && [ "$QUARKUS_RELEASE" == "true" ]; then
TARGET_GUIDES=${TARGET_DIR}/_guides
- TARGET_CONFIG=${TARGET_DIR}/_generated-config/latest
+ TARGET_CONFIG=${TARGET_DIR}/_generated-doc/latest
else
TARGET_GUIDES=${TARGET_DIR}/_versions/${BRANCH}/guides
- TARGET_CONFIG=${TARGET_DIR}/_generated-config/${BRANCH}
+ TARGET_CONFIG=${TARGET_DIR}/_generated-doc/${BRANCH}
fi
echo "Copying from target/asciidoc/sources/* to $TARGET_GUIDES"
@@ -50,7 +50,7 @@ rsync -vr --delete \
--exclude='**/_attributes-local.adoc' \
--exclude='**/guides.md' \
--exclude='**/_templates' \
- target/asciidoc/sources/* \
+ target/asciidoc/sources/ \
$TARGET_GUIDES
echo "\nCopying from ../target/asciidoc/generated/ to $TARGET_CONFIG"
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java
index 052854625f6be..f3aa07dc40270 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java
@@ -108,6 +108,11 @@ static void doProcessTestInstance(Object testInstance, ExtensionContext context)
ExtensionContext.Store store = root.getStore(ExtensionContext.Namespace.GLOBAL);
QuarkusTestExtensionState state = store.get(QuarkusTestExtensionState.class.getName(),
QuarkusTestExtensionState.class);
+ Object testResourceManager = state.testResourceManager;
+ if (!(testResourceManager instanceof TestResourceManager)) {
+ throw new RuntimeException(
+ "An unexpected situation occurred while trying to instantiate the testing infrastructure. Have you perhaps mixed @QuarkusTest and @QuarkusIntegrationTest in the same test run?");
+ }
((TestResourceManager) state.testResourceManager).inject(testInstance);
}