Fix OSGi boot

[lgpl/argeo-commons.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index d0c75d76bebb9fb47a299c56db355757494cb4da..d9930cd8b89adb090ef114b05a921ade25bdc04b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,21 +9,30 @@
        </parent>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>0.2.3-SNAPSHOT</version>
+       <version>0.3.4-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <properties>
-               <developmentCycle>0.2</developmentCycle>
-               <version.argeo-distribution>1.1.3</version.argeo-distribution>
-               <version.argeo-commons>0.2.3-SNAPSHOT</version.argeo-commons>
-               <version.argeo-ria>0.12.5</version.argeo-ria>
+               <developmentCycle>0.3</developmentCycle>
+               <version.argeo-distribution>1.1.6</version.argeo-distribution>
+               <version.argeo-commons>0.3.4-SNAPSHOT</version.argeo-commons>
                <version.equinox>3.6.2</version.equinox>
-               <version.maven-argeo-osgi>0.1.31</version.maven-argeo-osgi>
-               <version.maven-bundle-plugin>2.2.0</version.maven-bundle-plugin>
+               <!-- maven -->
+               <version.maven-argeo-osgi>1.0.33</version.maven-argeo-osgi>
                <version.maven-argeo-qooxdoo>1.1.1</version.maven-argeo-qooxdoo>
+               <!-- distribution -->
                <site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
                <site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
+               <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/6/x86_64</rpm.stagingRepository>
        </properties>
+       <modules>
+               <module>basic</module>
+               <module>osgi</module>
+               <module>server</module>
+               <module>eclipse</module>
+               <module>security</module>
+               <module>demo</module>
+       </modules>
        <url>${site.urlBase}/${developmentCycle}</url>
        <scm>
                <connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
@@ -36,9 +45,9 @@
                        <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
                        <distribution>repo</distribution>
                        <comments><![CDATA[
-SLC - Software LifeCycle framework
+Argeo Commons Enterprise Framework
                           
-Copyright 2010 Mathieu Baudier
+Copyright 2011 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.
@@ -69,20 +78,18 @@ limitations under the License.
                        </roles>
                </developer>
        </developers>
-       <modules>
-               <module>basic</module>
-               <module>osgi</module>
-               <module>server</module>
-               <module>eclipse</module>
-               <module>security</module>
-               <module>gis</module>
-               <module>sandbox</module>
-       </modules>
        <build>
+               <extensions>
+                       <extension>
+                               <groupId>org.apache.maven.wagon</groupId>
+                               <artifactId>wagon-webdav</artifactId>
+                               <version>1.0-beta-2</version>
+                       </extension>
+               </extensions>
                <pluginManagement>
                        <plugins>
+                               <!-- Maven -->
                                <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-compiler-plugin</artifactId>
                                        <version>2.3.2</version>
                                        <configuration>
@@ -91,7 +98,6 @@ limitations under the License.
                                        </configuration>
                                </plugin>
                                <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-source-plugin</artifactId>
                                        <version>2.1.2</version>
                                        <executions>
@@ -105,20 +111,13 @@ limitations under the License.
                                        </executions>
                                </plugin>
                                <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-clean-plugin</artifactId>
                                        <version>2.4.1</version>
                                </plugin>
                                <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <version>2.7.1</version>
                                </plugin>
-                               <plugin>
-                                       <groupId>org.argeo.maven.plugins</groupId>
-                                       <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>${version.maven-argeo-osgi}</version>
-                               </plugin>
                                <plugin>
                                        <artifactId>maven-jar-plugin</artifactId>
                                        <version>2.3.1</version>
@@ -128,10 +127,27 @@ limitations under the License.
                                                </archive>
                                        </configuration>
                                </plugin>
+                               <plugin>
+                                       <artifactId>maven-antrun-plugin</artifactId>
+                                       <version>1.7</version>
+                               </plugin>
+                               <plugin>
+                                       <artifactId>maven-resources-plugin</artifactId>
+                                       <version>2.4.3</version>
+                               </plugin>
+                               <plugin>
+                                       <artifactId>maven-site-plugin</artifactId>
+                                       <version>2.1.1</version>
+                               </plugin>
+                               <plugin>
+                                       <artifactId>maven-release-plugin</artifactId>
+                                       <version>2.1</version>
+                               </plugin>
+                               <!-- Apache -->
                                <plugin>
                                        <groupId>org.apache.felix</groupId>
                                        <artifactId>maven-bundle-plugin</artifactId>
-                                       <version>${version.maven-bundle-plugin}</version>
+                                       <version>2.2.0</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                                <manifestLocation>META-INF</manifestLocation>
@@ -152,13 +168,49 @@ limitations under the License.
                                                </execution>
                                        </executions>
                                </plugin>
+                               <!-- Codehaus -->
+                               <plugin>
+                                       <groupId>org.codehaus.mojo</groupId>
+                                       <artifactId>buildnumber-maven-plugin</artifactId>
+                                       <version>1.0-beta-4</version>
+                               </plugin>
+                               <plugin>
+                                       <groupId>org.codehaus.mojo</groupId>
+                                       <artifactId>rpm-maven-plugin</artifactId>
+                                       <version>2.1-alpha-1</version>
+                                       <extensions>true</extensions>
+                                       <configuration>
+                                               <version>${project.version}</version>
+                                               <release>r${buildNumber}.el6</release>
+                                               <distribution>argeo6</distribution>
+                                               <packager>mbaudier@argeo.org</packager>
+                                               <group>Applications/System</group>
+                                               <prefix>/usr</prefix>
+                                       </configuration>
+                               </plugin>
+                               <plugin>
+                                       <groupId>org.codehaus.mojo</groupId>
+                                       <artifactId>exec-maven-plugin</artifactId>
+                                       <version>1.2.1</version>
+                               </plugin>
+                               <!-- Argeo -->
+                               <plugin>
+                                       <groupId>org.argeo.maven.plugins</groupId>
+                                       <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                       <version>${version.maven-argeo-osgi}</version>
+                               </plugin>
+                               <!-- Others -->
+                               <plugin>
+                                       <groupId>com.mycila.maven-license-plugin</groupId>
+                                       <artifactId>maven-license-plugin</artifactId>
+                                       <version>1.8.0</version>
+                               </plugin>
                        </plugins>
                </pluginManagement>
                <plugins>
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
                                <artifactId>buildnumber-maven-plugin</artifactId>
-                               <version>1.0-beta-4</version>
                                <executions>
                                        <execution>
                                                <phase>generate-resources</phase>
@@ -183,7 +235,6 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-resources-plugin</artifactId>
-                               <version>2.4.3</version>
                                <configuration>
                                        <encoding>UTF-8</encoding>
                                </configuration>
@@ -191,12 +242,13 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-site-plugin</artifactId>
-                               <version>2.1.1</version>
+                               <configuration>
+                                       <siteDirectory>doc/site</siteDirectory>
+                               </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-release-plugin</artifactId>
-                               <version>2.1</version>
                                <configuration>
                                        <autoVersionSubmodules>true</autoVersionSubmodules>
                                        <releaseProfiles>release</releaseProfiles>
@@ -206,7 +258,6 @@ limitations under the License.
                        <plugin>
                                <groupId>com.mycila.maven-license-plugin</groupId>
                                <artifactId>maven-license-plugin</artifactId>
-                               <version>1.8.0</version>
                                <configuration>
                                        <header>license-apache2-header.txt</header>
                                        <failIfMissing>true</failIfMissing>
@@ -367,5 +418,27 @@ limitations under the License.
                                </site>
                        </distributionManagement>
                </profile>
+               <profile>
+                       <id>localrepo</id>
+                       <distributionManagement>
+                               <repository>
+                                       <id>localrepo</id>
+                                       <name>Internal Release Repository</name>
+                                       <url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo</url>
+                               </repository>
+                               <snapshotRepository>
+                                       <id>localrepo.snapshots</id>
+                                       <name>Internal Snapshot Repository</name>
+                                       <url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo</url>
+                               </snapshotRepository>
+                       </distributionManagement>
+               </profile>
+               <profile>
+                       <id>full</id>
+                       <modules>
+                               <module>doc</module>
+                               <module>sandbox</module>
+                       </modules>
+               </profile>
        </profiles>
 </project>
\ No newline at end of file