Author: lucaa Date: 2007-12-05 23:02:14 +0100 (Wed, 05 Dec 2007) New Revision: 6302
Modified: xwiki-products/xwiki-watch/trunk/database/hsqldb/pom.xml xwiki-products/xwiki-watch/trunk/database/pom.xml xwiki-products/xwiki-watch/trunk/distribution/hsqldb/pom.xml xwiki-products/xwiki-watch/trunk/distribution/pom.xml xwiki-products/xwiki-watch/trunk/pom.xml xwiki-products/xwiki-watch/trunk/web/pom.xml xwiki-products/xwiki-watch/trunk/wiki/pom.xml Log: [release] rollbacking r6301 (bad developer connection in top pom) Modified: xwiki-products/xwiki-watch/trunk/database/hsqldb/pom.xml =================================================================== --- xwiki-products/xwiki-watch/trunk/database/hsqldb/pom.xml 2007-12-05 17:22:35 UTC (rev 6301) +++ xwiki-products/xwiki-watch/trunk/database/hsqldb/pom.xml 2007-12-05 22:02:14 UTC (rev 6302) @@ -1,9 +1,33 @@ -<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";> +<!-- + * + * 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.products</groupId> <artifactId>xwiki-watch-database</artifactId> - <version>1.0-milestone-2</version> + <version>1.0-SNAPSHOT</version> </parent> <artifactId>xwiki-watch-database-hsqldb</artifactId> <name>XWiki Products - Watch - Database - HSQLDB</name> @@ -56,7 +80,7 @@ <argument>-classpath</argument> <!-- automatically creates the classpath using all project dependencies, also adding the project build directory --> - <classpath /> + <classpath/> <argument>org.hsqldb.util.DatabaseManager</argument> <argument>-driver</argument> <argument>org.hsqldb.jdbcDriver</argument> @@ -69,4 +93,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> Modified: xwiki-products/xwiki-watch/trunk/database/pom.xml =================================================================== --- xwiki-products/xwiki-watch/trunk/database/pom.xml 2007-12-05 17:22:35 UTC (rev 6301) +++ xwiki-products/xwiki-watch/trunk/database/pom.xml 2007-12-05 22:02:14 UTC (rev 6302) @@ -3,7 +3,7 @@ <parent> <groupId>com.xpn.xwiki.products</groupId> <artifactId>xwiki-watch-parent</artifactId> - <version>1.0-milestone-2</version> + <version>1.0-SNAPSHOT</version> </parent> <artifactId>xwiki-watch-database</artifactId> <name>XWiki Products - Watch - Database - Parent POM</name> Modified: xwiki-products/xwiki-watch/trunk/distribution/hsqldb/pom.xml =================================================================== --- xwiki-products/xwiki-watch/trunk/distribution/hsqldb/pom.xml 2007-12-05 17:22:35 UTC (rev 6301) +++ xwiki-products/xwiki-watch/trunk/distribution/hsqldb/pom.xml 2007-12-05 22:02:14 UTC (rev 6302) @@ -27,7 +27,7 @@ <parent> <groupId>com.xpn.xwiki.products</groupId> <artifactId>xwiki-watch-distribution</artifactId> - <version>1.0-milestone-2</version> + <version>1.0-SNAPSHOT</version> </parent> <artifactId>xwiki-watch-distribution-hsqldb</artifactId> <name>XWiki Products - Watch - Distribution - HSQLDB</name> Modified: xwiki-products/xwiki-watch/trunk/distribution/pom.xml =================================================================== --- xwiki-products/xwiki-watch/trunk/distribution/pom.xml 2007-12-05 17:22:35 UTC (rev 6301) +++ xwiki-products/xwiki-watch/trunk/distribution/pom.xml 2007-12-05 22:02:14 UTC (rev 6302) @@ -27,7 +27,7 @@ <parent> <groupId>com.xpn.xwiki.products</groupId> <artifactId>xwiki-watch-parent</artifactId> - <version>1.0-milestone-2</version> + <version>1.0-SNAPSHOT</version> </parent> <artifactId>xwiki-watch-distribution</artifactId> <name>XWiki Products - Watch - Distribution - Parent POM</name> Modified: xwiki-products/xwiki-watch/trunk/pom.xml =================================================================== --- xwiki-products/xwiki-watch/trunk/pom.xml 2007-12-05 17:22:35 UTC (rev 6301) +++ xwiki-products/xwiki-watch/trunk/pom.xml 2007-12-05 22:02:14 UTC (rev 6302) @@ -34,12 +34,12 @@ <artifactId>xwiki-watch-parent</artifactId> <packaging>pom</packaging> <name>XWiki Products - Watch - Parent POM</name> - <version>1.0-milestone-2</version> + <version>1.0-SNAPSHOT</version> <description>XWiki Products - Watch - Parent POM</description> <scm> - <connection>scm:svn:http://svnmirror.xwiki.org/svn/mirror/xwiki/xwiki-products/xwiki-watch/tags/xwiki-watch-1.0-milestone-2</connection> - <developerConnection>scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki-products/xwiki-watch/tags/xwiki-watch-1.0-milestone-2</developerConnection> - <url>http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/xwiki-products/xwiki-watch/tags/xwiki-watch-1.0-milestone-2</url> + <connection>scm:svn:http://svnmirror.xwiki.org/svn/mirror/xwiki/xwiki-products/xwiki-watch/trunk</connection> + <developerConnection>scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki-products/xwiki-watch/trunk</developerConnection> + <url>http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/xwiki-products/xwiki-watch/trunk</url> </scm> <properties> <!-- Versions of XWiki dependencies used in Watch modules --> Modified: xwiki-products/xwiki-watch/trunk/web/pom.xml =================================================================== --- xwiki-products/xwiki-watch/trunk/web/pom.xml 2007-12-05 17:22:35 UTC (rev 6301) +++ xwiki-products/xwiki-watch/trunk/web/pom.xml 2007-12-05 22:02:14 UTC (rev 6302) @@ -1,124 +1,147 @@ -<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.products</groupId> - <artifactId>xwiki-watch-parent</artifactId> - <version>1.0-milestone-2</version> - </parent> - <artifactId>xwiki-watch</artifactId> - <name>XWiki Products - Watch - Web</name> - <packaging>war</packaging> - <description>XWiki Products - Watch - Web</description> - <properties> - <gwtVersion>1.3.3</gwtVersion> - </properties> - <dependencies> +<!-- + * + * 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.products</groupId> + <artifactId>xwiki-watch-parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + <artifactId>xwiki-watch</artifactId> + <name>XWiki Products - Watch - Web</name> + <packaging>war</packaging> + <description>XWiki Products - Watch - Web</description> + <properties> + <gwtVersion>1.3.3</gwtVersion> + </properties> + <dependencies> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${gwtVersion}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwtVersion}</version> + </dependency> + <dependency> + <groupId>gwt-widgets</groupId> + <artifactId>gwt-widgets</artifactId> + <version>0.1.3</version> + </dependency> + <dependency> + <groupId>gwttk</groupId> + <artifactId>gwttk</artifactId> + <version>0.2.2</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + </dependency> + <dependency> + <groupId>com.xpn.xwiki.platform</groupId> + <artifactId>xwiki-core</artifactId> + <version>${platform.core.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.xpn.xwiki.platform</groupId> + <artifactId>xwiki-web-gwt</artifactId> + <version>${platform.web.version}</version> + </dependency> + <dependency> + <groupId>com.xpn.xwiki.platform</groupId> + <artifactId>xwiki-web-gwt</artifactId> + <version>${platform.web.version}</version> + <classifier>sources</classifier> + </dependency> <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <version>${gwtVersion}</version> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${gwtVersion}</version> - </dependency> - <dependency> - <groupId>gwt-widgets</groupId> - <artifactId>gwt-widgets</artifactId> - <version>0.1.3</version> - </dependency> - <dependency> - <groupId>gwttk</groupId> - <artifactId>gwttk</artifactId> - <version>0.2.2</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - </dependency> - <dependency> <groupId>com.xpn.xwiki.platform</groupId> - <artifactId>xwiki-core</artifactId> - <version>${platform.core.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.xpn.xwiki.platform</groupId> - <artifactId>xwiki-web-gwt</artifactId> - <version>${platform.web.version}</version> - </dependency> - <dependency> - <groupId>com.xpn.xwiki.platform</groupId> - <artifactId>xwiki-web-gwt</artifactId> - <version>${platform.web.version}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>com.xpn.xwiki.platform</groupId> <artifactId>xwiki-web-standard</artifactId> <version>${platform.web.version}</version> <type>war</type> - </dependency> + </dependency> </dependencies> - <build> - <plugins> - <!-- Download and unpack the GWT compiler --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>dependency-maven-plugin</artifactId> - <executions> - <execution> - <id>unzip-gwt-compiler</id> - <phase>initialize</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>com.google.gwt</groupId> - <artifactId>${gwtArtifactId}</artifactId> - <version>1.3.3</version> - <type>zip</type> - </artifactItem> - </artifactItems> - <outputDirectory>${java.io.tmpdir}/xwiki/gwt</outputDirectory> - </configuration> - </execution> - </executions> + <build> + <plugins> + <!-- Download and unpack the GWT compiler --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>dependency-maven-plugin</artifactId> + <executions> + <execution> + <id>unzip-gwt-compiler</id> + <phase>initialize</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>com.google.gwt</groupId> + <artifactId>${gwtArtifactId}</artifactId> + <version>1.3.3</version> + <type>zip</type> + </artifactItem> + </artifactItems> + <outputDirectory>${java.io.tmpdir}/xwiki/gwt</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> + <plugin> + <groupId>com.totsp.gwt</groupId> + <artifactId>maven-googlewebtoolkit2-plugin</artifactId> + <version>1.5.2</version> + <configuration> + <logLevel>WARN</logLevel> <!-- ERROR, WARN, INFO, TRACE, DEBUG, SPAM, ALL --> + <style>OBF</style> <!-- OBF[USCATED], PRETTY, DETAILED --> + <runTarget>com.xpn.xwiki.watch/Watch.html</runTarget> + <gwtHome>${java.io.tmpdir}/xwiki/gwt/${gwtArtifactId}-${gwtVersion}</gwtHome> + <compileTarget> + <value>com.xpn.xwiki.watch.Watch</value> + </compileTarget> + <extraJvmArgs>-Xmx1024m</extraJvmArgs> + </configuration> + <executions> + <execution> + <goals> + <goal>compile</goal> + </goals> + </execution> + </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - <plugin> - <groupId>com.totsp.gwt</groupId> - <artifactId>maven-googlewebtoolkit2-plugin</artifactId> - <version>1.5.2</version> - <configuration> - <logLevel>WARN</logLevel> <!-- ERROR, WARN, INFO, TRACE, DEBUG, SPAM, ALL --> - <style>OBF</style> <!-- OBF[USCATED], PRETTY, DETAILED --> - <runTarget>com.xpn.xwiki.watch/Watch.html</runTarget> - <gwtHome>${java.io.tmpdir}/xwiki/gwt/${gwtArtifactId}-${gwtVersion}</gwtHome> - <compileTarget> - <value>com.xpn.xwiki.watch.Watch</value> - </compileTarget> - <extraJvmArgs>-Xmx1024m</extraJvmArgs> - </configuration> - <executions> - <execution> - <goals> - <goal>compile</goal> - </goals> - </execution> - </executions> - </plugin> <!-- Inject XWiki's configuration (only xwiki.cfg, not hibernate.cfg.xml) --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -169,53 +192,54 @@ </resource> </webResources> </configuration> - </plugin> - </plugins> - </build> + </plugin> + </plugins> + </build> <profiles> - <profile> - <id>linux</id> - <activation> - <os> - <name>linux</name> - </os> - </activation> - <properties> - <gwtArtifactId>gwt-linux</gwtArtifactId> - </properties> - </profile> - <profile> - <id>solaris</id> - <activation> - <os> - <name>SunOS</name> - </os> - </activation> - <properties> - <gwtArtifactId>gwt-linux</gwtArtifactId> - </properties> - </profile> - <profile> - <id>mac</id> - <activation> - <os> - <name>mac os x</name> - </os> - </activation> - <properties> - <gwtArtifactId>gwt-mac</gwtArtifactId> - </properties> - </profile> - <profile> - <id>windows</id> - <activation> - <os> - <name>windows</name> - </os> - </activation> - <properties> - <gwtArtifactId>gwt-windows</gwtArtifactId> - </properties> - </profile> - </profiles> -</project> \ No newline at end of file + <profile> + <id>linux</id> + <activation> + <os> + <name>linux</name> + </os> + </activation> + <properties> + <gwtArtifactId>gwt-linux</gwtArtifactId> + </properties> + </profile> + <profile> + <id>solaris</id> + <activation> + <os> + <name>SunOS</name> + </os> + </activation> + <properties> + <gwtArtifactId>gwt-linux</gwtArtifactId> + </properties> + </profile> + <profile> + <id>mac</id> + <activation> + <os> + <name>mac os x</name> + </os> + </activation> + <properties> + <gwtArtifactId>gwt-mac</gwtArtifactId> + </properties> + </profile> + <profile> + <id>windows</id> + <activation> + <os> + <name>windows</name> + </os> + </activation> + <properties> + <gwtArtifactId>gwt-windows</gwtArtifactId> + </properties> + </profile> + </profiles> +</project> + Modified: xwiki-products/xwiki-watch/trunk/wiki/pom.xml =================================================================== --- xwiki-products/xwiki-watch/trunk/wiki/pom.xml 2007-12-05 17:22:35 UTC (rev 6301) +++ xwiki-products/xwiki-watch/trunk/wiki/pom.xml 2007-12-05 22:02:14 UTC (rev 6302) @@ -22,12 +22,13 @@ * --> -<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";> +<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.products</groupId> <artifactId>xwiki-watch-parent</artifactId> - <version>1.0-milestone-2</version> + <version>1.0-SNAPSHOT</version> </parent> <artifactId>xwiki-watch-wiki</artifactId> <name>XWiki Products - Watch - Wiki</name> _______________________________________________ notifications mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/notifications
