Author: vmassol
Date: 2008-02-25 14:59:21 +0100 (Mon, 25 Feb 2008)
New Revision: 7929
Modified:
xwiki-platform/xwiki-tools/trunk/xwiki-packager-plugin/pom.xml
xwiki-platform/xwiki-tools/trunk/xwiki-packager-plugin/src/it/basic-import-export/goals.txt
xwiki-platform/xwiki-tools/trunk/xwiki-packager-plugin/src/it/basic-import-export/pom.xml
xwiki-products/xwiki-enterprise-manager/trunk/database/pom.xml
xwiki-products/xwiki-enterprise/trunk/database/pom.xml
Log:
XWIKI-2134: Cannot rollback a document to its first revision
* Upgraded to Core dep 1.3-SNAPSHOT in the Packager module.
Modified: xwiki-platform/xwiki-tools/trunk/xwiki-packager-plugin/pom.xml
===================================================================
--- xwiki-platform/xwiki-tools/trunk/xwiki-packager-plugin/pom.xml
2008-02-25 13:57:29 UTC (rev 7928)
+++ xwiki-platform/xwiki-tools/trunk/xwiki-packager-plugin/pom.xml
2008-02-25 13:59:21 UTC (rev 7929)
@@ -46,10 +46,7 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-core</artifactId>
- <!-- Note: We have to use 1.1-SNAPSHOT and not 1.2-SNAPSHOT here since
the 1.1 branch of
- XWiki is using the packager and is not compatible with Core
1.2-SNAPSHOT. Ideally the
- Packager should be branched too -->
- <version>1.1.2</version>
+ <version>1.3-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Modified:
xwiki-platform/xwiki-tools/trunk/xwiki-packager-plugin/src/it/basic-import-export/goals.txt
===================================================================
---
xwiki-platform/xwiki-tools/trunk/xwiki-packager-plugin/src/it/basic-import-export/goals.txt
2008-02-25 13:57:29 UTC (rev 7928)
+++
xwiki-platform/xwiki-tools/trunk/xwiki-packager-plugin/src/it/basic-import-export/goals.txt
2008-02-25 13:59:21 UTC (rev 7929)
@@ -1 +1 @@
-clean com.xpn.xwiki.platform:xwiki-packager-plugin:import
com.xpn.xwiki.platform:xwiki-packager-plugin:export
+clean package
\ No newline at end of file
Modified:
xwiki-platform/xwiki-tools/trunk/xwiki-packager-plugin/src/it/basic-import-export/pom.xml
===================================================================
---
xwiki-platform/xwiki-tools/trunk/xwiki-packager-plugin/src/it/basic-import-export/pom.xml
2008-02-25 13:57:29 UTC (rev 7928)
+++
xwiki-platform/xwiki-tools/trunk/xwiki-packager-plugin/src/it/basic-import-export/pom.xml
2008-02-25 13:59:21 UTC (rev 7929)
@@ -1,11 +1,35 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ *
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.xpn.xwiki.platform</groupId>
- <artifactId>xwiki</artifactId>
- <version>5</version>
+ <groupId>com.xpn.xwiki.platform.tools</groupId>
+ <artifactId>xwiki-tools</artifactId>
+ <version>7-SNAPSHOT</version>
</parent>
- <groupId>com.xpn.xwiki.platform</groupId>
+ <groupId>com.xpn.xwiki.platform.tools</groupId>
<artifactId>xwiki-backup-sample-basic-import-export</artifactId>
<packaging>pom</packaging>
<name>Maven XWiki Backup Plugin Basic Import/Export Sample</name>
@@ -24,7 +48,7 @@
</goals>
<configuration>
<resourceBundles>
-
<resourceBundle>com.xpn.xwiki.platform.tools:xwiki-configuration-resources:1.7</resourceBundle>
+
<resourceBundle>com.xpn.xwiki.platform.tools:xwiki-configuration-resources:1.10-SNAPSHOT</resourceBundle>
</resourceBundles>
<properties>
<xwikiDbConnectionUrl>jdbc:hsqldb:mem:.</xwikiDbConnectionUrl>
@@ -36,6 +60,7 @@
<plugin>
<groupId>com.xpn.xwiki.platform.tools</groupId>
<artifactId>xwiki-packager-plugin</artifactId>
+ <version>1.9-SNAPSHOT</version>
<configuration>
<hibernateConfig>${project.build.directory}/maven-shared-archive-resources/hibernate.cfg.xml</hibernateConfig>
</configuration>
@@ -45,7 +70,31 @@
<artifactId>hsqldb</artifactId>
<version>1.8.0.7</version>
</dependency>
+ <!-- We need the Servlet API dep since it's used by the Packager and
since it has
+ a provided scope in XWiki core it's not inherited as part of
transitive deps -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
+ <executions>
+ <execution>
+ <id>import</id>
+ <phase>package</phase>
+ <goals>
+ <goal>import</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>export</id>
+ <phase>package</phase>
+ <goals>
+ <goal>export</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: xwiki-products/xwiki-enterprise/trunk/database/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise/trunk/database/pom.xml 2008-02-25
13:57:29 UTC (rev 7928)
+++ xwiki-products/xwiki-enterprise/trunk/database/pom.xml 2008-02-25
13:59:21 UTC (rev 7929)
@@ -99,6 +99,14 @@
<artifactId>${xwiki.db.jdbc.artifactId}</artifactId>
<version>${xwiki.db.jdbc.version}</version>
</dependency>
+ <!-- We need the Servlet API dep since it's used by the Packager
and since it has
+ a provided scope in XWiki core it's not inherited as part of
transitive deps -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<executions>
<execution>
Modified: xwiki-products/xwiki-enterprise-manager/trunk/database/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise-manager/trunk/database/pom.xml
2008-02-25 13:57:29 UTC (rev 7928)
+++ xwiki-products/xwiki-enterprise-manager/trunk/database/pom.xml
2008-02-25 13:59:21 UTC (rev 7929)
@@ -100,6 +100,14 @@
<artifactId>${xwiki.db.jdbc.artifactId}</artifactId>
<version>${xwiki.db.jdbc.version}</version>
</dependency>
+ <!-- We need the Servlet API dep since it's used by the Packager
and since it has
+ a provided scope in XWiki core it's not inherited as part of
transitive deps -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<executions>
<execution>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
