[maven-release-plugin] prepare for next development iteration

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

diff --git a/pom.xml b/pom.xml
index 59695645324e946f609474bc095a446755ea1d19..6425098ad13075312991ac90267d5b54756e3264 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,22 +1,22 @@
 <?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.29-SNAPSHOT</version>
+       <version>2.1.46-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <properties>
-               <version.argeo-commons>2.1.29</version.argeo-commons>
+               <version.argeo-commons>2.1.45</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.11</version.argeo-distribution>
+               <version.argeo-distribution>2.1.15</version.argeo-distribution>
                <!-- RPM -->
-               <rpm.release>6</rpm.release>
-               <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
-               <!-- encoding, see http://is.gd/mvn_source_encoding -->
+               <argeo.rpm.release>7</argeo.rpm.release>
+               <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/7/x86_64</argeo.rpm.stagingRepository>
+               <!-- Encoding, see http://is.gd/mvn_source_encoding -->
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <project.scm.id>code.argeo.org</project.scm.id>
        </properties>
        <modules>
                <!-- Base -->
@@ -25,12 +25,13 @@
                <module>org.argeo.server.jcr</module>
                <!-- Security -->
                <module>org.argeo.security.core</module>
-               <module>org.argeo.security.jackrabbit</module>
                <!-- Eclipse -->
                <module>org.argeo.eclipse.ui</module>
                <module>org.argeo.eclipse.ui.rap</module>
                <!-- CMS -->
+               <module>org.argeo.cms.api</module>
                <module>org.argeo.cms</module>
+               <module>org.argeo.security.jackrabbit</module>
                <!-- Workbench -->
                <module>org.argeo.eclipse.ui.workbench</module>
                <module>org.argeo.eclipse.ui.workbench.rap</module>
@@ -55,7 +56,7 @@
                        <comments><![CDATA[
 Argeo Commons Enterprise Framework
                           
-Copyright (C) 2007-2012 Argeo GmbH
+Copyright (C) 2007-2016 Argeo GmbH
 
 Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
 you may not use this file except in compliance with the License.
@@ -77,7 +78,7 @@ limitations under the License.
                        <extension>
                                <groupId>org.apache.maven.wagon</groupId>
                                <artifactId>wagon-webdav-jackrabbit</artifactId>
-                               <version>2.8</version>
+                               <version>2.10</version>
                        </extension>
                </extensions>
                <sourceDirectory>src</sourceDirectory>
@@ -127,10 +128,10 @@ limitations under the License.
                                <!-- Maven -->
                                <plugin>
                                        <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>3.2</version>
+                                       <version>3.3</version>
                                        <configuration>
-                                               <source>1.7</source>
-                                               <target>1.7</target>
+                                               <source>1.8</source>
+                                               <target>1.8</target>
                                                <compilerId>eclipse</compilerId>
                                                <!-- Required for compliance level, see http://jira.codehaus.org/browse/PLXCOMP-231 -->
                                                <optimize>true</optimize>
@@ -142,7 +143,7 @@ limitations under the License.
                                                <dependency>
                                                        <groupId>org.codehaus.plexus</groupId>
                                                        <artifactId>plexus-compiler-eclipse</artifactId>
-                                                       <version>2.3</version>
+                                                       <version>2.6</version>
                                                </dependency>
                                        </dependencies>
                                </plugin>
@@ -195,7 +196,7 @@ limitations under the License.
                                </plugin>
                                <plugin>
                                        <artifactId>maven-antrun-plugin</artifactId>
-                                       <version>1.7</version>
+                                       <version>1.8</version>
                                </plugin>
                                <plugin>
                                        <artifactId>maven-resources-plugin</artifactId>
@@ -220,7 +221,7 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.apache.felix</groupId>
                                        <artifactId>maven-bundle-plugin</artifactId>
-                                       <version>2.3.7</version>
+                                       <version>3.0.1</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                                <manifestLocation>META-INF</manifestLocation>
@@ -228,7 +229,7 @@ limitations under the License.
                                                        <_include>bnd.bnd</_include>
                                                        <Bundle-Version>${project.version}-r${tstamp}</Bundle-Version>
                                                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                                                       <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+                                                       <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
                                                        <_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
                                                        <!-- SLC specific instructions -->
                                                        <SLC-Category>${project.groupId}</SLC-Category>
@@ -248,12 +249,12 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.codehaus.mojo</groupId>
                                        <artifactId>rpm-maven-plugin</artifactId>
-                                       <version>2.1-alpha-1</version>
+                                       <version>2.1.4</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>
+                                               <distribution>argeo${argeo.rpm.release}</distribution>
                                                <group>Applications/System</group>
                                                <prefix>/usr</prefix>
                                        </configuration>
@@ -267,12 +268,12 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.argeo.maven.plugins</groupId>
                                        <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>1.1.4</version>
+                                       <version>1.1.5</version>
                                </plugin>
                                <!-- Site -->
                                <plugin>
                                        <artifactId>maven-site-plugin</artifactId>
-                                       <version>3.0</version>
+                                       <version>3.4</version>
                                        <configuration>
                                                <siteDirectory>doc/site</siteDirectory>
                                                <generateSitemap>true</generateSitemap>
@@ -281,7 +282,7 @@ limitations under the License.
                                                        <plugin>
                                                                <groupId>org.apache.maven.plugins</groupId>
                                                                <artifactId>maven-project-info-reports-plugin</artifactId>
-                                                               <version>2.4</version>
+                                                               <version>2.8.1</version>
                                                                <reportSets>
                                                                        <reportSet>
                                                                                <reports>
@@ -295,8 +296,9 @@ limitations under the License.
                                                        </plugin>
                                                        <plugin>
                                                                <artifactId>maven-javadoc-plugin</artifactId>
-                                                               <version>2.8.1</version>
+                                                               <version>2.10.3</version>
                                                                <configuration>
+                                                                       <failOnError>false</failOnError>
                                                                        <encoding>UTF-8</encoding>
                                                                        <excludePackageNames>*.demo.*:*.internal.*</excludePackageNames>
                                                                        <detectLinks>true</detectLinks>
@@ -326,7 +328,7 @@ limitations under the License.
                                                        </plugin>
                                                        <plugin>
                                                                <artifactId>maven-jxr-plugin</artifactId>
-                                                               <version>2.3</version>
+                                                               <version>2.5</version>
                                                                <configuration>
                                                                        <excludes>
                                                                                <exclude>**/demo/**/*</exclude>
@@ -399,48 +401,40 @@ limitations under the License.
                        <artifactId>argeo-tp</artifactId>
                        <version>${version.argeo-distribution}</version>
                        <scope>provided</scope>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.spring</groupId>
-                                       <artifactId>org.springframework.ldap</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.spring.security</groupId>
-                                       <artifactId>org.springframework.security.acls</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.spring.security</groupId>
-                                       <artifactId>org.springframework.security.aspects</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.spring.security</groupId>
-                                       <artifactId>org.springframework.security.config</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.spring.security</groupId>
-                                       <artifactId>org.springframework.security.core</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.spring.security</groupId>
-                                       <artifactId>org.springframework.security.ldap</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.argeo.tp.spring.security</groupId>
-                                       <artifactId>org.springframework.security.web</artifactId>
-                               </exclusion>
-                       </exclusions>
                </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>http://forge.argeo.org/data/public/java/argeo-tp-2.1/</url>
+                       <id>argeo</id>
+                       <url>http://forge.argeo.org/data/public/java/argeo-2.1/</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
                </repository>
+               <!-- Disable Maven default repository -->
+               <repository>
+                       <id>central</id>
+                       <url>http://repo1.maven.org/maven2</url>
+                       <releases>
+                               <enabled>false</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </repository>
        </repositories>
        <pluginRepositories>
                <pluginRepository>
@@ -465,7 +459,7 @@ limitations under the License.
        <distributionManagement>
                <repository>
                        <id>staging</id>
-                       <url>dav:https://repo.argeo.org/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+                       <url>dav:https://forge.argeo.org/data/files/java/argeo-${developmentCycle.argeo-commons}</url>
                        <uniqueVersion>false</uniqueVersion>
                </repository>
        </distributionManagement>
@@ -474,8 +468,8 @@ limitations under the License.
                        <id>localrepo</id>
                        <repositories>
                                <repository>
-                                       <id>argeo-tp</id>
-                                       <url>http://localhost:7080/data/public/java/argeo-tp-${developmentCycle.argeo-commons}/</url>
+                                       <id>argeo</id>
+                                       <url>http://localhost:7070/data/public/java/argeo-${developmentCycle.argeo-commons}</url>
                                        <releases>
                                                <enabled>true</enabled>
                                                <updatePolicy>daily</updatePolicy>
@@ -486,10 +480,65 @@ limitations under the License.
                        <distributionManagement>
                                <repository>
                                        <id>staging</id>
-                                       <name>Internal Release Repository</name>
-                                       <url>dav:http://localhost:7080/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+                                       <url>dav:http://localhost:7070/data/files/java/argeo-${developmentCycle.argeo-commons}</url>
                                </repository>
+                               <site>
+                                       <id>staging</id>
+                                       <url>dav:http://localhost:7070/data/files/docs/argeo-${developmentCycle.argeo-commons}</url>
+                               </site>
                        </distributionManagement>
                </profile>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <artifactId>maven-antrun-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>install</phase>
+                                                               <goals>
+                                                                       <goal>run</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <target>
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                                       <flattenmapper />
+                                                                               </copy>
+                                                                       </target>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+               <profile>
+                       <id>rpmbuild-tp</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <artifactId>maven-antrun-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>install</phase>
+                                                               <goals>
+                                                                       <goal>run</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <target>
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                                       <flattenmapper />
+                                                                               </copy>
+                                                                       </target>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
        </profiles>
 </project>