Use Maven version for slc-maven RPM

diff --git a/dist/slc-maven/pom.xml b/dist/slc-maven/pom.xml
index b84b0ad7932eecc9cb6128379ef46a9cd472bbf3..522d61cd064058d5d9058caa7cd195fa918ad613 100644 (file)
--- 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 9c53a6fcb3049da96421f3ec72dec55b9f10a4ef..78102b6745702028117c750df60c95a86c09dbe3 100644 (file)
--- 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 58fc47461037c3e3afa8627ea7771e17873fddab..b12659b2db55641c6f7ddb360e2b9cd0931073d7 100644 (file)
--- 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 -->