projects / lgpl / argeo-commons.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[maven-release-plugin] prepare for next development iteration
[lgpl/argeo-commons.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 10a3d5f8ea5f4cefed98285a29253b0ef9e5a26c..f6964ba4b925c6c5ecb015505cf18cea5787a2cc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,42 +1,42 @@
 <?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.40-SNAPSHOT</version>
+       <version>2.1.52-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <properties>
-               <version.argeo-commons>2.1.40-SNAPSHOT</version.argeo-commons>
+               <version.argeo-commons>2.1.51</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.14</version.argeo-distribution>
+               <version.argeo-distribution>2.1.17</version.argeo-distribution>
                <!-- RPM -->
                <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 -->
+               <!-- 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 -->
                <module>org.argeo.util</module>
+               <module>org.argeo.enterprise</module>
+               <module>org.argeo.jcr</module>
                <module>org.argeo.osgi.boot</module>
-               <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.node.api</module>
                <module>org.argeo.cms</module>
-               <!-- Workbench -->
-               <module>org.argeo.eclipse.ui.workbench</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>
+               <module>org.argeo.cms.ui</module>
+               <!-- CMS Workbench -->
+               <module>org.argeo.cms.ui.workbench</module>
+               <module>org.argeo.cms.ui.workbench.rap</module>
+               <!-- Third Parties Extensions -->
+               <module>org.argeo.ext.jackrabbit</module>
+               <module>org.argeo.ext.rap.ui.workbench</module>
                <!-- Distribution -->
                <module>dep</module>
                <module>dist</module>
@@ -55,7 +55,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.
@@ -220,7 +220,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>
@@ -256,6 +256,9 @@ limitations under the License.
                                                <distribution>argeo${argeo.rpm.release}</distribution>
                                                <group>Applications/System</group>
                                                <prefix>/usr</prefix>
+                                               <!-- <copyTo>${argeo.rpm.stagingRepository}</copyTo> -->
+                                               <defaultDirMode>755</defaultDirMode>
+                                               <defaultFileMode>644</defaultFileMode>
                                        </configuration>
                                </plugin>
                                <plugin>
@@ -267,7 +270,7 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.argeo.maven.plugins</groupId>
                                        <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>1.1.5</version>
+                                       <version>1.1.6</version>
                                </plugin>
                                <!-- Site -->
                                <plugin>
@@ -423,6 +426,7 @@ limitations under the License.
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
                </repository>
+               <!-- Disable Maven default repository -->
                <repository>
                        <id>central</id>
                        <url>http://repo1.maven.org/maven2</url>
@@ -467,7 +471,7 @@ limitations under the License.
                        <repositories>
                                <repository>
                                        <id>argeo</id>
-                                       <url>http://localhost:7070/data/public/java/argeo-${developmentCycle.argeo-commons}</url>
+                                       <url>http://localhost:7080/data/public/java/argeo-${developmentCycle.argeo-commons}</url>
                                        <releases>
                                                <enabled>true</enabled>
                                                <updatePolicy>daily</updatePolicy>
@@ -478,11 +482,11 @@ limitations under the License.
                        <distributionManagement>
                                <repository>
                                        <id>staging</id>
-                                       <url>dav:http://localhost:7070/data/files/java/argeo-${developmentCycle.argeo-commons}</url>
+                                       <url>dav:http://localhost:7080/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>
+                                       <url>dav:http://localhost:7080/data/files/docs/argeo-${developmentCycle.argeo-commons}</url>
                                </site>
                        </distributionManagement>
                </profile>
@@ -500,10 +504,8 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
-                                                                                       failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm"
-                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>
@@ -528,10 +530,8 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
-                                                                                       failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm"
-                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>
Argeo Commons - Lightweight integration framework in pure Java/OSGi