From 1bf347f538f6015e5fd41dfd52d72c36811806a7 Mon Sep 17 00:00:00 2001 From: Thomas Mortagne Date: Thu, 21 Mar 2024 17:41:18 +0100 Subject: [PATCH 1/5] XRENDERING-742: Stop warn about failure to get a macro when preparing a XDOM * keep the log but at debug level --- .../internal/transformation/macro/MacroTransformation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/internal/transformation/macro/MacroTransformation.java b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/internal/transformation/macro/MacroTransformation.java index 1c5b2dacc..37bc6bda3 100644 --- a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/internal/transformation/macro/MacroTransformation.java +++ b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/internal/transformation/macro/MacroTransformation.java @@ -393,7 +393,7 @@ private void prepare(Block block, Syntax parentSyntax) try { macro = this.macroManager.getMacro(new MacroId(macroBlock.getId(), currentSyntax)); } catch (Exception e) { - this.logger.warn( + this.logger.debug( "Failed to get the macro with identifier [{}] for syntax [{}] (this macro block won't be prepared): {}", macroBlock.getId(), currentSyntax, ExceptionUtils.getRootCauseMessage(e)); } From 576209a404664487dfca7e0afd4b110f456cffe6 Mon Sep 17 00:00:00 2001 From: Thomas Mortagne Date: Fri, 22 Mar 2024 09:52:07 +0100 Subject: [PATCH 2/5] XRENDERING-742: Stop warn about failure to get a macro when preparing a XDOM --- .../macro/MacroTransformationTest.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/test/java/org/xwiki/rendering/internal/transformation/macro/MacroTransformationTest.java b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/test/java/org/xwiki/rendering/internal/transformation/macro/MacroTransformationTest.java index 75cea5a4a..2910e2b66 100644 --- a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/test/java/org/xwiki/rendering/internal/transformation/macro/MacroTransformationTest.java +++ b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/test/java/org/xwiki/rendering/internal/transformation/macro/MacroTransformationTest.java @@ -29,7 +29,6 @@ import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.RegisterExtension; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.xwiki.rendering.block.Block; @@ -41,9 +40,7 @@ import org.xwiki.rendering.renderer.printer.WikiPrinter; import org.xwiki.rendering.syntax.Syntax; import org.xwiki.rendering.transformation.TransformationContext; -import org.xwiki.test.LogLevel; import org.xwiki.test.annotation.AllComponents; -import org.xwiki.test.junit5.LogCaptureExtension; import org.xwiki.test.junit5.mockito.ComponentTest; import org.xwiki.test.junit5.mockito.InjectComponentManager; import org.xwiki.test.junit5.mockito.InjectMockComponents; @@ -69,9 +66,6 @@ class MacroTransformationTest @Named("macro") private MacroTransformation transformation; - @RegisterExtension - private LogCaptureExtension logCapture = new LogCaptureExtension(LogLevel.WARN); - /** * Test that a simple macro is correctly evaluated. */ @@ -382,11 +376,5 @@ void prepareNotExistingMacro() this.transformation.prepare(dom); assertTrue(macroBlock.getAttributes().isEmpty()); - - assertEquals( - "Failed to get the macro with identifier [notexisting] for syntax [null]" - + " (this macro block won't be prepared):" - + " MacroNotFoundException: No macro [notexisting] could be found.", - this.logCapture.getMessage(0)); } } From ad7c77b09302889b56d0764138a12d7168c88e3e Mon Sep 17 00:00:00 2001 From: Thomas Mortagne Date: Tue, 2 Apr 2024 18:46:52 +0200 Subject: [PATCH 3/5] XCOMMONS-2983: Introduce a dedicated nexus instance for snapshots --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5c0d9974e..79d8ba0f4 100644 --- a/pom.xml +++ b/pom.xml @@ -318,8 +318,8 @@ xwiki-snapshots - XWiki Nexus Plugin Snapshot Repository Proxy - https://nexus.xwiki.org/nexus/content/groups/public-snapshots + XWiki Nexus Plugin Snapshot Repository + https://nexus-snapshots.xwiki.org/repository/snapshots false @@ -342,8 +342,8 @@ xwiki-snapshots - XWiki Nexus Snapshot Repository Proxy - https://nexus.xwiki.org/nexus/content/groups/public-snapshots + XWiki Nexus Snapshot Repository + https://nexus-snapshots.xwiki.org/repository/snapshots false From 0f7a13d84e08f8e4b7448eac56d7d59464f033fe Mon Sep 17 00:00:00 2001 From: Thomas Mortagne Date: Thu, 4 Apr 2024 17:49:37 +0200 Subject: [PATCH 4/5] [Misc] Move to develocity-maven-extension --- .mvn/extensions.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 8d77fefe4..21d7ab92d 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -23,8 +23,8 @@ com.gradle - gradle-enterprise-maven-extension - 1.20.1 + develocity-maven-extension + 1.21 com.gradle From 91030e57e8720d607dcc16e019cfa09ccc595528 Mon Sep 17 00:00:00 2001 From: Thomas Mortagne Date: Fri, 5 Apr 2024 10:10:58 +0200 Subject: [PATCH 5/5] [Misc] Move to develocity-maven-extension --- .mvn/{gradle-enterprise.xml => develocity.xml} | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename .mvn/{gradle-enterprise.xml => develocity.xml} (82%) diff --git a/.mvn/gradle-enterprise.xml b/.mvn/develocity.xml similarity index 82% rename from .mvn/gradle-enterprise.xml rename to .mvn/develocity.xml index 4646b5ae4..14ae38b17 100644 --- a/.mvn/gradle-enterprise.xml +++ b/.mvn/develocity.xml @@ -20,9 +20,9 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - + https://ge.xwiki.org @@ -31,11 +31,11 @@ - #{env['CI'] == null ? 'ON_DEMAND' : 'ALWAYS'} + true - #{env['CI'] == null} + - #{env['CI'] == null} + true - #{isTrue(env['CI']) and isTrue(env['GRADLE_ENTERPRISE_ACCESS_KEY'])} + @@ -63,4 +63,4 @@ - +