Re: [xwiki-devs] [xwiki-notifications] r11542 - in platform: pom/trunk xwiki-tools/trunk xwiki-tools/trunk/xwiki-packager-plugin xwiki-tools/trunk/xwiki-xar-plugin xwiki-tools/trunk/xwiki-xar-plugin/src/main/java/com/xpn/xwiki/tool/xar

Author: vmassol Date: 2008-07-29 16:13:46 +0200 (Tue, 29 Jul 2008) New Revision: 11542 Modified: platform/pom/trunk/pom.xml platform/xwiki-tools/trunk/pom.xml platform/xwiki-tools/trunk/xwiki-packager-plugin/pom.xml platform/xwiki-tools/trunk/xwiki-xar-plugin/pom.xml platform/xwiki-tools/trunk/xwiki-xar-plugin/src/main/java/com/xpn/ xwiki/tool/xar/XWikiDocument.java Log: Make sure all poms are using the latest version of the tools verifications module. Otherwise it seems it's causing some problems for maven to run checkstyle on different modules with different dependency versions.

Modified: platform/pom/trunk/pom.xml =================================================================== --- platform/pom/trunk/pom.xml 2008-07-29 13:11:26 UTC (rev 11541) +++ platform/pom/trunk/pom.xml 2008-07-29 14:13:46 UTC (rev 11542) @@ -166,7 +166,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <!-- Lock down plugin version for build reproducibility --> - <version>2.1</version> + <version>2.2</version> <dependencies> <dependency> <groupId>com.xpn.xwiki.platform.tools</groupId> Modified: platform/xwiki-tools/trunk/pom.xml =================================================================== --- platform/xwiki-tools/trunk/pom.xml 2008-07-29 13:11:26 UTC (rev 11541) +++ platform/xwiki-tools/trunk/pom.xml 2008-07-29 14:13:46 UTC (rev 11542) @@ -41,6 +41,10 @@ <developerConnection>scm:svn:https://svn.xwiki.org/svnroot/xwiki/platform/xwiki-tools/trunk </developerConnection> <url>http://svn.xwiki.org/svnroot/xwiki/platform/xwiki-tools/ trunk</url> </scm> + <properties> + <!-- Versions of XWiki dependencies used in Core modules --> + <platform.tool.verification.version>1.12-SNAPSHOT</ platform.tool.verification.version> + </properties> <modules> <module>xwiki-license-resources</module> <module>xwiki-verification-resources</module> Modified: platform/xwiki-tools/trunk/xwiki-packager-plugin/pom.xml =================================================================== --- platform/xwiki-tools/trunk/xwiki-packager-plugin/pom.xml 2008-07-29 13:11:26 UTC (rev 11541) +++ platform/xwiki-tools/trunk/xwiki-packager-plugin/pom.xml 2008-07-29 14:13:46 UTC (rev 11542) @@ -60,7 +60,7 @@ <dependency> <groupId>com.xpn.xwiki.platform.tools</groupId> <artifactId>xwiki-verification-resources</artifactId> - <version>1.10-SNAPSHOT</version> + <version>${platform.tool.verification.version}</version> </dependency> </dependencies> </plugin> Modified: platform/xwiki-tools/trunk/xwiki-xar-plugin/pom.xml =================================================================== --- platform/xwiki-tools/trunk/xwiki-xar-plugin/pom.xml 2008-07-29 13:11:26 UTC (rev 11541) +++ platform/xwiki-tools/trunk/xwiki-xar-plugin/pom.xml 2008-07-29 14:13:46 UTC (rev 11542) @@ -93,7 +93,7 @@ <dependency> <groupId>com.xpn.xwiki.platform.tools</groupId> <artifactId>xwiki-verification-resources</artifactId> - <version>1.9-SNAPSHOT</version> + <version>${platform.tool.verification.version}</version> </dependency> </dependencies> </plugin> Modified: platform/xwiki-tools/trunk/xwiki-xar-plugin/src/main/java/ com/xpn/xwiki/tool/xar/XWikiDocument.java =================================================================== --- platform/xwiki-tools/trunk/xwiki-xar-plugin/src/main/java/com/ xpn/xwiki/tool/xar/XWikiDocument.java 2008-07-29 13:11:26 UTC (rev 11541) +++ platform/xwiki-tools/trunk/xwiki-xar-plugin/src/main/java/com/ xpn/xwiki/tool/xar/XWikiDocument.java 2008-07-29 14:13:46 UTC (rev 11542) @@ -67,24 +67,24 @@ Element docel = domdoc.getRootElement(); - Element name = docel.element("name"); - if (name != null) { - this.name = name.getText(); + Element elementName = docel.element("name"); + if (elementName != null) { + this.name = elementName.getText(); } - Element space = docel.element("web"); - if (space != null) { - this.space = space.getText(); + Element elementSpace = docel.element("web"); + if (elementSpace != null) { + this.space = elementSpace.getText(); } - Element language = docel.element("language"); - if (language != null) { - this.language = language.getText(); + Element elementLanguage = docel.element("elementLanguage"); + if (elementLanguage != null) { + this.language = elementLanguage.getText(); } - Element defaultLanguage = docel.element("defaultLanguage"); - if (defaultLanguage != null) { - this.defaultLanguage = defaultLanguage.getText(); + Element elementDefaultLanguage = docel.element("elementDefaultLanguage"); + if (elementDefaultLanguage != null) { + this.defaultLanguage = elementDefaultLanguage.getText(); } }