Author: dward
Date: 2008-02-19 17:20:44 +0100 (Tue, 19 Feb 2008)
New Revision: 7852
Modified:
trunks/pom.xml
xwiki-platform/web/branches/xwiki-web-1.2/pom.xml
xwiki-platform/xwiki-plugins/trunk/pom.xml
xwiki-platform/xwiki-plugins/trunk/spacemanager/
xwiki-platform/xwiki-plugins/trunk/spacemanager/pom.xml
xwiki-products/curriki/trunk/plugins/activitystream/
xwiki-products/curriki/trunk/plugins/activitystream/pom.xml
xwiki-products/curriki/trunk/plugins/asset/pom.xml
xwiki-products/curriki/trunk/plugins/currikiactivitystream/
xwiki-products/curriki/trunk/plugins/currikiactivitystream/pom.xml
xwiki-products/curriki/trunk/plugins/currikispacemanager/
xwiki-products/curriki/trunk/plugins/currikispacemanager/pom.xml
xwiki-products/curriki/trunk/plugins/invitationmanager/
xwiki-products/curriki/trunk/plugins/invitationmanager/pom.xml
xwiki-products/curriki/trunk/plugins/pom.xml
xwiki-products/curriki/trunk/pom.xml
xwiki-products/curriki/trunk/web/pom.xml
Log:
- CURRIKI: Migrate Curriki from using xwiki 1.1 branch to 1.2 branch
Modified: trunks/pom.xml
===================================================================
--- trunks/pom.xml 2008-02-19 16:14:17 UTC (rev 7851)
+++ trunks/pom.xml 2008-02-19 16:20:44 UTC (rev 7852)
@@ -84,7 +84,6 @@
<module>xwiki-platform-core</module>
<module>xwiki-platform-plugins</module>
<module>xwiki-platform-web</module>
- <module>xwiki-platform-applications</module>
<module>xwiki-product-curriki</module>
</modules>
</profile>
Modified: xwiki-platform/web/branches/xwiki-web-1.2/pom.xml
===================================================================
--- xwiki-platform/web/branches/xwiki-web-1.2/pom.xml 2008-02-19 16:14:17 UTC
(rev 7851)
+++ xwiki-platform/web/branches/xwiki-web-1.2/pom.xml 2008-02-19 16:20:44 UTC
(rev 7852)
@@ -74,5 +74,13 @@
<module>standard</module>
</modules>
</profile>
+ <profile>
+ <!-- Curriki -->
+ <id>curriki</id>
+ <modules>
+ <module>gwt</module>
+ <module>standard</module>
+ </modules>
+ </profile>
</profiles>
</project>
Modified: xwiki-platform/xwiki-plugins/trunk/pom.xml
===================================================================
--- xwiki-platform/xwiki-plugins/trunk/pom.xml 2008-02-19 16:14:17 UTC (rev
7851)
+++ xwiki-platform/xwiki-plugins/trunk/pom.xml 2008-02-19 16:20:44 UTC (rev
7852)
@@ -79,5 +79,14 @@
<module>wiki-manager</module>
</modules>
</profile>
+ <profile>
+ <!-- Curriki -->
+ <id>curriki</id>
+ <modules>
+ <module>scheduler</module>
+ <module>mailsender</module>
+ <module>spacemanager</module>
+ </modules>
+ </profile>
</profiles>
</project>
Property changes on: xwiki-platform/xwiki-plugins/trunk/spacemanager
___________________________________________________________________
Name: svn:ignore
+ target
xwiki.log
Modified: xwiki-platform/xwiki-plugins/trunk/spacemanager/pom.xml
===================================================================
--- xwiki-platform/xwiki-plugins/trunk/spacemanager/pom.xml 2008-02-19
16:14:17 UTC (rev 7851)
+++ xwiki-platform/xwiki-plugins/trunk/spacemanager/pom.xml 2008-02-19
16:20:44 UTC (rev 7852)
@@ -32,7 +32,7 @@
<version>4-SNAPSHOT</version>
</parent>
<artifactId>xwiki-plugin-spacemanager</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<name>XWiki Platform - Plugins - Space Manager</name>
<packaging>jar</packaging>
<description>XWiki Platform - Plugins - Space Manager</description>
@@ -40,7 +40,7 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-core</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jmock</groupId>
@@ -53,5 +53,13 @@
<artifactId>xwiki-plugin-mailsender</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <!-- Note: The 2.4 version is not technically correct as 2.4 corresponds
to a specification
+ # and is not an implementation version. The central repo would need
to be fixed... -->
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Property changes on: xwiki-products/curriki/trunk/plugins/activitystream
___________________________________________________________________
Name: svn:ignore
+ target
Modified: xwiki-products/curriki/trunk/plugins/activitystream/pom.xml
===================================================================
--- xwiki-products/curriki/trunk/plugins/activitystream/pom.xml 2008-02-19
16:14:17 UTC (rev 7851)
+++ xwiki-products/curriki/trunk/plugins/activitystream/pom.xml 2008-02-19
16:20:44 UTC (rev 7852)
@@ -32,7 +32,7 @@
<version>4-SNAPSHOT</version>
</parent>
<artifactId>xwiki-plugin-activitystream</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<name>XWiki Platform - Plugins - Activity Stream</name>
<packaging>jar</packaging>
<description>XWiki Platform - Plugins - Activity Stream</description>
@@ -40,7 +40,8 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-core</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
Modified: xwiki-products/curriki/trunk/plugins/asset/pom.xml
===================================================================
--- xwiki-products/curriki/trunk/plugins/asset/pom.xml 2008-02-19 16:14:17 UTC
(rev 7851)
+++ xwiki-products/curriki/trunk/plugins/asset/pom.xml 2008-02-19 16:20:44 UTC
(rev 7852)
@@ -50,6 +50,14 @@
<artifactId>curriki-plugin-mimetype</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <!-- Note: The 2.4 version is not technically correct as 2.4 corresponds
to a specification
+ # and is not an implementation version. The central repo would need
to be fixed... -->
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Property changes on: xwiki-products/curriki/trunk/plugins/currikiactivitystream
___________________________________________________________________
Name: svn:ignore
+ target
Modified: xwiki-products/curriki/trunk/plugins/currikiactivitystream/pom.xml
===================================================================
--- xwiki-products/curriki/trunk/plugins/currikiactivitystream/pom.xml
2008-02-19 16:14:17 UTC (rev 7851)
+++ xwiki-products/curriki/trunk/plugins/currikiactivitystream/pom.xml
2008-02-19 16:20:44 UTC (rev 7852)
@@ -32,7 +32,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>curriki-plugin-activitystream</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<name>XWiki Products - Curriki - Plugins - Activity Stream</name>
<packaging>jar</packaging>
<description>XWiki Products - Curriki - Plugins - Activity
Stream</description>
@@ -40,7 +40,8 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-core</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${platform.core.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
@@ -56,7 +57,7 @@
<dependency>
<groupId>com.xpn.xwiki.platform.plugins</groupId>
<artifactId>xwiki-plugin-activitystream</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Property changes on: xwiki-products/curriki/trunk/plugins/currikispacemanager
___________________________________________________________________
Name: svn:ignore
+ target
Modified: xwiki-products/curriki/trunk/plugins/currikispacemanager/pom.xml
===================================================================
--- xwiki-products/curriki/trunk/plugins/currikispacemanager/pom.xml
2008-02-19 16:14:17 UTC (rev 7851)
+++ xwiki-products/curriki/trunk/plugins/currikispacemanager/pom.xml
2008-02-19 16:20:44 UTC (rev 7852)
@@ -32,7 +32,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>curriki-plugin-spacemanager</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<name>XWiki Products - Curriki - Plugins - Space Manager</name>
<packaging>jar</packaging>
<description>XWiki Products - Curriki - Plugins - Space Manager</description>
@@ -40,7 +40,8 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-core</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${platform.core.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
@@ -56,12 +57,12 @@
<dependency>
<groupId>com.xpn.xwiki.platform.plugins</groupId>
<artifactId>xwiki-plugin-spacemanager</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.xpn.xwiki.platform.plugins</groupId>
<artifactId>xwiki-plugin-invitationmanager</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Property changes on: xwiki-products/curriki/trunk/plugins/invitationmanager
___________________________________________________________________
Name: svn:ignore
+ target
xwiki.log
Modified: xwiki-products/curriki/trunk/plugins/invitationmanager/pom.xml
===================================================================
--- xwiki-products/curriki/trunk/plugins/invitationmanager/pom.xml
2008-02-19 16:14:17 UTC (rev 7851)
+++ xwiki-products/curriki/trunk/plugins/invitationmanager/pom.xml
2008-02-19 16:20:44 UTC (rev 7852)
@@ -32,7 +32,7 @@
<version>4-SNAPSHOT</version>
</parent>
<artifactId>xwiki-plugin-invitationmanager</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<name>XWiki Platform - Plugins - Invitation Manager</name>
<packaging>jar</packaging>
<description>XWiki Platform - Plugins - Invitation Manager</description>
@@ -40,7 +40,8 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-core</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
@@ -51,12 +52,20 @@
<dependency>
<groupId>com.xpn.xwiki.platform.plugins</groupId>
<artifactId>xwiki-plugin-spacemanager</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.xpn.xwiki.platform.plugins</groupId>
<artifactId>xwiki-plugin-mailsender</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <!-- Note: The 2.4 version is not technically correct as 2.4 corresponds
to a specification
+ # and is not an implementation version. The central repo would need
to be fixed... -->
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: xwiki-products/curriki/trunk/plugins/pom.xml
===================================================================
--- xwiki-products/curriki/trunk/plugins/pom.xml 2008-02-19 16:14:17 UTC
(rev 7851)
+++ xwiki-products/curriki/trunk/plugins/pom.xml 2008-02-19 16:20:44 UTC
(rev 7852)
@@ -40,6 +40,7 @@
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-core</artifactId>
<version>${platform.core.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
<modules>
Modified: xwiki-products/curriki/trunk/pom.xml
===================================================================
--- xwiki-products/curriki/trunk/pom.xml 2008-02-19 16:14:17 UTC (rev
7851)
+++ xwiki-products/curriki/trunk/pom.xml 2008-02-19 16:20:44 UTC (rev
7852)
@@ -45,8 +45,8 @@
<properties>
<!-- Versions of XWiki dependencies used in Curriki modules -->
<platform.tools.version>1.7</platform.tools.version>
- <platform.core.version>1.1-SNAPSHOT</platform.core.version>
- <platform.web.version>1.1-SNAPSHOT</platform.web.version>
+ <platform.core.version>1.2-SNAPSHOT</platform.core.version>
+ <platform.web.version>1.2-SNAPSHOT</platform.web.version>
</properties>
<profiles>
<profile>
Modified: xwiki-products/curriki/trunk/web/pom.xml
===================================================================
--- xwiki-products/curriki/trunk/web/pom.xml 2008-02-19 16:14:17 UTC (rev
7851)
+++ xwiki-products/curriki/trunk/web/pom.xml 2008-02-19 16:20:44 UTC (rev
7852)
@@ -57,23 +57,28 @@
</dependency>
<dependency>
<groupId>com.xpn.xwiki.platform.plugins</groupId>
+ <artifactId>xwiki-plugin-scheduler</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.xpn.xwiki.platform.plugins</groupId>
<artifactId>xwiki-plugin-spacemanager</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.curriki</groupId>
<artifactId>curriki-plugin-spacemanager</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.xpn.xwiki.platform.plugins</groupId>
<artifactId>xwiki-plugin-invitationmanager</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.curriki</groupId>
<artifactId>curriki-plugin-activitystream</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
