commons: improve maven, new RPM structure

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

diff --git a/pom.xml b/pom.xml
index 5f6feca0c244927e7276e2014c26c490ef4531a8..d0cc2be8637624e7ee35fab1f9e2a34c5b3a0882 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>org.argeo</groupId>
@@ -8,21 +9,30 @@
        </parent>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>0.2.2-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.1-SNAPSHOT</version.argeo-distribution>
-               <version.argeo-commons>0.2.2-SNAPSHOT</version.argeo-commons>
-               <version.argeo-ria>0.12.5</version.argeo-ria>
-               <version.equinox>3.6.1</version.equinox>
-               <version.maven-argeo-osgi>0.1.30-SNAPSHOT</version.maven-argeo-osgi>
-               <version.maven-bundle-plugin>2.0.1</version.maven-bundle-plugin>
-               <version.maven-argeo-qooxdoo>1.1.0</version.maven-argeo-qooxdoo>
+               <developmentCycle>0.3</developmentCycle>
+               <version.argeo-distribution>1.1.6-SNAPSHOT</version.argeo-distribution>
+               <version.argeo-commons>0.3.4-SNAPSHOT</version.argeo-commons>
+               <version.equinox>3.6.2</version.equinox>
+               <!-- 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>
@@ -68,28 +78,28 @@ limitations under the License.
                        </roles>
                </developer>
        </developers>
-       <modules>
-               <module>basic</module>
-               <module>osgi</module>
-               <module>server</module>
-               <module>security</module>
-               <module>eclipse</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>
                                                <source>1.5</source>
                                                <target>1.5</target>
                                        </configuration>
                                </plugin>
                                <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-source-plugin</artifactId>
+                                       <version>2.1.2</version>
                                        <executions>
                                                <execution>
                                                        <id>attach-sources</id>
@@ -101,28 +111,50 @@ limitations under the License.
                                        </executions>
                                </plugin>
                                <plugin>
-                                       <groupId>org.argeo.maven.plugins</groupId>
-                                       <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>${version.maven-argeo-osgi}</version>
+                                       <artifactId>maven-clean-plugin</artifactId>
+                                       <version>2.4.1</version>
+                               </plugin>
+                               <plugin>
+                                       <artifactId>maven-surefire-plugin</artifactId>
+                                       <version>2.7.1</version>
                                </plugin>
                                <plugin>
                                        <artifactId>maven-jar-plugin</artifactId>
+                                       <version>2.3.1</version>
                                        <configuration>
                                                <archive>
-                                                       <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+                                                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
                                                </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>target/classes/META-INF</manifestLocation>
+                                               <manifestLocation>META-INF</manifestLocation>
                                                <instructions>
                                                        <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
-                                                       <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                                                       <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                                                       <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
                                                        <_removeheaders>Bnd-LastModified</_removeheaders>
                                                </instructions>
                                        </configuration>
@@ -136,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>
@@ -174,7 +242,6 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-site-plugin</artifactId>
-                               <version>2.1.1</version>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
@@ -188,7 +255,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>
@@ -249,6 +315,7 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-project-info-reports-plugin</artifactId>
+                               <version>2.3.1</version>
                                <reportSets>
                                        <reportSet>
                                                <reports>
@@ -271,6 +338,7 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-javadoc-plugin</artifactId>
+                               <version>2.7</version>
                                <inherited>false</inherited>
                                <configuration>
                                        <aggregate>true</aggregate>
@@ -280,6 +348,7 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-jxr-plugin</artifactId>
+                               <version>2.2</version>
                                <configuration>
                                        <aggregate>true</aggregate>
                                </configuration>
@@ -287,6 +356,7 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-report-plugin</artifactId>
+                               <version>2.7.1</version>
                                <inherited>false</inherited>
                                <configuration>
                                        <aggregate>true</aggregate>
@@ -295,6 +365,7 @@ limitations under the License.
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
                                <artifactId>taglist-maven-plugin</artifactId>
+                               <version>2.4</version>
                                <configuration>
                                        <aggregate>true</aggregate>
                                        <tags>
@@ -307,6 +378,7 @@ limitations under the License.
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-changelog-plugin</artifactId>
+                               <version>2.2</version>
                                <inherited>false</inherited>
                        </plugin>
                        <plugin>
@@ -343,5 +415,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