X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=0127ee601ba7aa87239972604031cad7a8e43a41;hb=61896ffe3757df03d5a6d4d8563d989ac6061e47;hp=16378dccadc4d98017ed323385a867652ac94642;hpb=58b35f147f3c1c1a12a07c303105618f679c7161;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 16378dcca..0127ee601 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,64 +1,42 @@
-<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>
 	<parent>
 		<groupId>org.argeo.maven</groupId>
 		<artifactId>argeo-osgi-parent</artifactId>
-		<version>2.1.2</version>
+		<version>2.1.7</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>2.1.17-SNAPSHOT</version>
+	<version>2.3-SNAPSHOT</version>
 	<properties>
+		<version.context>unstable</version.context>
 		<version.argeo-tp>2.1.27</version.argeo-tp>
 		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-		<version.argeo-commons>2.1.89-SNAPSHOT</version.argeo-commons>
-		
-		<version.slc>2.1.17-SNAPSHOT</version.slc>
-		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
-		<developmentCycle.slc>2.1</developmentCycle.slc>
-		<version.argeo-commons-legacy>2.1.86-SNAPSHOT</version.argeo-commons-legacy>
+		<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
 
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
+		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
+		<developmentCycle.slc>2.3</developmentCycle.slc>
+		<version.argeo-commons-legacy>2.3-SNAPSHOT</version.argeo-commons-legacy>
 	</properties>
 	<modules>
+		<!-- SLC framework -->
 		<module>org.argeo.slc.api</module>
 		<module>org.argeo.slc.runtime</module>
 		<module>org.argeo.slc.jcr</module>
-
-		<!-- Runtime -->
-		<module>org.argeo.slc.spring</module>
-		<module>org.argeo.slc.support</module>
 		<module>org.argeo.slc.repo</module>
 		<module>org.argeo.slc.factory</module>
-		<module>org.argeo.slc.launcher</module>
-
-		<!-- Modules -->
-		<module>org.argeo.slc.agent</module>
-		<module>org.argeo.slc.agent.jcr</module>
-		<module>org.argeo.slc.server.repo</module>
-
-		<!-- E4 -->
-		<module>org.argeo.slc.e4</module>
-
-		<!-- Desktop -->
-		<module>rcp</module>
-
-		<!-- Legacy UI -->
-		<module>legacy</module>
-		<module>org.argeo.slc.client.ui</module>
-		<module>org.argeo.slc.client.ui.dist</module>
-		<module>org.argeo.slc.client.rap</module>
+		
+		<!-- CMS extensions -->
+		<module>cms</module>
 
 		<!-- Distribution -->
-		<module>lib</module>
 		<module>dep</module>
-		<module>dist</module>
-		<module>demo</module>
 		<module>ide</module>
+
+		<!-- Legacy -->
+		<module>legacy</module>
 	</modules>
 	<url>http://projects.argeo.org/slc/</url>
 	<scm>
@@ -98,6 +76,11 @@
 					<groupId>org.argeo.tp.misc</groupId>
 					<artifactId>slf4j.osgi</artifactId>
 				</exclusion>
+				<!-- Make sure JTA is not used anymore -->
+				<exclusion>
+					<groupId>org.argeo.tp.javax</groupId>
+					<artifactId>javax.transaction-api</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 	</dependencies>
@@ -129,110 +112,56 @@
 	<repositories>
 		<repository>
 			<id>argeo</id>
-			<url>http://repo.argeo.org/data/java/argeo-2.1/</url>
+			<url>http://forge.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
 		<repository>
 			<id>argeo-extras</id>
-			<url>http://repo.argeo.org/data/java/argeo-extras-2.1/</url>
+			<url>http://forge.argeo.org/data/java/argeo-extras-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>argeo-unstable</id>
+			<url>http://forge.argeo.org/data/java/argeo-2.3/</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<!-- Disable Maven default repository -->
+		<repository>
+			<id>central</id>
+			<url>http://repo1.maven.org/maven2</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
 	</repositories>
-	<reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.9</version>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>index</report>
-							<report>summary</report>
-							<report>license</report>
-							<report>scm</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.0.0</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<additionalJOption>-Xdoclint:none</additionalJOption>
-					<excludePackageNames>*.internal.*,org.eclipse.*</excludePackageNames>
-					<encoding>UTF-8</encoding>
-					<detectLinks>true</detectLinks>
-					<links>
-						<link>http://docs.oracle.com/javase/8/docs/api</link>
-						<link>https://osgi.org/javadoc/r5/core</link>
-						<link>https://osgi.org/javadoc/r5/enterprise</link>
-						<link>https://docs.adobe.com/docs/en/spec/javax.jcr/javadocs/jcr-2.0</link>
-						<link>http://help.eclipse.org/oxygen/topic/org.eclipse.platform.doc.isv/reference/api</link>
-						<link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</link>
-					</links>
-				</configuration>
-				<reportSets>
-					<reportSet>
-						<id>aggregate-javadoc</id>
-						<inherited>false</inherited>
-						<reports>
-							<report>aggregate</report>
-						</reports>
-					</reportSet>
-					<reportSet>
-						<id>javadoc</id>
-						<reports />
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<version>2.5</version>
-				<reportSets>
-					<reportSet>
-						<id>aggregate-jxr</id>
-						<inherited>false</inherited>
-						<reports>
-							<report>aggregate</report>
-						</reports>
-					</reportSet>
-					<reportSet>
-						<id>jxr</id>
-						<reports />
-					</reportSet>
-				</reportSets>
-			</plugin>
-		</plugins>
-	</reporting>
 	<distributionManagement>
 		<site>
 			<id>staging</id>
-			<url>file:///srv/docfactory/argeo-2.1/site/argeo-slc/</url>
+			<url>file:///srv/docfactory/argeo-2.3/site/argeo-slc/</url>
 		</site>
 	</distributionManagement>
-	<profiles>
-		<profile>
-			<id>localrepo</id>
-			<repositories>
-				<repository>
-					<id>argeo-extras</id>
-					<url>http://localhost:7080/data/java/argeo-extras-2.1</url>
-					<releases>
-						<enabled>true</enabled>
-						<updatePolicy>daily</updatePolicy>
-						<checksumPolicy>warn</checksumPolicy>
-					</releases>
-				</repository>
-			</repositories>
-		</profile>
-	</profiles>
 </project>