Author: vmassol
Date: 2007-10-09 20:40:33 +0200 (Tue, 09 Oct 2007)
New Revision: 5338
Modified:
xwiki-products/curriki/trunk/database/pom.xml
xwiki-products/curriki/trunk/distribution/pom.xml
xwiki-products/curriki/trunk/gwt/pom.xml
xwiki-products/curriki/trunk/plugins/pom.xml
xwiki-products/curriki/trunk/pom.xml
xwiki-products/curriki/trunk/web/pom.xml
Log:
Upgrade Curriki dependencies to fix breaking build and create maven properties
to easily define dependency version in a single place (in curriki's parent pom).
Modified: xwiki-products/curriki/trunk/database/pom.xml
===================================================================
--- xwiki-products/curriki/trunk/database/pom.xml 2007-10-09 18:30:50 UTC
(rev 5337)
+++ xwiki-products/curriki/trunk/database/pom.xml 2007-10-09 18:40:33 UTC
(rev 5338)
@@ -58,8 +58,7 @@
</executions>
<configuration>
<resourceBundles>
-
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:1.5-SNAPSHOT
- </resourceBundle>
+
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}</resourceBundle>
</resourceBundles>
</configuration>
</plugin>
@@ -67,7 +66,7 @@
<plugin>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-build-xar-plugin</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>${platform.tools.version}</version>
<configuration>
<groupId>org.curriki</groupId>
<artifactId>curriki-wiki</artifactId>
@@ -86,8 +85,7 @@
<plugin>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-packager</artifactId>
- <!-- Last version using XWiki Core 1.1.x -->
- <version>1.4</version>
+ <version>${platform.tools.version}</version>
<configuration>
<sourceDirectory>${project.build.directory}/xar</sourceDirectory>
<hibernateConfig>${project.build.directory}/maven-shared-archive-resources/hibernate.cfg.xml</hibernateConfig>
Modified: xwiki-products/curriki/trunk/distribution/pom.xml
===================================================================
--- xwiki-products/curriki/trunk/distribution/pom.xml 2007-10-09 18:30:50 UTC
(rev 5337)
+++ xwiki-products/curriki/trunk/distribution/pom.xml 2007-10-09 18:40:33 UTC
(rev 5338)
@@ -43,7 +43,7 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-jetty-resources</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>${platform.tools.version}</version>
</dependency>
<!-- Add the database JAR so that it's included in the expanded WAR since
it's not included
by default in the Curriki WAR. -->
@@ -70,7 +70,7 @@
</executions>
<configuration>
<resourceBundles>
-
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:1.5-SNAPSHOT</resourceBundle>
+
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}</resourceBundle>
</resourceBundles>
</configuration>
</plugin>
Modified: xwiki-products/curriki/trunk/gwt/pom.xml
===================================================================
--- xwiki-products/curriki/trunk/gwt/pom.xml 2007-10-09 18:30:50 UTC (rev
5337)
+++ xwiki-products/curriki/trunk/gwt/pom.xml 2007-10-09 18:40:33 UTC (rev
5338)
@@ -87,7 +87,7 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-web-gwt</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${platform.web.version}</version>
<!-- This JAR is used to generate JS files and shouldn't be included in
the server side
WAR. However an issue in the GWT maven plugin prevents it from
working with
"provided" scope. See
http://code.google.com/p/gwt-maven/issues/detail?id=46. When
@@ -96,7 +96,7 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-web-gwt</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${platform.web.version}</version>
<classifier>sources</classifier>
<!-- This JAR is used to generate JS files and shouldn't be included in
the server side
WAR. However an issue in the GWT maven plugin prevents it from
working with
@@ -106,7 +106,7 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-core</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${platform.core.version}</version>
<!-- We don't want all the Core libs to be put in WEB-INF/lib as this
GWT WAR will be
overlayed with the Standard WAR which already contains all the
required libs -->
<scope>provided</scope>
Modified: xwiki-products/curriki/trunk/plugins/pom.xml
===================================================================
--- xwiki-products/curriki/trunk/plugins/pom.xml 2007-10-09 18:30:50 UTC
(rev 5337)
+++ xwiki-products/curriki/trunk/plugins/pom.xml 2007-10-09 18:40:33 UTC
(rev 5338)
@@ -39,7 +39,7 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-core</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${platform.core.version}</version>
</dependency>
</dependencies>
<modules>
Modified: xwiki-products/curriki/trunk/pom.xml
===================================================================
--- xwiki-products/curriki/trunk/pom.xml 2007-10-09 18:30:50 UTC (rev
5337)
+++ xwiki-products/curriki/trunk/pom.xml 2007-10-09 18:40:33 UTC (rev
5338)
@@ -42,6 +42,12 @@
<developerConnection>scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-applications/curriki/trunk</developerConnection>
<url>http://svn.xwiki.org/svnroot/xwiki/xwiki-applications/curriki/trunk</url>
</scm>
+ <properties>
+ <!-- Versions of XWiki dependencies used in Curriki modules -->
+ <platform.tools.version>1.7-SNAPSHOT</platform.tools.version>
+ <platform.core.version>1.1-SNAPSHOT</platform.core.version>
+ <platform.web.version>1.1-SNAPSHOT</platform.web.version>
+ </properties>
<profiles>
<profile>
<id>default</id>
@@ -71,14 +77,14 @@
<extension>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-build-xar-handlers</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>${platform.tools.version}</version>
</extension>
</extensions>
<plugins>
<plugin>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-build-xar-plugin</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>${platform.tools.version}</version>
</plugin>
</plugins>
</build>
Modified: xwiki-products/curriki/trunk/web/pom.xml
===================================================================
--- xwiki-products/curriki/trunk/web/pom.xml 2007-10-09 18:30:50 UTC (rev
5337)
+++ xwiki-products/curriki/trunk/web/pom.xml 2007-10-09 18:40:33 UTC (rev
5338)
@@ -37,7 +37,7 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-web-standard</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${platform.web.version}</version>
<type>war</type>
</dependency>
<dependency>
@@ -82,7 +82,7 @@
</executions>
<configuration>
<resourceBundles>
-
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:1.5-SNAPSHOT</resourceBundle>
+
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}</resourceBundle>
</resourceBundles>
<properties>
<xwikiCfgEditCommentMandatory>1</xwikiCfgEditCommentMandatory>
_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications
