Merge pull request #28666 from gsmet/2.13.3-backports-2

2.13.3 backports 2
quarkusio · Oct 18, 2022 · 0164fd2 · 0164fd2
2 parents 73c77d0 + 6e25108
commit 0164fd2
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/docs/pom.xml b/docs/pom.xml
@@ -23,7 +23,8 @@
         <quarkus-home-url>https://quarkus.io</quarkus-home-url>
         <quarkus-base-url>https://github.com/quarkusio/quarkus</quarkus-base-url>
         <quickstarts-base-url>https://github.com/quarkusio/quarkus-quickstarts</quickstarts-base-url>
-        <code-example-dir>${project.basedir}/../target/asciidoc/examples</code-example-dir>
+        <generated-dir>${project.basedir}/../target/asciidoc/generated</generated-dir>
+        <code-examples-dir>${generated-dir}/examples</code-examples-dir>
     </properties>
 
     <name>Quarkus - Documentation</name>
@@ -2871,7 +2872,7 @@
                             <skip>${skipDocs}</skip>
                             <mainClass>io.quarkus.docs.generation.QuarkusBuildItemDoc</mainClass>
                             <arguments>
-                                <argument>${project.basedir}/../target/asciidoc/generated/config/quarkus-all-build-items.adoc</argument>
+                                <argument>${generated-dir}/config/quarkus-all-build-items.adoc</argument>
                                 <argument>${project.basedir}/../core/deployment</argument>
                                 <argument>${project.basedir}/../extensions</argument>
                             </arguments>
@@ -2890,7 +2891,7 @@
                             <skip>${skipDocs}</skip>
                             <mainClass>io.quarkus.docs.generation.CopyExampleSource</mainClass>
                             <arguments>
-                                <argument>${code-example-dir}</argument>
+                                <argument>${code-examples-dir}</argument>
                                 <argument>${project.basedir}/..</argument>
                                 <argument>${project.basedir}/target/asciidoc/sources</argument>
                             </arguments>
@@ -2933,8 +2934,8 @@
                     <sourceDirectory>target/asciidoc/sources</sourceDirectory>
                     <preserveDirectories>true</preserveDirectories>
                     <attributes>
-                        <generated-dir>${project.basedir}/../target/asciidoc/generated</generated-dir>
-                        <code-examples>${code-example-dir}</code-examples>
+                        <generated-dir>${generated-dir}</generated-dir>
+                        <code-examples>${code-examples-dir}</code-examples>
                         <imagesdir>./images</imagesdir>
                         <icons>font</icons>
                         <sectanchors>true</sectanchors>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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);
     }