Author: tmortagne
Date: 2007-11-10 20:39:06 +0100 (Sat, 10 Nov 2007)
New Revision: 5813
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/exo/pom.xml
xwiki-platform/web/branches/xwiki-web-1.1/pom.xml
xwiki-platform/web/branches/xwiki-web-1.1/standard/pom.xml
Log:
Fix version dependencies after Platform/XE 1.1.2 release.
Modified: xwiki-platform/web/branches/xwiki-web-1.1/exo/pom.xml
===================================================================
--- xwiki-platform/web/branches/xwiki-web-1.1/exo/pom.xml 2007-11-10
19:26:39 UTC (rev 5812)
+++ xwiki-platform/web/branches/xwiki-web-1.1/exo/pom.xml 2007-11-10
19:39:06 UTC (rev 5813)
@@ -74,7 +74,7 @@
</executions>
<configuration>
<resourceBundles>
-
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:1.7</resourceBundle>
+
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}</resourceBundle>
</resourceBundles>
<properties>
<xwikiCfgExo>1</xwikiCfgExo>
Modified: xwiki-platform/web/branches/xwiki-web-1.1/pom.xml
===================================================================
--- xwiki-platform/web/branches/xwiki-web-1.1/pom.xml 2007-11-10 19:26:39 UTC
(rev 5812)
+++ xwiki-platform/web/branches/xwiki-web-1.1/pom.xml 2007-11-10 19:39:06 UTC
(rev 5813)
@@ -25,7 +25,7 @@
<parent>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki</artifactId>
- <version>6</version>
+ <version>7-SNAPSHOT</version>
</parent>
<artifactId>xwiki-web</artifactId>
<version>1.1-SNAPSHOT</version>
@@ -37,6 +37,11 @@
<developerConnection>scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/branches/xwiki-web-1.1</developerConnection>
<url>http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/branches/xwiki-web-1.1</url>
</scm>
+ <properties>
+ <!-- Versions of XWiki dependencies used in XEM modules -->
+ <platform.tools.version>1.8-SNAPSHOT</platform.tools.version>
+ <platform.core.version>1.1-SNAPSHOT</platform.core.version>
+ </properties>
<profiles>
<profile>
<id>default</id>
Modified: xwiki-platform/web/branches/xwiki-web-1.1/standard/pom.xml
===================================================================
--- xwiki-platform/web/branches/xwiki-web-1.1/standard/pom.xml 2007-11-10
19:26:39 UTC (rev 5812)
+++ xwiki-platform/web/branches/xwiki-web-1.1/standard/pom.xml 2007-11-10
19:39:06 UTC (rev 5813)
@@ -13,7 +13,7 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-core</artifactId>
- <version>1.1.2</version>
+ <version>${platform.core.version}</version>
</dependency>
<!-- Add the GWT JAR so that XWiki Core is GWT-ready and so that the XWiki
GWT Servlet can
be activated by default in web.xml -->
@@ -49,7 +49,7 @@
</executions>
<configuration>
<resourceBundles>
-
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:1.7</resourceBundle>
+
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}</resourceBundle>
</resourceBundles>
<properties>
<xwikiDbConnectionUrl>none</xwikiDbConnectionUrl>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
