From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 4 Oct 2019 08:26:58 +0000 (+0200)
Subject: Adapt to the introduction of legacy in Argeo TP and Commons.
X-Git-Tag: argeo-slc-2.1.17~88
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=cbc9876bf968ce35f5e33867187a84783ff49afb;p=gpl%2Fargeo-slc.git

Adapt to the introduction of legacy in Argeo TP and Commons.
---

diff --git a/dep/org.argeo.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml
index 4eccbe06d..da7d737d3 100644
--- a/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@ -1,4 +1,6 @@
-<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.slc</groupId>
@@ -55,14 +57,14 @@
 		</dependency>
 
 		<!-- ALM Third Parties -->
-		<dependency>
-			<groupId>org.argeo.tp.apache.ant</groupId>
-			<artifactId>org.apache.ant</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache.ant</groupId>
-			<artifactId>org.apache.ant.launch</artifactId>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.apache.ant</groupId> -->
+		<!-- <artifactId>org.apache.ant</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.apache.ant</groupId> -->
+		<!-- <artifactId>org.apache.ant.launch</artifactId> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.sdk</groupId>
 			<artifactId>biz.aQute.bnd</artifactId>
diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index 1ca42318d..d297a9f03 100644
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -98,80 +98,80 @@
 
 
 		<!-- Base Spring dependency -->
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.beans</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.el</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.extender</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.io</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.aspectj.weaver</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.aopalliance</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.aop</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.context</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.expression</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.instrument</artifactId>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
+<!-- 			<artifactId>org.springframework.beans</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
+<!-- 			<artifactId>org.springframework.core</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.javax</groupId> -->
+<!-- 			<artifactId>javax.el</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.gemini</groupId> -->
+<!-- 			<artifactId>org.eclipse.gemini.blueprint.core</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.gemini</groupId> -->
+<!-- 			<artifactId>org.eclipse.gemini.blueprint.extender</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.gemini</groupId> -->
+<!-- 			<artifactId>org.eclipse.gemini.blueprint.io</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
+<!-- 			<artifactId>org.aspectj.weaver</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
+<!-- 			<artifactId>org.aopalliance</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
+<!-- 			<artifactId>org.springframework.aop</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
+<!-- 			<artifactId>org.springframework.context</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
+<!-- 			<artifactId>org.springframework.expression</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
+<!-- 			<artifactId>org.springframework.instrument</artifactId> -->
+<!-- 		</dependency> -->
 
 		<!-- Spring -->
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.aspects</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.context.support</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.tx</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.web.servlet</artifactId>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
+<!-- 			<artifactId>org.springframework.aspects</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
+<!-- 			<artifactId>org.springframework.context.support</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
+<!-- 			<artifactId>org.springframework.jdbc</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
+<!-- 			<artifactId>org.springframework.tx</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
+<!-- 			<artifactId>org.springframework.web</artifactId> -->
+<!-- 		</dependency> -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
+<!-- 			<artifactId>org.springframework.web.servlet</artifactId> -->
+<!-- 		</dependency> -->
 
 	</dependencies>
 	<profiles>
diff --git a/org.argeo.slc.core/pom.xml b/org.argeo.slc.core/pom.xml
index e8ea86307..982f0e654 100644
--- a/org.argeo.slc.core/pom.xml
+++ b/org.argeo.slc.core/pom.xml
@@ -1,4 +1,6 @@
-<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.slc</groupId>
@@ -53,5 +55,38 @@
 			<artifactId>org.argeo.slc.api</artifactId>
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
+
+		<!-- Spring -->
+		<dependency>
+			<groupId>org.argeo.tp.spring</groupId>
+			<artifactId>org.springframework.beans</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.spring</groupId>
+			<artifactId>org.springframework.core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.spring</groupId>
+			<artifactId>org.springframework.context</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.spring</groupId>
+			<artifactId>org.springframework.aop</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.gemini</groupId>
+			<artifactId>org.eclipse.gemini.blueprint.core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.gemini</groupId>
+			<artifactId>org.eclipse.gemini.blueprint.io</artifactId>
+		</dependency>
+
+		<!-- Ant -->
+		<dependency>
+			<groupId>org.argeo.tp.apache.ant</groupId>
+			<artifactId>org.apache.ant</artifactId>
+		</dependency>
+
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d73e11c53..f5891630b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,11 @@
-<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.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>2.1.80</version>
+		<version>2.1.81-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
@@ -14,6 +16,8 @@
 		<version.slc>2.1.17-SNAPSHOT</version.slc>
 		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
 		<developmentCycle.slc>2.1</developmentCycle.slc>
+
+		<version.argeo-tp-extras>2.1.13-SNAPSHOT</version.argeo-tp-extras>
 	</properties>
 	<modules>
 		<!-- Runtime -->
@@ -101,6 +105,17 @@ limitations under the License.
 			</roles>
 		</developer>
 	</developers>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.argeo.tp.extras</groupId>
+				<artifactId>argeo-tp-extras</artifactId>
+				<version>${version.argeo-tp-extras}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<repositories>
 		<repository>
 			<id>argeo</id>
@@ -111,6 +126,15 @@ limitations under the License.
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 		</repository>
+		<repository>
+			<id>argeo-extras</id>
+			<url>http://repo.argeo.org/data/java/argeo-extras-2.1/</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</releases>
+		</repository>
 	</repositories>
 	<reporting>
 		<plugins>
@@ -185,4 +209,20 @@ limitations under the License.
 			<url>file:///srv/docfactory/argeo-2.1/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>