X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=c6f488ccdb3803a5995023b56ce18e6cd7cc013d;hb=21d69ee3e31821e4ed1a6490afcf5b2bc37d271b;hp=fbf9001d0cfb88fb9e4c5243d40b02d7422b76de;hpb=9f38c1b804fe7731af717bc7dc8c92f5dc8b267f;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index fbf9001d0..c6f488ccd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,9 @@
 <?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>1.1.1-SNAPSHOT</version>
+	<version>1.1.3</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>
@@ -12,7 +11,7 @@
 		<developmentCycle>1.1</developmentCycle>
 		<developmentCycle.startDate>2012-06-19</developmentCycle.startDate>
 		<version.argeo-distribution>1.3.1</version.argeo-distribution>
-		<version.argeo-commons>1.1.1</version.argeo-commons>
+		<version.argeo-commons>1.1.3</version.argeo-commons>
 		<!-- distribution -->
 		<site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
 		<site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
@@ -34,10 +33,10 @@
 	</organization>
 	<url>${site.urlBase}/${developmentCycle}</url>
 	<scm>
-		<connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
-		<developerConnection>scm:svn:https://svn.argeo.org/commons/trunk
+		<connection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-1.1.3</connection>
+		<developerConnection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-1.1.3
 		</developerConnection>
-		<url>https://svn.argeo.org/commons/trunk</url>
+		<url>https://svn.argeo.org/commons/tags/argeo-commons-1.1.3</url>
 	</scm>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
@@ -256,6 +255,8 @@ limitations under the License.
 									<excludePackageNames>*.demo.*:*.internal.*</excludePackageNames>
 									<detectLinks>true</detectLinks>
 									<links>
+										<!-- Java -->
+										<link>http://docs.oracle.com/javase/6/docs/api</link>
 										<!-- OSGi -->
 										<link>http://www.osgi.org/javadoc/r4v42</link>
 										<!-- Spring -->
@@ -357,6 +358,7 @@ limitations under the License.
 			<plugin>
 				<artifactId>maven-release-plugin</artifactId>
 				<configuration>
+					<goals>deploy</goals>
 					<releaseProfiles>rpmbuild,rpmbuild-tp,el5</releaseProfiles>
 				</configuration>
 			</plugin>
@@ -402,51 +404,35 @@ limitations under the License.
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
+				<checksumPolicy>warn</checksumPolicy>
 			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
 		</repository>
-		<repository>
-			<id>argeo-commons</id>
-			<url>http://dev.argeo.org/org.argeo.jcr.webapp/public/java/org.argeo.commons-1.1.1</url>
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>central</id>
+			<url>http://repo1.maven.org/maven2</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
+				<checksumPolicy>warn</checksumPolicy>
 			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
-		</repository>
-	</repositories>
-	<pluginRepositories>
+		</pluginRepository>
 		<pluginRepository>
 			<id>argeo</id>
 			<url>http://maven.argeo.org/argeo</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
+				<checksumPolicy>warn</checksumPolicy>
 			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-				<updatePolicy>never</updatePolicy>
-				<checksumPolicy>fail</checksumPolicy>
-			</snapshots>
 		</pluginRepository>
 	</pluginRepositories>
 	<distributionManagement>
 		<repository>
+			<id>staging</id>
+			<url>dav:http://localhost:7080/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
 			<uniqueVersion>false</uniqueVersion>
-			<id>argeo-commons-restricted</id>
-			<name>Argeo FOSS Repository</name>
-			<url>dav:http://localhost:7080/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-${version.argeo-commons}</url>
 		</repository>
 		<site>
 			<id>argeo-commons-site</id>
@@ -461,13 +447,12 @@ limitations under the License.
 				<repository>
 					<id>localrepo</id>
 					<name>Internal Release Repository</name>
-					<url>dav:http://localrepo:7080/org.argeo.jcr.webapp/webdav/node/main/repo
-					</url>
+					<url>dav:http://localrepo:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
 				</repository>
 				<snapshotRepository>
 					<id>localrepo.snapshots</id>
 					<name>Internal Snapshot Repository</name>
-					<url>dav:http://localhost:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-${version.argeo-commons}</url>
+					<url>dav:http://localrepo:7070/org.argeo.jcr.webapp/webdav/java/org.argeo.commons-1.1.x</url>
 				</snapshotRepository>
 			</distributionManagement>
 		</profile>
@@ -475,8 +460,7 @@ limitations under the License.
 			<id>el5</id>
 			<properties>
 				<rpm.release>5</rpm.release>
-				<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/5/x86_64
-				</rpm.stagingRepository>
+				<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-staging/5/x86_64</rpm.stagingRepository>
 			</properties>
 		</profile>
 		<profile>