X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=e2abe3aafcbc7989cd484e4f77e506d368dc50b9;hb=f26fa850fab8c3666e6cc27683991f2d11378e5b;hp=e4eeb3b9e3cab5604977c3d47a761f1de4103e89;hpb=2918c3f49a72ed17a9352a65e90b7e72b77f84ee;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index e4eeb3b9e..e2abe3aaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,16 +1,18 @@
 <?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</version>
+	<version>2.1.12-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<properties>
 		<version.argeo-commons>2.1.12-SNAPSHOT</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.argeo-distribution>2.1.2</version.argeo-distribution>
+		<version.eclipseIde>3.8.2</version.eclipseIde>
 		<version.rap>2.2.0-R-20131204-0942</version.rap>
 		<version.rap.addons>0.5.0.argeo.20141029</version.rap.addons>
 		<!-- RPM -->
@@ -24,15 +26,11 @@
 		<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>
+		<!-- <module>org.argeo.security.mvc</module> -->
 		<!-- Security Services -->
 		<module>org.argeo.security.auth.ldap</module>
 		<module>org.argeo.security.dao.ldap</module>
@@ -42,10 +40,14 @@
 		<!-- Servers -->
 		<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>
+		<!-- <module>org.argeo.jackrabbit.webapp</module> -->
+		<!-- <module>org.argeo.server.rap.webapp</module> -->
+		<!-- <module>org.argeo.server.ads</module> -->
+		<!-- <module>org.argeo.server.ads.server</module> -->
+		<!-- Eclipse -->
+		<module>org.argeo.eclipse.ui</module>
+		<module>org.argeo.eclipse.ui.rap</module>
+		<module>org.argeo.eclipse.ui.rcp</module>
 		<!-- Node -->
 		<module>org.argeo.node.repo.jackrabbit</module>
 		<module>org.argeo.cms</module>
@@ -59,15 +61,15 @@
 		<module>org.argeo.security.ui.rcp</module>
 		<!-- Legacy -->
 		<module>org.argeo.server.core</module>
-		<module>org.argeo.ext.jdbm</module>
+		<!-- <module>org.argeo.ext.jdbm</module> -->
 		<!-- Dependencies and Distributions -->
 		<module>dep</module>
-		<module>dist</module>
+		<!-- <module>dist</module> -->
 	</modules>
 	<scm>
-		<connection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-2.1.12</connection>
-		<developerConnection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-2.1.12</developerConnection>
-		<url>https://svn.argeo.org/commons/tags/argeo-commons-2.1.12</url>
+		<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>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
@@ -152,8 +154,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>
@@ -249,7 +251,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>
@@ -421,20 +423,42 @@ limitations under the License.
 	<!-- <scope>compile</scope> -->
 	<!-- </dependency> -->
 	<!-- </dependencies> -->
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>argeo-tp</artifactId>
+			<version>${version.argeo-distribution}</version>
+			<scope>provided</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>
+			<!-- <dependency> -->
+			<!-- <groupId>org.argeo.tp</groupId> -->
+			<!-- <artifactId>argeo-tp</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</groupId>
+				<groupId>org.argeo.tp.rcp.platform</groupId>
 				<artifactId>binaries</artifactId>
-				<version>${version.argeo-distribution}</version>
+				<version>${version.eclipseIde}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -457,7 +481,16 @@ limitations under the License.
 	<repositories>
 		<repository>
 			<id>argeo-tp</id>
-			<url>http://repo.argeo.org/data/public/java/argeo-tp-1.4</url>
+			<url>https://forge.argeo.org/data/public/java/argeo-tp-2.1</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+		</repository>
+		<repository>
+			<id>argeo-tp-eclipseIde</id>
+			<url>https://forge.argeo.org/data/public/java/eclipse-ide-3.8</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -505,4 +538,21 @@ limitations under the License.
 			<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>
+				<site>
+					<id>site</id>
+					<name>Argeo Commons Site</name>
+					<url>dav:http://localhost:7080/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
+				</site>
+			</distributionManagement>
+		</profile>
+	</profiles>
 </project>