Prepare release

git-svn-id: https://svn.argeo.org/slc/trunk@3944 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/pom.xml b/pom.xml
index 4d5a3bddd083af665863ba000788f0fac5388cbc..81e44407d44b76a861feffa94bd8a33297897458 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,15 +13,15 @@
        <version>0.13.0-SNAPSHOT</version>
        <properties>
                <developmentCycle>0.13</developmentCycle>
-               <version.argeo-distribution>1.1.0-SNAPSHOT</version.argeo-distribution>
-               <version.argeo-ria>0.12.5-SNAPSHOT</version.argeo-ria>
-               <version.argeo-commons>0.2.1-SNAPSHOT</version.argeo-commons>
+               <version.argeo-distribution>1.1.0</version.argeo-distribution>
+               <version.argeo-ria>0.12.5</version.argeo-ria>
+               <version.argeo-commons>0.2.1</version.argeo-commons>
                <version.equinox>3.6.1</version.equinox>
                <version.maven-bundle-plugin>2.0.1</version.maven-bundle-plugin>
-               <version.maven-argeo-osgi>0.1.29-SNAPSHOT</version.maven-argeo-osgi>
-               <version.maven-argeo-qooxdoo>1.1.0-SNAPSHOT</version.maven-argeo-qooxdoo>
-               <site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
-               <site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
+               <version.maven-argeo-osgi>0.1.29</version.maven-argeo-osgi>
+               <version.maven-argeo-qooxdoo>1.1.0</version.maven-argeo-qooxdoo>
+               <site.repoBase>file:///srv/projects/www/site</site.repoBase>
+               <site.urlBase>http://projects.argeo.org/slc/site</site.urlBase>
        </properties>
        <modules>
                <module>runtime</module>
@@ -36,14 +36,13 @@
        </modules>
        <url>${site.urlBase}/${developmentCycle}</url>
        <scm>
-               <connection>scm:svn:https://www.argeo.org/svn/slc/trunk</connection>
-               <developerConnection>scm:svn:https://www.argeo.org/svn/slc/trunk
-               </developerConnection>
-               <url>https://www.argeo.org/svn/slc/trunk</url>
+               <connection>scm:svn:https://svn.argeo.org/slc/trunk</connection>
+               <developerConnection>scm:svn:https://svn.argeo.org/slc/trunk</developerConnection>
+               <url>https://svn.argeo.org/slc/trunk</url>
        </scm>
        <issueManagement>
                <system>Bugzilla</system>
-               <url>https://www.argeo.org/bugzilla/</url>
+               <url>https://bugzilla.argeo.org</url>
        </issueManagement>
        <licenses>
                <license>
@@ -53,7 +52,7 @@
                        <comments><![CDATA[
 SLC - Software LifeCycle framework
                           
-Copyright 2010 Mathieu Baudier - Argeo SASU.
+Copyright 2010 Mathieu Baudier
 
 Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
 you may not use this file except in compliance with the License.
@@ -179,8 +178,7 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-site-plugin</artifactId>
-                               <version>2.0-beta-5</version>
-                               <!-- The site plugin is buggy with multi modules. http://jira.codehaus.org/browse/MSITE-276 -->
+                               <version>2.1.1</version>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
@@ -188,7 +186,6 @@ limitations under the License.
                                <configuration>
                                        <autoVersionSubmodules>true</autoVersionSubmodules>
                                        <releaseProfiles>release</releaseProfiles>
-                                       <goals>deploy</goals>
                                        <preparationGoals>clean install</preparationGoals>
                                </configuration>
                        </plugin>
@@ -314,10 +311,6 @@ limitations under the License.
                                <artifactId>org.argeo.slc.support.jemmy</artifactId>
                                <version>${project.version}</version>
                        </dependency>
-                       <!-- <dependency> <groupId>org.argeo.slc.runtime</groupId> <artifactId>org.argeo.slc.support.ws.client</artifactId> 
-                               <version>${project.version}</version> </dependency> <dependency> <groupId>org.argeo.slc</groupId> 
-                               <artifactId>org.argeo.slc.webapp</artifactId> <version>${project.version}</version> 
-                               <type>war</type> </dependency> -->
                        <dependency>
                                <groupId>org.argeo.slc.server</groupId>
                                <artifactId>org.argeo.slc.ria</artifactId>
@@ -329,8 +322,6 @@ limitations under the License.
                                <artifactId>org.argeo.ria.core</artifactId>
                                <version>${version.argeo-ria}</version>
                        </dependency>
-                       <!-- <dependency> <groupId>org.argeo.slc.server</groupId> <artifactId>bundles</artifactId> 
-                               <version>0.11.3-SNAPSHOT</version> <type>pom</type> </dependency> -->
                        <dependency>
                                <groupId>org.argeo.slc.server</groupId>
                                <artifactId>deploy</artifactId>

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index 4c0355e29e566fffeb054a16bcc789f63a5022c6..1de0e6b0b948c969c4926adf6ccdb26b3f4f91cc 100644 (file)
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -63,26 +63,6 @@
                                                        <job>slc-build</job>
                                                </configuration>
                                        </execution>
-                                       <execution>
-                                               <id>slc-test</id>
-                                               <phase>site</phase>
-                                               <goals>
-                                                       <goal>generate</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <job>slc-test</job>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>slc-api</id>
-                                               <phase>site</phase>
-                                               <goals>
-                                                       <goal>generate</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <job>slc-api</job>
-                                               </configuration>
-                                       </execution>
                                </executions>
                        </plugin>
                        <plugin>

diff --git a/src/site/site.xml b/src/site/site.xml
index 7ba4139212f787dad73cd457ee2d3ec34c425acd..319c562453961858283241c9328f35f882af3080 100644 (file)
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -36,12 +36,6 @@
                                        href="${project.url}/howtos/howto-executionResources.html" />
                                <item name="Attachments" href="${project.url}/howtos/howto-attachments.html" />
                        </item>
-                       <item name="Argeo RIA (Web UI)" href="${project.url}/server/org.argeo.slc.ria/index.html">
-                               <item name="API"
-                                       href="${project.url}/server/org.argeo.slc.ria/argeo-ria-api/index.html" />
-                               <item name="Browser Support"
-                                       href="${project.url}/server/org.argeo.slc.ria/argeo-ria-test/index.html" />
-                       </item>
                </menu>
                <menu ref="parent" />
                <menu ref="modules" />