Re: [xwiki-devs] [xwiki-notifications] r32162 - in platform/core/trunk: . xwiki-component/xwiki-component-observation xwiki-core xwiki-crypto xwiki-csrf xwiki-extension xwiki-management xwiki-observation/xwiki-observation-api xwiki-office xwiki-rendering/xwiki-re
On Mon, Oct 25, 2010 at 18:40, sdumitriu <[email protected]> wrote:
Author: sdumitriu Date: 2010-10-25 18:40:28 +0200 (Mon, 25 Oct 2010) New Revision: 32162
Modified: platform/core/trunk/pom.xml platform/core/trunk/xwiki-component/xwiki-component-observation/pom.xml platform/core/trunk/xwiki-core/pom.xml platform/core/trunk/xwiki-crypto/pom.xml platform/core/trunk/xwiki-csrf/pom.xml platform/core/trunk/xwiki-extension/pom.xml platform/core/trunk/xwiki-management/pom.xml platform/core/trunk/xwiki-observation/xwiki-observation-api/pom.xml platform/core/trunk/xwiki-office/pom.xml platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-container/pom.xml platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-dashboard/pom.xml platform/core/trunk/xwiki-rendering/xwiki-rendering-transformations/xwiki-rendering-transformation-icon/pom.xml platform/core/trunk/xwiki-rest/xwiki-rest-model/pom.xml platform/core/trunk/xwiki-rest/xwiki-rest-server/pom.xml Log: [misc] Updated clirr skips
Modified: platform/core/trunk/pom.xml =================================================================== --- platform/core/trunk/pom.xml 2010-10-25 16:25:07 UTC (rev 32161) +++ platform/core/trunk/pom.xml 2010-10-25 16:40:28 UTC (rev 32162) @@ -37,7 +37,7 @@ <description>XWiki Platform - Core - Parent POM</description> <properties> <!-- Versions of XWiki dependencies used in Core modules --> - <clirr.previous.version>2.5-rc-1</clirr.previous.version> + <clirr.previous.version>2.5</clirr.previous.version> </properties> <scm> <connection>scm:svn:http://svn.xwiki.org/svnroot/xwiki/platform/core/trunk</connection> @@ -194,27 +194,6 @@ exclude it for the moment. See http://bit.ly/c5Jnho Remove this exclude when the problem is fixed in CLIRR. --> <exclude>org/xwiki/officeimporter/openoffice/OpenOfficeManager$ManagerState</exclude> - <!-- To be removed when 2.5 final is released --> - <!-- 2.5RC1 was wrongly released using Java 1.6 (instead of 1.5) and we need to add those exclusions - as otherwise CLIRR complains --> - <exclude>org/xwiki/component/descriptor/ComponentInstantiationStrategy</exclude> - <exclude>org/xwiki/model/EntityType</exclude> - <exclude>org/xwiki/cache/eviction/EntryEvictionConfiguration$Algorithm</exclude> - <exclude>org/xwiki/cache/tests/CacheEntryListenerTest$EventType</exclude> - <exclude>org/xwiki/url/XWikiURLType</exclude> - <exclude>org/xwiki/rendering/listener/Format</exclude> - <exclude>org/xwiki/rendering/listener/HeaderLevel</exclude> - <exclude>org/xwiki/rendering/listener/ListType</exclude> - <exclude>org/xwiki/rendering/listener/chaining/BlockStateChainingListener$Event</exclude> - <exclude>org/xwiki/rendering/listener/chaining/EventType</exclude> - <exclude>org/xwiki/rendering/listener/chaining/EventType$*</exclude> - <exclude>org/xwiki/formula/FormulaRenderer$FontSize</exclude> - <exclude>org/xwiki/formula/FormulaRenderer$Type</exclude> - <exclude>org/xwiki/rendering/macro/toc/TocMacroParameters$Scope</exclude> - <exclude>org/xwiki/rendering/macro/include/IncludeMacroParameters$Context</exclude> - <exclude>org/xwiki/rendering/macro/wikibridge/WikiMacroVisibility</exclude> - <exclude>org/xwiki/annotation/maintainer/AnnotationState</exclude> - <exclude>org/xwiki/annotation/renderer/AnnotationEvent$AnnotationEventType</exclude> <!-- To be removed when we release 2.6 --> <exclude>org/xwiki/rendering/listener/reference/ResourceType</exclude><!-- Removed field IMAGE, Added UNKNOWN --> <exclude>org/xwiki/bridge/SkinAccessBridge</exclude><!-- New method getIconURL -->
Modified: platform/core/trunk/xwiki-component/xwiki-component-observation/pom.xml =================================================================== --- platform/core/trunk/xwiki-component/xwiki-component-observation/pom.xml 2010-10-25 16:25:07 UTC (rev 32161) +++ platform/core/trunk/xwiki-component/xwiki-component-observation/pom.xml 2010-10-25 16:40:28 UTC (rev 32162) @@ -33,10 +33,6 @@ <name>XWiki Platform - Core - Component - Observation</name> <packaging>jar</packaging> <description>XWiki Platform - Core - Component - Observation</description> - <properties> - <!-- Remove when 2.5 will be released --> - <xwiki.clirr.skip>true</xwiki.clirr.skip> - </properties> <dependencies> <dependency> <groupId>commons-logging</groupId>
Modified: platform/core/trunk/xwiki-core/pom.xml =================================================================== --- platform/core/trunk/xwiki-core/pom.xml 2010-10-25 16:25:07 UTC (rev 32161) +++ platform/core/trunk/xwiki-core/pom.xml 2010-10-25 16:40:28 UTC (rev 32162) @@ -1431,9 +1431,6 @@ <includes> <include>**/api/**</include> </includes> - <excludes> - <exclude>com/xpn/xwiki/user/api/XWikiGroupService</exclude> - </excludes> </configuration> </plugin> </plugins>
Modified: platform/core/trunk/xwiki-crypto/pom.xml =================================================================== --- platform/core/trunk/xwiki-crypto/pom.xml 2010-10-25 16:25:07 UTC (rev 32161) +++ platform/core/trunk/xwiki-crypto/pom.xml 2010-10-25 16:40:28 UTC (rev 32162) @@ -32,10 +32,6 @@ <artifactId>xwiki-core-crypto</artifactId> <name>XWiki Platform - Core - Cryptographic Services</name> <description>XWiki Platform - Core - Cryptographic Services</description> - <properties> - <!-- Skip Clirr execution, since this is a new component --> - <xwiki.clirr.skip>true</xwiki.clirr.skip> - </properties> <dependencies> <!-- Used by CryptoScriptService which provides a service to Velocity scripts --> <dependency>
Modified: platform/core/trunk/xwiki-csrf/pom.xml =================================================================== --- platform/core/trunk/xwiki-csrf/pom.xml 2010-10-25 16:25:07 UTC (rev 32161) +++ platform/core/trunk/xwiki-csrf/pom.xml 2010-10-25 16:40:28 UTC (rev 32162) @@ -33,10 +33,6 @@ <name>XWiki Platform - Core - CSRF</name> <packaging>jar</packaging> <description>XWiki CSRF Protection Module</description> - <properties> - <!-- Skip Clirr execution, since this is a new component --> - <xwiki.clirr.skip>true</xwiki.clirr.skip> - </properties> <dependencies> <dependency> <groupId>org.xwiki.platform</groupId>
Modified: platform/core/trunk/xwiki-extension/pom.xml =================================================================== --- platform/core/trunk/xwiki-extension/pom.xml 2010-10-25 16:25:07 UTC (rev 32161) +++ platform/core/trunk/xwiki-extension/pom.xml 2010-10-25 16:40:28 UTC (rev 32162) @@ -33,10 +33,6 @@ <name>XWiki Platform - Core - Extension</name> <packaging>pom</packaging> <description>XWiki Platform - Core - Extension</description> - <properties> - <!-- Remove when 2.6 will be released --> - <xwiki.clirr.skip>true</xwiki.clirr.skip> - </properties>
As you can see in the comment this is to be removed when 2.6 is released, not 2.5. The reason is that it has been refactored as several module instead of only one in 2.5 branch.
<modules> <module>xwiki-extension-api</module> <module>xwiki-extension-handlers</module>
Modified: platform/core/trunk/xwiki-management/pom.xml =================================================================== --- platform/core/trunk/xwiki-management/pom.xml 2010-10-25 16:25:07 UTC (rev 32161) +++ platform/core/trunk/xwiki-management/pom.xml 2010-10-25 16:40:28 UTC (rev 32162) @@ -56,9 +56,5 @@ </plugin> </plugins> </build> - <properties> - <!-- Skip Clirr execution since this is the first release of this module. Remove once XE 2.4 is released. --> - <xwiki.clirr.skip>true</xwiki.clirr.skip> - </properties> </project>
Modified: platform/core/trunk/xwiki-observation/xwiki-observation-api/pom.xml =================================================================== --- platform/core/trunk/xwiki-observation/xwiki-observation-api/pom.xml 2010-10-25 16:25:07 UTC (rev 32161) +++ platform/core/trunk/xwiki-observation/xwiki-observation-api/pom.xml 2010-10-25 16:40:28 UTC (rev 32162) @@ -34,10 +34,6 @@ <name>XWiki Platform - Core - Observation - API</name> <packaging>jar</packaging> <description>XWiki Platform - Core - Observation - API</description> - <properties> - <!-- Remove when 2.5 will be released --> - <xwiki.clirr.skip>true</xwiki.clirr.skip> - </properties> <dependencies> <dependency> <groupId>org.xwiki.platform</groupId>
Modified: platform/core/trunk/xwiki-office/pom.xml =================================================================== --- platform/core/trunk/xwiki-office/pom.xml 2010-10-25 16:25:07 UTC (rev 32161) +++ platform/core/trunk/xwiki-office/pom.xml 2010-10-25 16:40:28 UTC (rev 32162) @@ -64,9 +64,4 @@ </plugin> </plugins> </build> - <properties> - <!-- Skip Clirr execution because xwiki-office-viewer and xwiki-office-macro have not been released yet, and - xwiki-office-importer has been renamed. Remove once XE 2.5M2 is released. --> - <xwiki.clirr.skip>true</xwiki.clirr.skip> - </properties> </project>
Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-container/pom.xml =================================================================== --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-container/pom.xml 2010-10-25 16:25:07 UTC (rev 32161) +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-container/pom.xml 2010-10-25 16:40:28 UTC (rev 32162) @@ -50,8 +50,4 @@ </plugin> </plugins> </build> - <properties> - <!-- Skip Clirr execution since this is the first release of this module. Remove once XE 2.5 is released. --> - <xwiki.clirr.skip>true</xwiki.clirr.skip> - </properties> </project>
Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-dashboard/pom.xml =================================================================== --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-dashboard/pom.xml 2010-10-25 16:25:07 UTC (rev 32161) +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-dashboard/pom.xml 2010-10-25 16:40:28 UTC (rev 32162) @@ -56,8 +56,4 @@ <version>${project.version}</version> </dependency> </dependencies> - <properties> - <!-- Skip Clirr execution since this is the first release of this module. Remove once XE 2.5 is released. --> - <xwiki.clirr.skip>true</xwiki.clirr.skip> - </properties> </project>
Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-transformations/xwiki-rendering-transformation-icon/pom.xml =================================================================== --- platform/core/trunk/xwiki-rendering/xwiki-rendering-transformations/xwiki-rendering-transformation-icon/pom.xml 2010-10-25 16:25:07 UTC (rev 32161) +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-transformations/xwiki-rendering-transformation-icon/pom.xml 2010-10-25 16:40:28 UTC (rev 32162) @@ -34,6 +34,7 @@ <name>XWiki Platform - Core - Rendering - Transformation - Icon</name> <description>XWiki Platform - Core - Rendering - Transformation - Icon</description> <properties> + <!-- New module introduced in 2.6, remove this skip once 2.6 is released. --> <xwiki.clirr.skip>true</xwiki.clirr.skip> </properties> </project>
Modified: platform/core/trunk/xwiki-rest/xwiki-rest-model/pom.xml =================================================================== --- platform/core/trunk/xwiki-rest/xwiki-rest-model/pom.xml 2010-10-25 16:25:07 UTC (rev 32161) +++ platform/core/trunk/xwiki-rest/xwiki-rest-model/pom.xml 2010-10-25 16:40:28 UTC (rev 32162) @@ -32,10 +32,6 @@ <artifactId>xwiki-rest-model</artifactId> <name>XWiki Platform - Core - REST - Model</name> <description>The (JAXB) model for XML resource representations served by the REST module.</description> - <!-- We are disabling clirr in order to avoid errors because since we are introducing this module in 2.4, previous versions don't exist. REMOVE this line in next development cycles! --> - <properties> - <xwiki.clirr.skip>true</xwiki.clirr.skip> - </properties> <dependencies> <dependency> <groupId>javax.xml.bind</groupId>
Modified: platform/core/trunk/xwiki-rest/xwiki-rest-server/pom.xml =================================================================== --- platform/core/trunk/xwiki-rest/xwiki-rest-server/pom.xml 2010-10-25 16:25:07 UTC (rev 32161) +++ platform/core/trunk/xwiki-rest/xwiki-rest-server/pom.xml 2010-10-25 16:40:28 UTC (rev 32162) @@ -34,10 +34,6 @@ <packaging>jar</packaging> <name>XWiki Platform - Core - REST - Server</name> <description>Service for accessing XWiki through a RESTful API</description> - <!-- Since in 2.4 we moved all model classes in a separate module, skip clirr otherwise we will get plenty of "removed" errors. Re-enable it in next development cycles! --> - <properties> - <xwiki.clirr.skip>true</xwiki.clirr.skip> - </properties> <dependencies> <dependency> <groupId>javax.servlet</groupId>
_______________________________________________ notifications mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/notifications
-- Thomas Mortagne
participants (1)
-
Thomas Mortagne