Opens OSGiBoot

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

diff --git a/pom.xml b/pom.xml
index 283170f82813e2f18d8a511f2385b4e39af85617..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.4</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.4-SNAPSHOT</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>
@@ -31,9 +32,10 @@
        </organization>
        <url>${site.urlBase}/${developmentCycle}</url>
        <scm>
-               <connection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-1.1.4</connection>
-               <developerConnection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-1.1.4</developerConnection>
-               <url>https://svn.argeo.org/commons/tags/argeo-commons-1.1.4</url>
+               <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/trunk</url>
        </scm>
        <inceptionYear>2007</inceptionYear>
        <licenses>
@@ -124,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>
@@ -157,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>
@@ -321,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>
@@ -339,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>
@@ -467,4 +522,4 @@ limitations under the License.
                        </modules>
                </profile>
        </profiles>
-</project>
+</project>
\ No newline at end of file