projects / lgpl / argeo-commons.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Move to the root the bundles which will be part of v1.4 and v2.2
[lgpl/argeo-commons.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 776d239d48cd79e07fd21704cacfc2570c81d6a4..dbd3ed3cff8ab7492887862d662e3d5ebc6d80c5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
 <?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>2.1.12-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>
        <properties>
                <version.argeo-commons>2.1.12-SNAPSHOT</version.argeo-commons>
@@ -21,9 +21,51 @@
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        </properties>
        <modules>
-               <module>base</module>
-               <module>server</module>
-               <module>security</module>
+               <!-- Base -->
+               <module>org.argeo.util</module>
+               <module>org.argeo.osgi.boot</module>
+               <module>org.argeo.server.jcr</module>
+               <!-- Eclipse -->
+               <module>org.argeo.eclipse.ui</module>
+               <module>org.argeo.eclipse.ui.jcr</module>
+               <module>org.argeo.eclipse.ui.rap</module>
+               <module>org.argeo.eclipse.ui.rcp</module>
+               <!-- Security -->
+               <module>org.argeo.security.core</module>
+               <module>org.argeo.security.jackrabbit</module>
+               <module>org.argeo.security.ldap</module>
+               <module>org.argeo.security.mvc</module>
+               <!-- Security Services -->
+               <module>org.argeo.security.auth.ldap</module>
+               <module>org.argeo.security.dao.ldap</module>
+               <module>org.argeo.security.dao.cli</module>
+               <module>org.argeo.security.dao.os</module>
+               <module>org.argeo.security.dao.jackrabbit</module>
+               <!-- Servers -->
+               <module>org.argeo.server.jcr.mvc</module>
+               <module>org.argeo.server.jackrabbit</module>
+               <module>org.argeo.jackrabbit.webapp</module>
+               <module>org.argeo.server.ads</module>
+               <module>org.argeo.server.ads.server</module>
+               <module>org.argeo.server.rap.webapp</module>
+               <!-- Node -->
+               <module>org.argeo.node.repo.jackrabbit</module>
+               <!-- Standard Workbench Perspectives -->
+               <module>org.argeo.osgi.ui.explorer</module>
+               <module>org.argeo.jcr.ui.explorer</module>
+               <module>org.argeo.security.equinox</module>
+               <module>org.argeo.security.ui</module>
+               <module>org.argeo.security.ui.admin</module>
+               <!-- Standard Workbench Products -->
+               <module>org.argeo.security.ui.rap</module>
+               <module>org.argeo.security.ui.rcp</module>
+               <!-- Legacy -->
+               <module>org.argeo.support.junit</module>
+               <module>org.argeo.server.core</module>
+               <module>org.argeo.ext.jdbm</module>
+               <!-- Dependencies and Distributions -->
+               <module>dep</module>
+               <module>dist</module>
        </modules>
        <organization>
                <name>Argeo</name>
@@ -94,7 +136,7 @@ limitations under the License.
                        <extension>
                                <groupId>org.apache.maven.wagon</groupId>
                                <artifactId>wagon-webdav-jackrabbit</artifactId>
-                               <version>2.2</version>
+                               <version>2.8</version>
                        </extension>
                </extensions>
                <resources>
@@ -104,19 +146,18 @@ limitations under the License.
                        <resource>
                                <directory>.</directory>
                                <includes>
-                                       <include>plugin.xml</include>
-                                       <include>META-INF/**</include>
-                                       <include>WEB-INF/**</include>
-                                       <include>icons/**</include>
-                                       <include>branding/**</include>
-                                       <include>img/**</include>
-                                       <include>theme/**</include>
-                                       <include>*.properties</include>
-                                       <include>properties/*.properties</include>
-                                       <include>p2.inf</include>
+                                       <include>**</include>
                                </includes>
                                <excludes>
+                                       <exclude>.*</exclude>
+                                       <exclude>.*/**</exclude>
+                                       <exclude>src/**</exclude>
+                                       <exclude>target/**</exclude>
+                                       <exclude>bin/**</exclude>
+                                       <exclude>pom.xml</exclude>
                                        <exclude>build.properties</exclude>
+                                       <exclude>*.bnd</exclude>
+                                       <exclude>*.target</exclude>
                                </excludes>
                        </resource>
                </resources>
@@ -125,7 +166,7 @@ limitations under the License.
                                <!-- Maven -->
                                <plugin>
                                        <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>2.3.2</version>
+                                       <version>3.2</version>
                                        <configuration>
                                                <source>1.6</source>
                                                <target>1.6</target>
@@ -133,7 +174,7 @@ limitations under the License.
                                </plugin>
                                <plugin>
                                        <artifactId>maven-source-plugin</artifactId>
-                                       <version>2.1.2</version>
+                                       <version>2.4</version>
                                        <executions>
                                                <execution>
                                                        <id>attach-sources</id>
@@ -143,10 +184,17 @@ limitations under the License.
                                                        </goals>
                                                </execution>
                                        </executions>
+                                       <configuration>
+                                               <excludes>
+                                                       <!-- Prevents source jars to contain misleading data -->
+                                                       <exclude>plugin.xml</exclude>
+                                                       <exclude>META-INF/MANIFEST.MF</exclude>
+                                               </excludes>
+                                       </configuration>
                                </plugin>
                                <plugin>
                                        <artifactId>maven-clean-plugin</artifactId>
-                                       <version>2.4.1</version>
+                                       <version>2.6.1</version>
                                        <configuration>
                                                <filesets>
                                                        <fileset>
@@ -160,11 +208,11 @@ limitations under the License.
                                </plugin>
                                <plugin>
                                        <artifactId>maven-surefire-plugin</artifactId>
-                                       <version>2.12</version>
+                                       <version>2.18</version>
                                </plugin>
                                <plugin>
                                        <artifactId>maven-jar-plugin</artifactId>
-                                       <version>2.4</version>
+                                       <version>2.5</version>
                                        <configuration>
                                                <archive>
                                                        <manifestFile>META-INF/MANIFEST.MF</manifestFile>
@@ -177,22 +225,22 @@ limitations under the License.
                                </plugin>
                                <plugin>
                                        <artifactId>maven-resources-plugin</artifactId>
-                                       <version>2.5</version>
+                                       <version>2.7</version>
                                </plugin>
                                <plugin>
                                        <artifactId>maven-dependency-plugin</artifactId>
-                                       <version>2.4</version>
+                                       <version>2.9</version>
                                </plugin>
                                <plugin>
                                        <artifactId>maven-release-plugin</artifactId>
-                                       <version>2.2.2</version>
+                                       <version>2.5.1</version>
                                        <configuration>
                                                <autoVersionSubmodules>true</autoVersionSubmodules>
                                        </configuration>
                                </plugin>
                                <plugin>
                                        <artifactId>maven-javadoc-plugin</artifactId>
-                                       <version>2.8.1</version>
+                                       <version>2.10.1</version>
                                </plugin>
                                <!-- Apache -->
                                <plugin>
@@ -230,7 +278,7 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.codehaus.mojo</groupId>
                                        <artifactId>rpm-maven-plugin</artifactId>
-                                       <version>2.1-alpha-1</version>
+                                       <version>2.1</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                                <version>${project.version}</version>
@@ -245,13 +293,13 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.codehaus.mojo</groupId>
                                        <artifactId>exec-maven-plugin</artifactId>
-                                       <version>1.2.1</version>
+                                       <version>1.3.2</version>
                                </plugin>
                                <!-- Argeo -->
                                <plugin>
                                        <groupId>org.argeo.maven.plugins</groupId>
                                        <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>1.1.2</version>
+                                       <version>1.1.3-SNAPSHOT</version>
                                </plugin>
                                <!-- Others -->
                                <plugin>
@@ -259,11 +307,11 @@ limitations under the License.
                                        <artifactId>maven-license-plugin</artifactId>
                                        <version>1.9.0</version>
                                </plugin>
-                               <plugin>
-                                       <groupId>com.agilejava.docbkx</groupId>
-                                       <artifactId>docbkx-maven-plugin</artifactId>
-                                       <version>2.0.14</version>
-                               </plugin>
+                               <!-- <plugin> -->
+                               <!-- <groupId>com.agilejava.docbkx</groupId> -->
+                               <!-- <artifactId>docbkx-maven-plugin</artifactId> -->
+                               <!-- <version>2.0.14</version> -->
+                               <!-- </plugin> -->
                                <!-- Site -->
                                <plugin>
                                        <artifactId>maven-site-plugin</artifactId>
@@ -446,34 +494,34 @@ limitations under the License.
                                        </mapping>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>com.agilejava.docbkx</groupId>
-                               <artifactId>docbkx-maven-plugin</artifactId>
-                               <configuration>
-                                       <sourceDirectory>doc/reference</sourceDirectory>
-                                       <targetDirectory>target/site/reference</targetDirectory>
-                                       <htmlStylesheet>css/style.css</htmlStylesheet>
-                                       <postProcess>
-                                               <copy todir="target/site/reference">
-                                                       <fileset dir="doc/reference">
-                                                               <include name="*/*.css" />
-                                                       </fileset>
-                                                       <fileset dir="doc/reference">
-                                                               <include name="img/**" />
-                                                       </fileset>
-                                               </copy>
-                                       </postProcess>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <goals>
-                                                       <goal>generate-html</goal>
-                                                       <goal>generate-pdf</goal>
-                                               </goals>
-                                               <phase>pre-site</phase>
-                                       </execution>
-                               </executions>
-                       </plugin>
+                       <!-- <plugin> -->
+                       <!-- <groupId>com.agilejava.docbkx</groupId> -->
+                       <!-- <artifactId>docbkx-maven-plugin</artifactId> -->
+                       <!-- <configuration> -->
+                       <!-- <sourceDirectory>doc/reference</sourceDirectory> -->
+                       <!-- <targetDirectory>target/site/reference</targetDirectory> -->
+                       <!-- <htmlStylesheet>css/style.css</htmlStylesheet> -->
+                       <!-- <postProcess> -->
+                       <!-- <copy todir="target/site/reference"> -->
+                       <!-- <fileset dir="doc/reference"> -->
+                       <!-- <include name="*/*.css" /> -->
+                       <!-- </fileset> -->
+                       <!-- <fileset dir="doc/reference"> -->
+                       <!-- <include name="img/**" /> -->
+                       <!-- </fileset> -->
+                       <!-- </copy> -->
+                       <!-- </postProcess> -->
+                       <!-- </configuration> -->
+                       <!-- <executions> -->
+                       <!-- <execution> -->
+                       <!-- <goals> -->
+                       <!-- <goal>generate-html</goal> -->
+                       <!-- <goal>generate-pdf</goal> -->
+                       <!-- </goals> -->
+                       <!-- <phase>pre-site</phase> -->
+                       <!-- </execution> -->
+                       <!-- </executions> -->
+                       <!-- </plugin> -->
                </plugins>
        </build>
        <dependencyManagement>
Argeo Commons - Lightweight integration framework in pure Java/OSGi