]> git.argeo.org Git - lgpl/argeo-commons.git/blobdiff - pom.xml
Opens OSGiBoot
[lgpl/argeo-commons.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 3633048d0feb4f027ad7a577050f888186921d15..240af13a3b44f37a0b296b8637318a26c57f032d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,10 @@
 <?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>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>1.1.1</version>
+       <version>1.1.5-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <description>Generic layers integrating free / open source technologies in order to quickly develop custom enterprise systems: security, JCR, user interface, monitoring</description>
        <packaging>pom</packaging>
@@ -11,7 +12,7 @@
                <developmentCycle>1.1</developmentCycle>
                <developmentCycle.startDate>2012-06-19</developmentCycle.startDate>
                <version.argeo-distribution>1.3.1</version.argeo-distribution>
-               <version.argeo-commons>1.1.1</version.argeo-commons>
+               <version.argeo-commons>1.1.5-SNAPSHOT</version.argeo-commons>
                <!-- distribution -->
                <site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
                <site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        </properties>
        <modules>
-               <module>basic</module>
-               <module>osgi</module>
+               <module>base</module>
                <module>server</module>
-               <module>eclipse</module>
                <module>security</module>
        </modules>
        <organization>
        </organization>
        <url>${site.urlBase}/${developmentCycle}</url>
        <scm>
-               <connection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-1.1.1</connection>
-               <developerConnection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-1.1.1
+               <connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
+               <developerConnection>scm:svn:https://svn.argeo.org/commons/trunk
                </developerConnection>
-               <url>https://svn.argeo.org/commons/tags/argeo-commons-1.1.1</url>
+               <url>https://svn.argeo.org/commons/trunk</url>
        </scm>
        <inceptionYear>2007</inceptionYear>
        <licenses>
@@ -127,6 +126,16 @@ limitations under the License.
                                <plugin>
                                        <artifactId>maven-clean-plugin</artifactId>
                                        <version>2.4.1</version>
+                                       <configuration>
+                                               <filesets>
+                                                       <fileset>
+                                                               <directory>META-INF</directory>
+                                                               <includes>
+                                                                       <include>MANIFEST.MF</include>
+                                                               </includes>
+                                                       </fileset>
+                                               </filesets>
+                                       </configuration>
                                </plugin>
                                <plugin>
                                        <artifactId>maven-surefire-plugin</artifactId>
@@ -160,6 +169,10 @@ limitations under the License.
                                                <autoVersionSubmodules>true</autoVersionSubmodules>
                                        </configuration>
                                </plugin>
+                               <plugin>
+                                       <artifactId>maven-javadoc-plugin</artifactId>
+                                       <version>2.8.1</version>
+                               </plugin>
                                <!-- Apache -->
                                <plugin>
                                        <groupId>org.apache.felix</groupId>
@@ -255,6 +268,8 @@ limitations under the License.
                                                                        <excludePackageNames>*.demo.*:*.internal.*</excludePackageNames>
                                                                        <detectLinks>true</detectLinks>
                                                                        <links>
+                                                                               <!-- Java -->
+                                                                               <link>http://docs.oracle.com/javase/6/docs/api</link>
                                                                                <!-- OSGi -->
                                                                                <link>http://www.osgi.org/javadoc/r4v42</link>
                                                                                <!-- Spring -->
@@ -322,6 +337,26 @@ limitations under the License.
                                </plugin>
                        </plugins>
                </pluginManagement>
+               <resources>
+                       <resource>
+                               <directory>src/main/resources</directory>
+                       </resource>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>plugin.xml</include>
+                                       <include>META-INF/**</include>
+                                       <include>WEB-INF/**</include>
+                                       <include>icons/**</include>
+                                       <include>branding/**</include>
+                                       <include>*.properties</include>
+                                       <include>p2.inf</include>
+                               </includes>
+                               <excludes>
+                                       <exclude>build.properties</exclude>
+                               </excludes>
+                       </resource>
+               </resources>
                <plugins>
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
@@ -340,6 +375,25 @@ limitations under the License.
                                        <timestampFormat>yyMMdd_HHmm</timestampFormat>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <artifactId>maven-clean-plugin</artifactId>
+                               <configuration>
+                                       <filesets>
+                                               <fileset>
+                                                       <directory>META-INF</directory>
+                                                       <includes>
+                                                               <include>MANIFEST.MF</include>
+                                                       </includes>
+                                               </fileset>
+                                       </filesets>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-javadoc-plugin</artifactId>
+                               <configuration>
+                                       <skip>true</skip>
+                               </configuration>
+                       </plugin>
                        <plugin>
                                <artifactId>maven-resources-plugin</artifactId>
                                <configuration>
@@ -356,7 +410,8 @@ limitations under the License.
                        <plugin>
                                <artifactId>maven-release-plugin</artifactId>
                                <configuration>
-                                       <releaseProfiles>rpmbuild,rpmbuild-tp,el5</releaseProfiles>
+                                       <goals>deploy</goals>
+                                       <releaseProfiles>rpmbuild,rpmbuild-tp</releaseProfiles>
                                </configuration>
                        </plugin>
                        <plugin>
@@ -397,31 +452,12 @@ limitations under the License.
        <repositories>
                <repository>
                        <id>argeo-tp</id>
-                       <url>http://dev.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.tp-1.3.1</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
-               </repository>
-               <repository>
-                       <id>argeo-commons</id>
-                       <url>http://dev.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.commons-1.1.1</url>
+                       <url>http://repo.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.tp-1.3.1</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
+                               <checksumPolicy>warn</checksumPolicy>
                        </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
                </repository>
        </repositories>
        <pluginRepositories>
@@ -431,13 +467,8 @@ limitations under the License.
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
+                               <checksumPolicy>warn</checksumPolicy>
                        </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
                </pluginRepository>
                <pluginRepository>
                        <id>argeo</id>
@@ -445,21 +476,15 @@ limitations under the License.
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
+                               <checksumPolicy>warn</checksumPolicy>
                        </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
                </pluginRepository>
        </pluginRepositories>
        <distributionManagement>
                <repository>
+                       <id>staging</id>
+                       <url>dav:https://repo.argeo.org/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
                        <uniqueVersion>false</uniqueVersion>
-                       <id>argeo-commons-restricted</id>
-                       <name>Argeo FOSS Repository</name>
-                       <url>dav:http://localhost:7080/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-${version.argeo-commons}</url>
                </repository>
                <site>
                        <id>argeo-commons-site</id>
@@ -474,13 +499,12 @@ limitations under the License.
                                <repository>
                                        <id>localrepo</id>
                                        <name>Internal Release Repository</name>
-                                       <url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo
-                                       </url>
+                                       <url>dav:http://localrepo:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
                                </repository>
                                <snapshotRepository>
                                        <id>localrepo.snapshots</id>
                                        <name>Internal Snapshot Repository</name>
-                                       <url>dav:http://localhost:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-${version.argeo-commons}</url>
+                                       <url>dav:http://localrepo:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
                                </snapshotRepository>
                        </distributionManagement>
                </profile>
@@ -488,8 +512,7 @@ limitations under the License.
                        <id>el5</id>
                        <properties>
                                <rpm.release>5</rpm.release>
-                               <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/5/x86_64
-                               </rpm.stagingRepository>
+                               <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/5/x86_64</rpm.stagingRepository>
                        </properties>
                </profile>
                <profile>