From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 13 Nov 2017 11:55:10 +0000 (+0100)
Subject: Use Maven version for slc-maven RPM
X-Git-Tag: argeo-slc-2.1.10~13
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=dddbccb13ea466d1e3d193d4a84928e9534b8c23;p=gpl%2Fargeo-slc.git

Use Maven version for slc-maven RPM
---

diff --git a/dist/slc-maven/pom.xml b/dist/slc-maven/pom.xml
index b84b0ad79..522d61cd0 100644
--- a/dist/slc-maven/pom.xml
+++ b/dist/slc-maven/pom.xml
@@ -1,4 +1,5 @@
-<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>
@@ -15,11 +16,11 @@
 			<artifactId>org.argeo.slc.support.maven</artifactId>
 			<version>2.1.10-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.lib.build</artifactId>
-			<version>2.1.10-SNAPSHOT</version>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.slc</groupId> -->
+		<!-- <artifactId>org.argeo.slc.lib.build</artifactId> -->
+		<!-- <version>2.1.10-SNAPSHOT</version> -->
+		<!-- </dependency> -->
 	</dependencies>
 	<profiles>
 		<profile>
@@ -38,6 +39,7 @@
 								</goals>
 								<configuration>
 									<name>slc-maven</name>
+									<version>${version.maven}</version>
 									<copyright>2011 Argeo</copyright>
 									<mappings>
 										<mapping>
@@ -49,7 +51,7 @@
 											<dependency>
 												<includes>
 													<include>org.argeo.slc:org.argeo.slc.support.maven</include>
-													<include>org.argeo.slc:org.argeo.slc.lib.build</include>
+													<!-- <include>org.argeo.slc:org.argeo.slc.lib.build</include> -->
 												</includes>
 											</dependency>
 										</mapping>
diff --git a/org.argeo.slc.support.maven/pom.xml b/org.argeo.slc.support.maven/pom.xml
index 9c53a6fcb..78102b674 100644
--- a/org.argeo.slc.support.maven/pom.xml
+++ b/org.argeo.slc.support.maven/pom.xml
@@ -12,7 +12,6 @@
 	<name>SLC Support Maven</name>
 	<properties>
 		<version.aether>1.0.1.v20141111</version.aether>
-		<version.maven>3.2.5</version.maven>
 		<version.wagon>1.0</version.wagon>
 	</properties>
 	<build>
diff --git a/pom.xml b/pom.xml
index 58fc47461..b12659b2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,8 @@
 		<version.argeo-rcp>2.1.15</version.argeo-rcp>
 		<version.slc>2.1.10-SNAPSHOT</version.slc>
 		<version.equinox>3.11.1.v20160708-1632</version.equinox>
+		<!-- Embedded Maven -->
+		<version.maven>3.2.5</version.maven>
 	</properties>
 	<modules>
 		<!-- Runtime -->