Skip to content
Snippets Groups Projects
Commit 7ca09296 authored by Vincent Massol's avatar Vincent Massol
Browse files

XWIKI-5270: Prevent backward compatibility regressions in platform/core

* Skip clirr plugin execution for rendering standalone module using the new skip config property of the clirr plugin

git-svn-id: https://svn.xwiki.org/svnroot/xwiki/platform/core/trunk@29455 f329d543-caf0-0310-9063-dda96c69346f
parent 8128f788
No related branches found
No related tags found
No related merge requests found
...@@ -161,12 +161,7 @@ ...@@ -161,12 +161,7 @@
executed, the Clirr one isn't). --> executed, the Clirr one isn't). -->
<id>clirr</id> <id>clirr</id>
<activation> <activation>
<property> <activeByDefault>true</activeByDefault>
<!-- The Clirr profile is activated by default if the clirr.skip property is not defined and when defined
if its value is different than "true" -->
<name>!clirr.skip</name>
<value>!true</value>
</property>
</activation> </activation>
<build> <build>
<plugins> <plugins>
...@@ -174,6 +169,7 @@ ...@@ -174,6 +169,7 @@
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId> <artifactId>clirr-maven-plugin</artifactId>
<configuration> <configuration>
<skip>${xwiki.clirr.skip}</skip>
<comparisonVersion>${clirr.previous.version}</comparisonVersion> <comparisonVersion>${clirr.previous.version}</comparisonVersion>
<excludes> <excludes>
<exclude>**/internal/**</exclude> <exclude>**/internal/**</exclude>
...@@ -192,6 +188,9 @@ ...@@ -192,6 +188,9 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<properties>
<xwiki.clirr.skip>false</xwiki.clirr.skip>
</properties>
</profile> </profile>
</profiles> </profiles>
</project> </project>
...@@ -150,25 +150,9 @@ ...@@ -150,25 +150,9 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile>
<!-- See platform/core/pom.xml -->
<id>clirr</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>**</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles> </profiles>
<properties>
<!-- Skip Clirr execution since this project only generates an artifact that aggregates other XWiki artifacts -->
<xwiki.clirr.skip>true</xwiki.clirr.skip>
</properties>
</project> </project>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment