From 132047d6400608194e6a42f3cede0c5bbde6bf4b Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Tue, 18 Oct 2022 15:10:11 +0200 Subject: [PATCH 1/3] Sync the whole doc directory Hopefully, it will make --delete effective and will clean up deleted guides. (cherry picked from commit 27d19aa007430f745496d07dfaa2cacdcceda074) --- docs/sync-web-site.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sync-web-site.sh b/docs/sync-web-site.sh index 94690c129d300..bb63550351317 100755 --- a/docs/sync-web-site.sh +++ b/docs/sync-web-site.sh @@ -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" From 8ef74ecc3ddd4f1e78fd4971b161a85c238d710c Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Wed, 12 Oct 2022 18:01:39 +0300 Subject: [PATCH 2/3] Provide a hint for when @QuarkusTest and @QuarkusIntegrationTest are mixed Closes: #28526 Co-authored-by: Falko Modler (cherry picked from commit aeb4d7543301337e6c36bffa0e205107d4f163c6) --- .../main/java/io/quarkus/test/junit/IntegrationTestUtil.java | 5 +++++ 1 file changed, 5 insertions(+) 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); } From 6e25108a123a32af7f87627205f142a5a272aa16 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Tue, 18 Oct 2022 17:30:31 +0200 Subject: [PATCH 3/3] Fix the path of documentation examples And make things cleaner globally. The assorted changes have already been merged into the website. (cherry picked from commit 162b35e4970fa27c347771d487d338697900691a) --- docs/pom.xml | 11 ++++++----- docs/src/main/asciidoc/_attributes-local.adoc | 4 ++-- docs/src/main/asciidoc/_examples/_attributes.adoc | 2 +- docs/src/main/asciidoc/_templates/_attributes.adoc | 2 +- docs/sync-web-site.sh | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) 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 bb63550351317..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"