From b20d9443fc46845df95ae47ead3ecf431689d311 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 8 Jan 2018 11:50:41 +0100
Subject: [PATCH] Replace version.argeo-distribution with version.argeo-tp

---
 dep/org.argeo.dep.cms.client/pom.xml   | 2 +-
 dep/org.argeo.dep.cms.node/pom.xml     | 2 +-
 dep/org.argeo.dep.cms.platform/pom.xml | 4 ++--
 dep/org.argeo.dep.cms.rap.e4/pom.xml   | 4 ++--
 dep/org.argeo.dep.cms.sdk/pom.xml      | 2 +-
 dist/osgi-boot/pom.xml                 | 4 ++--
 org.argeo.cms.ui.workbench.rap/pom.xml | 2 +-
 org.argeo.cms.ui.workbench/pom.xml     | 2 +-
 org.argeo.osgi.boot/pom.xml            | 2 +-
 pom.xml                                | 8 ++++----
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index afcdaf0bb..2273769a3 100644
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -347,7 +347,7 @@
 								</goals>
 								<configuration>
 									<name>argeo-cms-client-tp</name>
-									<projversion>${version.argeo-distribution}</projversion>
+									<projversion>${version.argeo-tp}</projversion>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index f92d0abfb..fda4d28fc 100644
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -398,7 +398,7 @@
 								</goals>
 								<configuration>
 									<name>argeo-cms-node-tp</name>
-									<projversion>${version.argeo-distribution}</projversion>
+									<projversion>${version.argeo-tp}</projversion>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index 7b3e6fcc1..f533edc3e 100644
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -255,7 +255,7 @@
 			<dependency>
 				<groupId>org.argeo.tp</groupId>
 				<artifactId>argeo-tp-rap-e3</artifactId>
-				<version>${version.argeo-distribution}</version>
+				<version>${version.argeo-tp}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -374,7 +374,7 @@
 								</goals>
 								<configuration>
 									<name>argeo-cms-platform-tp</name>
-									<projversion>${version.argeo-distribution}</projversion>
+									<projversion>${version.argeo-tp}</projversion>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
diff --git a/dep/org.argeo.dep.cms.rap.e4/pom.xml b/dep/org.argeo.dep.cms.rap.e4/pom.xml
index 17bd9592a..005eccf7b 100644
--- a/dep/org.argeo.dep.cms.rap.e4/pom.xml
+++ b/dep/org.argeo.dep.cms.rap.e4/pom.xml
@@ -264,7 +264,7 @@
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.tp</groupId> -->
 		<!-- <artifactId>argeo-tp-rap-e4</artifactId> -->
-		<!-- <version>${version.argeo-distribution}</version> -->
+		<!-- <version>${version.argeo-tp}</version> -->
 		<!-- <scope>provided</scope> -->
 		<!-- </dependency> -->
 
@@ -391,7 +391,7 @@
 								</goals>
 								<configuration>
 									<name>argeo-cms-platform-tp</name>
-									<projversion>${version.argeo-distribution}</projversion>
+									<projversion>${version.argeo-tp}</projversion>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml
index 63ca846ba..5d20a30de 100644
--- a/dep/org.argeo.dep.cms.sdk/pom.xml
+++ b/dep/org.argeo.dep.cms.sdk/pom.xml
@@ -134,7 +134,7 @@
 								</goals>
 								<configuration>
 									<name>argeo-cms-sdk-tp</name>
-									<projversion>${version.argeo-distribution}</projversion>
+									<projversion>${version.argeo-tp}</projversion>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index 67a4a892d..82b93b910 100644
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>argeo-tp</artifactId>
-			<version>${version.argeo-distribution}</version>
+			<version>${version.argeo-tp}</version>
 		</dependency>
 
 		<!-- OSGi Boot (and Equinox) -->
@@ -139,7 +139,7 @@
 								</goals>
 								<configuration>
 									<name>osgi-boot-equinox</name>
-									<projversion>${version.argeo-distribution}</projversion>
+									<projversion>${version.argeo-tp}</projversion>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi/boot</directory>
diff --git a/org.argeo.cms.ui.workbench.rap/pom.xml b/org.argeo.cms.ui.workbench.rap/pom.xml
index fd1e222c8..253fcffb6 100644
--- a/org.argeo.cms.ui.workbench.rap/pom.xml
+++ b/org.argeo.cms.ui.workbench.rap/pom.xml
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>argeo-tp-rap-e3</artifactId>
-			<version>${version.argeo-distribution}</version>
+			<version>${version.argeo-tp}</version>
 			<type>pom</type>
 			<scope>provided</scope>
 		</dependency>
diff --git a/org.argeo.cms.ui.workbench/pom.xml b/org.argeo.cms.ui.workbench/pom.xml
index ce8bad18c..b3b78efdc 100644
--- a/org.argeo.cms.ui.workbench/pom.xml
+++ b/org.argeo.cms.ui.workbench/pom.xml
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>argeo-tp-rap-e3</artifactId>
-			<version>${version.argeo-distribution}</version>
+			<version>${version.argeo-tp}</version>
 			<type>pom</type>
 			<scope>provided</scope>
 		</dependency>
diff --git a/org.argeo.osgi.boot/pom.xml b/org.argeo.osgi.boot/pom.xml
index a52336316..580c3009f 100644
--- a/org.argeo.osgi.boot/pom.xml
+++ b/org.argeo.osgi.boot/pom.xml
@@ -24,7 +24,7 @@
 <!-- 		<dependency> -->
 <!-- 			<groupId>org.argeo.tp</groupId> -->
 <!-- 			<artifactId>argeo-tp</artifactId> -->
-<!-- 			<version>${version.argeo-distribution}</version> -->
+<!-- 			<version>${version.argeo-tp}</version> -->
 <!-- 			<scope>provided</scope> -->
 <!-- 		</dependency> -->
 
diff --git a/pom.xml b/pom.xml
index 7493ec80e..b7baa3d10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 		<version.argeo-commons>2.1.71-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>2.1.20</version.argeo-distribution>
+		<version.argeo-tp>2.1.20</version.argeo-tp>
 		<!-- RPM -->
 		<argeo.rpm.release>7</argeo.rpm.release>
 		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/7/x86_64</argeo.rpm.stagingRepository>
@@ -398,7 +398,7 @@ limitations under the License.
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>argeo-tp</artifactId>
-			<version>${version.argeo-distribution}</version>
+			<version>${version.argeo-tp}</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
@@ -407,14 +407,14 @@ limitations under the License.
 			<dependency>
 				<groupId>org.argeo.tp</groupId>
 				<artifactId>argeo-tp</artifactId>
-				<version>${version.argeo-distribution}</version>
+				<version>${version.argeo-tp}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.tp</groupId>
 				<artifactId>argeo-tp-rap-e4</artifactId>
-				<version>${version.argeo-distribution}</version>
+				<version>${version.argeo-tp}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-- 
2.30.2