X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=2156a1e5bf1fb321303c9e730d0ad169c5a3d439;hb=886cbb0fd386b75b43b39d3a2ba97ebd80f584d6;hp=91b2a58d815754bee56921d6fe31955f23936d96;hpb=2a239ea1b0d8529a665db78e54ead639d0fb7732;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 91b2a58d8..2156a1e5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,48 +3,50 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>2.1.43-SNAPSHOT</version>
+	<version>2.1.62</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<version.argeo-commons>2.1.43</version.argeo-commons>
+		<version.argeo-commons>2.1.62</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.15</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>
 	</modules>
 	<scm>
-		<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>
+		<connection>scm:git:http://git.argeo.org/apache2/argeo-commons.git</connection>
+		<url>http://git.argeo.org/?p=apache2/argeo-commons.git;a=summary</url>
+		<developerConnection>scm:git:https://code.argeo.org/git/apache2/argeo-commons.git</developerConnection>
+	  <tag>argeo-commons-2.1.62</tag>
+  </scm>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
 		<license>
@@ -54,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.
@@ -219,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>
@@ -255,6 +257,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>
@@ -266,7 +271,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>
@@ -415,7 +420,7 @@ limitations under the License.
 	<repositories>
 		<repository>
 			<id>argeo</id>
-			<url>http://forge.argeo.org/data/public/java/argeo-2.1/</url>
+			<url>http://forge.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -457,7 +462,7 @@ limitations under the License.
 	<distributionManagement>
 		<repository>
 			<id>staging</id>
-			<url>dav:https://forge.argeo.org/data/files/java/argeo-${developmentCycle.argeo-commons}</url>
+			<url>dav:https://forge.argeo.org/data/java/argeo-${developmentCycle.argeo-commons}</url>
 			<uniqueVersion>false</uniqueVersion>
 		</repository>
 	</distributionManagement>
@@ -467,7 +472,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/java/argeo-${developmentCycle.argeo-commons}</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>
@@ -478,11 +483,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/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/docs/argeo-${developmentCycle.argeo-commons}</url>
 				</site>
 			</distributionManagement>
 		</profile>