From 79ec1a0b581104c28b306a111b7f66677770a83e Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 27 Jun 2023 12:29:41 +0200 Subject: [PATCH 1/6] Unpacking docs resources only for non CI builds; fixes gh-239 --- pom.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d286dfc7..368fd298 100644 --- a/pom.xml +++ b/pom.xml @@ -142,6 +142,7 @@ true false verify + generate-resources @@ -1057,7 +1058,7 @@ unpack-docs-resources - generate-resources + ${unpack-docs-resources.phase} unpack @@ -1659,5 +1660,18 @@ + + CI + + + CI + true + + + + + none + + From 8087edaf9a722ce4f3795685abf3ae7f9553d3a4 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 27 Jun 2023 12:48:21 +0200 Subject: [PATCH 2/6] Unpacking docs resources only for non CI builds, fixed wrong env var derefernce; fixes gh-239 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 368fd298..b4d751c3 100644 --- a/pom.xml +++ b/pom.xml @@ -1664,7 +1664,7 @@ CI - CI + env.CI true From 4bea4c590f4229bdeaa5159f28bbbfa4d01324f7 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 27 Jun 2023 13:39:12 +0200 Subject: [PATCH 3/6] Not building the docs for CI builds - we cant' fetch jars; fixes gh-239 --- pom.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b4d751c3..65c5ef7c 100644 --- a/pom.xml +++ b/pom.xml @@ -143,6 +143,7 @@ false verify generate-resources + prepare-package @@ -1222,7 +1223,7 @@ generate-html-documentation - prepare-package + ${generate-docs.phase} process-asciidoc @@ -1257,7 +1258,7 @@ generate-htmlsingle-documentation - prepare-package + ${generate-docs.phase} process-asciidoc @@ -1285,7 +1286,7 @@ generate-pdf-documentation - prepare-package + ${generate-docs.phase} process-asciidoc @@ -1369,7 +1370,7 @@ assert-no-unresolved-links - prepare-package + ${generate-docs.phase} run @@ -1671,6 +1672,8 @@ none + + none From b52dff8956c251e98c72d2a13b9825cd080a207a Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 27 Jun 2023 13:43:19 +0200 Subject: [PATCH 4/6] Revert "Not building the docs for CI builds - we cant' fetch jars; fixes gh-239" This reverts commit 4bea4c590f4229bdeaa5159f28bbbfa4d01324f7. --- pom.xml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 65c5ef7c..b4d751c3 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,6 @@ false verify generate-resources - prepare-package @@ -1223,7 +1222,7 @@ generate-html-documentation - ${generate-docs.phase} + prepare-package process-asciidoc @@ -1258,7 +1257,7 @@ generate-htmlsingle-documentation - ${generate-docs.phase} + prepare-package process-asciidoc @@ -1286,7 +1285,7 @@ generate-pdf-documentation - ${generate-docs.phase} + prepare-package process-asciidoc @@ -1370,7 +1369,7 @@ assert-no-unresolved-links - ${generate-docs.phase} + prepare-package run @@ -1672,8 +1671,6 @@ none - - none From d7f3a8f35d4091b1be53b8d07d038cb24ff5e83a Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 27 Jun 2023 14:07:14 +0200 Subject: [PATCH 5/6] Not building the docs for CI builds - we cant' fetch jars; fixes gh-239 --- pom.xml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index b4d751c3..7ce5071c 100644 --- a/pom.xml +++ b/pom.xml @@ -143,6 +143,9 @@ false verify generate-resources + prepare-package + package + package @@ -1222,7 +1225,7 @@ generate-html-documentation - prepare-package + ${generate-docs.phase} process-asciidoc @@ -1257,7 +1260,7 @@ generate-htmlsingle-documentation - prepare-package + ${generate-docs.phase} process-asciidoc @@ -1285,7 +1288,7 @@ generate-pdf-documentation - prepare-package + ${generate-docs.phase} process-asciidoc @@ -1369,7 +1372,7 @@ assert-no-unresolved-links - prepare-package + ${generate-docs.phase} run @@ -1391,7 +1394,7 @@ copy-missing-html-files - package + ${copy-missing-html-files.phase} run @@ -1406,7 +1409,7 @@ package-and-attach-docs-zip - package + ${package-and-attach-docs-zip.phase} run @@ -1671,6 +1674,10 @@ none + + none + none + none From a2e2ff90e2ff603b555a27b32f0d7745cf1bfe2b Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 27 Jun 2023 14:13:48 +0200 Subject: [PATCH 6/6] Not building the docs for CI builds - changed the env var; fixes gh-239 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7ce5071c..55511e93 100644 --- a/pom.xml +++ b/pom.xml @@ -1667,8 +1667,7 @@ CI - env.CI - true + env.GITHUB_API_URL @@ -1678,6 +1677,7 @@ none none none + none