Remove init LDIFs

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

diff --git a/pom.xml b/pom.xml
index 7dca9a4b6db44a676f4c14653ca95c431620b1b0..0c98397878d9f77c9a11179246f9f4264df75940 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,17 +1,16 @@
 <?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>
+       <version>2.1.31-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <properties>
-               <version.argeo-commons>2.1.12-SNAPSHOT</version.argeo-commons>
+               <version.argeo-commons>2.1.31-SNAPSHOT</version.argeo-commons>
                <developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
                <developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
-               <version.argeo-distribution>2.1.5</version.argeo-distribution>
+               <version.argeo-distribution>2.1.12</version.argeo-distribution>
                <!-- RPM -->
                <rpm.release>6</rpm.release>
                <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
@@ -26,29 +25,18 @@
                <!-- Security -->
                <module>org.argeo.security.core</module>
                <module>org.argeo.security.jackrabbit</module>
-               <module>org.argeo.security.ldap</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.jackrabbit</module>
-               <!-- Server -->
-               <module>org.argeo.server.core</module>
-               <module>org.argeo.server.jcr.mvc</module>
-               <module>org.argeo.server.jackrabbit</module>
                <!-- Eclipse -->
                <module>org.argeo.eclipse.ui</module>
                <module>org.argeo.eclipse.ui.rap</module>
-               <!-- Argeo Node -->
-               <module>org.argeo.node.repo.jackrabbit</module>
+               <!-- CMS -->
                <module>org.argeo.cms</module>
                <!-- Workbench -->
                <module>org.argeo.eclipse.ui.workbench</module>
-               <module>org.argeo.security.equinox</module>
+               <module>org.argeo.eclipse.ui.workbench.rap</module>
                <module>org.argeo.security.ui</module>
                <module>org.argeo.security.ui.admin</module>
                <module>org.argeo.security.ui.rap</module>
-               <!-- Dependencies and Distributions -->
+               <!-- Distribution -->
                <module>dep</module>
                <module>dist</module>
        </modules>
@@ -143,6 +131,8 @@ limitations under the License.
                                                <source>1.7</source>
                                                <target>1.7</target>
                                                <compilerId>eclipse</compilerId>
+                                               <!-- Required for compliance level, see http://jira.codehaus.org/browse/PLXCOMP-231 -->
+                                               <optimize>true</optimize>
                                                <!-- Hack to work around issues with generated annotations : -->
                                                <generatedSourcesDirectory>target/classes</generatedSourcesDirectory>
                                                <generatedTestSourcesDirectory>target/test-classes</generatedTestSourcesDirectory>
@@ -257,10 +247,12 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.codehaus.mojo</groupId>
                                        <artifactId>rpm-maven-plugin</artifactId>
-                                       <version>2.1</version>
+                                       <version>2.1-alpha-1</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                                <version>${project.version}</version>
+                                               <release>1.el${rpm.release}</release>
+                                               <distribution>argeo${rpm.release}</distribution>
                                                <group>Applications/System</group>
                                                <prefix>/usr</prefix>
                                        </configuration>
@@ -274,7 +266,7 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.argeo.maven.plugins</groupId>
                                        <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>1.1.3</version>
+                                       <version>1.1.4</version>
                                </plugin>
                                <!-- Site -->
                                <plugin>
@@ -408,10 +400,21 @@ limitations under the License.
                        <scope>provided</scope>
                </dependency>
        </dependencies>
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.argeo.tp</groupId>
+                               <artifactId>argeo-tp</artifactId>
+                               <version>${version.argeo-distribution}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
        <repositories>
                <repository>
                        <id>argeo-tp</id>
-                       <url>https://forge.argeo.org/data/public/java/argeo-tp-2.1/</url>
+                       <url>http://forge.argeo.org/data/public/java/argeo-tp-2.1/</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
@@ -449,9 +452,20 @@ limitations under the License.
        <profiles>
                <profile>
                        <id>localrepo</id>
+                       <repositories>
+                               <repository>
+                                       <id>argeo-tp</id>
+                                       <url>http://localhost:7080/data/public/java/argeo-tp-${developmentCycle.argeo-commons}/</url>
+                                       <releases>
+                                               <enabled>true</enabled>
+                                               <updatePolicy>daily</updatePolicy>
+                                               <checksumPolicy>warn</checksumPolicy>
+                                       </releases>
+                               </repository>
+                       </repositories>
                        <distributionManagement>
                                <repository>
-                                       <id>localrepo</id>
+                                       <id>staging</id>
                                        <name>Internal Release Repository</name>
                                        <url>dav:http://localhost:7080/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
                                </repository>