X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=31413e4eced49e40af3bc95c103807d5e975081b;hb=18488ef1782d102c048dfb0df4f5f1f561723e15;hp=a4df50190e0322f3a014455b5059a9c728c7bb9e;hpb=21a4ea1fb5380ce1dd763c1ea09067cdd2dfd0f3;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index a4df50190..31413e4ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,19 +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.13</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
-		<version.argeo-commons>2.1.12-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>2.1.13</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>1.4.0</version.argeo-distribution>
-		<version.rap>2.2.0-R-20131204-0942</version.rap>
-		<version.rap.addons>0.5.0.argeo.20141029</version.rap.addons>
+		<version.argeo-distribution>2.1.5</version.argeo-distribution>
 		<!-- RPM -->
 		<rpm.release>6</rpm.release>
 		<rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
@@ -25,51 +22,40 @@
 		<module>org.argeo.util</module>
 		<module>org.argeo.osgi.boot</module>
 		<module>org.argeo.server.jcr</module>
-		<!-- Eclipse -->
-		<module>org.argeo.eclipse.ui</module>
-		<module>org.argeo.eclipse.ui.rap</module>
-		<module>org.argeo.eclipse.ui.rcp</module>
 		<!-- Security -->
 		<module>org.argeo.security.core</module>
 		<module>org.argeo.security.jackrabbit</module>
 		<module>org.argeo.security.ldap</module>
-		<module>org.argeo.security.mvc</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.os</module>
-		<module>org.argeo.security.dao.jackrabbit</module>
-		<!-- Servers -->
-		<module>org.argeo.server.jcr.mvc</module>
+		<!-- <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>
-		<module>org.argeo.jackrabbit.webapp</module>
-		<module>org.argeo.server.ads</module>
-		<module>org.argeo.server.ads.server</module>
-		<module>org.argeo.server.rap.webapp</module>
-		<!-- Node -->
-		<module>org.argeo.node.repo.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> -->
 		<module>org.argeo.cms</module>
-		<!-- Standard Workbench Perspectives -->
+		<!-- Workbench -->
 		<module>org.argeo.eclipse.ui.workbench</module>
-		<!-- <module>org.argeo.osgi.ui.explorer</module> <module>org.argeo.jcr.ui.explorer</module> -->
-		<module>org.argeo.security.equinox</module>
+		<module>org.argeo.eclipse.ui.workbench.rap</module>
+		<!-- <module>org.argeo.security.equinox</module> -->
 		<module>org.argeo.security.ui</module>
 		<module>org.argeo.security.ui.admin</module>
-		<!-- Standard Workbench Products -->
 		<module>org.argeo.security.ui.rap</module>
-		<module>org.argeo.security.ui.rcp</module>
-		<!-- Legacy -->
-		<module>org.argeo.server.core</module>
-		<module>org.argeo.ext.jdbm</module>
 		<!-- Dependencies and Distributions -->
 		<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>
+		<connection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-2.1.13</connection>
+		<developerConnection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-2.1.13</developerConnection>
+		<url>https://svn.argeo.org/commons/tags/argeo-commons-2.1.13</url>
 	</scm>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
@@ -154,8 +140,8 @@ limitations under the License.
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.2</version>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.7</source>
+						<target>1.7</target>
 						<compilerId>eclipse</compilerId>
 						<!-- Hack to work around issues with generated annotations : -->
 						<generatedSourcesDirectory>target/classes</generatedSourcesDirectory>
@@ -251,7 +237,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.6</Bundle-RequiredExecutionEnvironment>
+							<Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
 							<_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
 							<!-- SLC specific instructions -->
 							<SLC-Category>${project.groupId}</SLC-Category>
@@ -271,10 +257,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>
@@ -414,61 +402,18 @@ limitations under the License.
 			</plugin>
 		</plugins>
 	</build>
-	<!-- <dependencies> -->
-	<!-- <dependency> -->
-	<!-- <groupId>org.argeo.tp</groupId> -->
-	<!-- <artifactId>binaries</artifactId> -->
-	<!-- <type>pom</type> -->
-	<!-- <version>${version.argeo-distribution}</version> -->
-	<!-- <scope>compile</scope> -->
-	<!-- </dependency> -->
-	<!-- </dependencies> -->
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.argeo.tp</groupId>
-				<artifactId>binaries</artifactId>
-				<version>${version.argeo-distribution}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<!-- Eclipse RAP -->
-			<dependency>
-				<groupId>org.argeo.tp.rap</groupId>
-				<artifactId>binaries</artifactId>
-				<version>${version.argeo-distribution}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.tp.rap.addons</groupId>
-				<artifactId>binaries</artifactId>
-				<version>${version.rap.addons}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.tp.rap.platform</groupId>
-				<artifactId>binaries</artifactId>
-				<version>${version.rap}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>argeo-tp</artifactId>
+			<version>${version.argeo-distribution}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
 	<repositories>
 		<repository>
 			<id>argeo-tp</id>
-			<url>http://repo.argeo.org/data/public/java/argeo-tp-1.4</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-		</repository>
-		<repository>
-			<id>argeo-tp-rap</id>
-			<url>http://repo.argeo.org/data/public/java/eclipse-rap-2.2</url>
+			<url>https://forge.argeo.org/data/public/java/argeo-tp-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -502,9 +447,17 @@ limitations under the License.
 			<url>dav:https://repo.argeo.org/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
 			<uniqueVersion>false</uniqueVersion>
 		</repository>
-		<site>
-			<id>site</id>
-			<url>dav:https://repo.argeo.org/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
-		</site>
 	</distributionManagement>
+	<profiles>
+		<profile>
+			<id>localrepo</id>
+			<distributionManagement>
+				<repository>
+					<id>localrepo</id>
+					<name>Internal Release Repository</name>
+					<url>dav:http://localhost:7080/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+				</repository>
+			</distributionManagement>
+		</profile>
+	</profiles>
 </project>