User ${version.slc} instead of ${project.version}

git-svn-id: https://svn.argeo.org/slc/trunk@4162 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/demo/pom.xml b/demo/pom.xml
index 01f312bb5f1ffb004227e6593dfab2b8148e1f19..67cee7228d3308c8582c8b074dcd7be45f314108 100644 (file)
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -52,7 +52,7 @@
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
                                        <artifactId>org.argeo.slc.dep.server</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.slc.server</groupId>
@@ -85,7 +85,7 @@
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
                                        <artifactId>org.argeo.slc.dep.server</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.slc.server</groupId>
@@ -118,12 +118,12 @@
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
                                        <artifactId>org.argeo.slc.dep.agent</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
                                        <artifactId>org.argeo.slc.dep.agent.extras</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                </dependency>
                        </dependencies>
                </profile>
@@ -150,7 +150,7 @@
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
                                        <artifactId>org.argeo.slc.dep.gis</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                </dependency>
                        </dependencies>
                </profile>
@@ -184,7 +184,7 @@
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
                                        <artifactId>org.argeo.slc.dep.detached</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                </dependency>
                                <dependency>
                                        <groupId>net.sourceforge.mx4j</groupId>
@@ -233,7 +233,7 @@
                        <dependencies>
                                <dependency>
                                        <groupId>org.argeo.slc.dep</groupId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.slc.server</groupId>

diff --git a/dep/org.argeo.slc.dep.agent/pom.xml b/dep/org.argeo.slc.dep.agent/pom.xml
index 786668f976dc5cd93e874b6508f5cbbe79f70863..e88afa954296ff53b76ddcdba3ce4274a3435794 100644 (file)
--- a/dep/org.argeo.slc.dep.agent/pom.xml
+++ b/dep/org.argeo.slc.dep.agent/pom.xml
@@ -23,52 +23,52 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.equinox</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.activemq</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.ant</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.jcr</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.lib.detached</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.launcher</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.maven</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index f2d5eba3cb00edf2196c240bd7d58c88c4eb3352..594284fe04ea0c7d9a177d4500bfc6073cdbcd05 100644 (file)
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -31,42 +31,42 @@
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.agent</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.server</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.detached</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.gis</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.provided</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!-- SLC non deps -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!-- TO BE DELETED <dependency> <groupId>org.argeo.slc.dep</groupId> <artifactId>org.argeo.slc.dep.eclipse</artifactId> 
-                       <version>${project.version}</version> </dependency> -->
+                       <version>${version.slc}</version> </dependency> -->
                <dependency>
                        <groupId>org.argeo.slc.server</groupId>
                        <artifactId>org.argeo.slc.ria</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!-- Modules (see profiles below) -->
@@ -75,7 +75,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.launcher</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                        <type>tar.gz</type>
                        <classifier>base</classifier>
                </dependency>
@@ -101,13 +101,13 @@
                                <dependency>
                                        <groupId>org.argeo.slc.modules</groupId>
                                        <artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                        <type>pom</type>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.slc.modules</groupId>
                                        <artifactId>org.argeo.slc.modules.server.bundles</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                        <type>pom</type>
                                </dependency>
                        </dependencies>
@@ -124,13 +124,13 @@
                                <dependency>
                                        <groupId>org.argeo.slc.modules</groupId>
                                        <artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                        <type>pom</type>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.slc.modules</groupId>
                                        <artifactId>org.argeo.slc.modules.server.bundles</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                        <type>pom</type>
                                </dependency>
                        </dependencies>

diff --git a/dep/org.argeo.slc.dep.detached/pom.xml b/dep/org.argeo.slc.dep.detached/pom.xml
index 6675084492be91918d00db55de0827e0cc380fd1..84602bc3f228846b66c0616f84336022b0ef96ae 100644 (file)
--- a/dep/org.argeo.slc.dep.detached/pom.xml
+++ b/dep/org.argeo.slc.dep.detached/pom.xml
@@ -16,12 +16,12 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.detached</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.jemmy</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <!-- For JDK 1.4 -->
                <dependency>

diff --git a/dep/org.argeo.slc.dep.eclipse/pom.xml b/dep/org.argeo.slc.dep.eclipse/pom.xml
index 05eb81113d8e8ddcba867eea9a385ec050c8f0e4..0f3154fbc87e900581003e03bbf7c0c039276d54 100644 (file)
--- a/dep/org.argeo.slc.dep.eclipse/pom.xml
+++ b/dep/org.argeo.slc.dep.eclipse/pom.xml
@@ -14,12 +14,12 @@
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.rcp</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.ui</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/dep/org.argeo.slc.dep.gis/pom.xml b/dep/org.argeo.slc.dep.gis/pom.xml
index b3dafd1067fee79b97b43eb61ecc3b9b444d488e..18b63ca63b6e10106a098da25d74bbcf0f45ad4b 100644 (file)
--- a/dep/org.argeo.slc.dep.gis/pom.xml
+++ b/dep/org.argeo.slc.dep.gis/pom.xml
@@ -23,7 +23,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.gis</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!--  Needed by Geotools -->

diff --git a/dep/org.argeo.slc.dep.sdk.rap/pom.xml b/dep/org.argeo.slc.dep.sdk.rap/pom.xml
index c40ff685f02d4daecaf0d52b4ba499be951c1092..b6a313e4b71e5fea116ecbfa9f520683436e967a 100644 (file)
--- a/dep/org.argeo.slc.dep.sdk.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.sdk.rap/pom.xml
@@ -22,13 +22,13 @@
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.rap</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.sdk.rcp</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>org.argeo.commons.eclipse</groupId>

diff --git a/dep/org.argeo.slc.dep.sdk.rcp/pom.xml b/dep/org.argeo.slc.dep.sdk.rcp/pom.xml
index e786c765cc785fe4bb8593ea1f18848f1f19fe15..ce7844e0162838609ba9de17f974e0b8f3bdc12b 100644 (file)
--- a/dep/org.argeo.slc.dep.sdk.rcp/pom.xml
+++ b/dep/org.argeo.slc.dep.sdk.rcp/pom.xml
@@ -22,12 +22,12 @@
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.ui</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.ui.dist</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <!-- Secure Application -->
                <dependency>
@@ -39,14 +39,14 @@
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.rcp</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!-- Back-end Dependencies -->
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.backend</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
        </dependencies>
        <profiles>
@@ -59,7 +59,7 @@
                                <dependency>
                                        <groupId>org.argeo.slc.eclipse</groupId>
                                        <artifactId>org.argeo.slc.eclipse.modules.bundles</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                        <type>pom</type>
                                </dependency>
                        </dependencies>
@@ -76,7 +76,7 @@
                                <dependency>
                                        <groupId>org.argeo.slc.eclipse</groupId>
                                        <artifactId>org.argeo.slc.eclipse.modules.bundles</artifactId>
-                                       <version>${project.version}</version>
+                                       <version>${version.slc}</version>
                                        <type>pom</type>
                                </dependency>
                        </dependencies>

diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index 6fe4f99a8f083dbaf9fa15fa824d61098ddc93b4..bb635e768a98b19f190f97b38f6aa6de3ccc929f 100644 (file)
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -16,39 +16,39 @@
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.agent</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.detached</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!-- SLC -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.server</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.hibernate</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.equinox</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.jcr</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.repo</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!-- Commons -->

diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index 555b6c93fd7e9c8f5b7c3ca3a4bf93334d1c350e..985272e9ee0be2e403c9da4cdd73fa37b1da778b 100644 (file)
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -141,7 +141,7 @@
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.sdk.rcp</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
        </dependencies>
        <profiles>
@@ -158,7 +158,7 @@
                        </activation>
 
                        <properties>
-                               <package.version>${project.version}</package.version>
+                               <package.version>${version.slc}</package.version>
                                <distribution.label>argeo</distribution.label>
                                <distribution.root>/var/argeo/linux/argeo-el/5/argeo-testing</distribution.root>
                        </properties>

diff --git a/eclipse/plugins/org.argeo.slc.client.rap/pom.xml b/eclipse/plugins/org.argeo.slc.client.rap/pom.xml
index a5afd2e24261a06b2f86d1fc739f79402693d6f4..26af3bb30cf3756d96cf5e2224130663a81c16eb 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.rap/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.rap/pom.xml
@@ -16,7 +16,7 @@
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.ui</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!-- Argeo common distribution for RAP projects -->

diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml b/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml
index cbe11271d8aadd8f0ce38f6acd0abb967d077e5a..b7edf4a813851063c503c1b3bf91f1d3dcfc1f92 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml
@@ -16,7 +16,7 @@
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.ui</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!-- Argeo common distribution for RCP projects -->

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/pom.xml b/eclipse/plugins/org.argeo.slc.client.ui/pom.xml
index f9a7e314e7b633336234d93fb63eba96cc729674..659a279d5eaeb327dd83933e516df924e4f6ef82 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui/pom.xml
@@ -17,27 +17,27 @@
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.oxm</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!-- <dependency> <groupId>org.argeo.slc.eclipse</groupId> <artifactId>org.argeo.slc.client.commons</artifactId> 
-                       <version>${project.version}</version> </dependency> -->
+                       <version>${version.slc}</version> </dependency> -->
                <!-- SLC -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.server</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!-- Spring -->

diff --git a/eclipse/runtime/org.argeo.slc.client.commons/pom.xml b/eclipse/runtime/org.argeo.slc.client.commons/pom.xml
index 47b051c31c43772d7864b3f4b6a9905cca5c8ecc..11ba6e06c6bb70920abc9c1cbb7b18be562cb371 100644 (file)
--- a/eclipse/runtime/org.argeo.slc.client.commons/pom.xml
+++ b/eclipse/runtime/org.argeo.slc.client.commons/pom.xml
@@ -15,13 +15,13 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.server</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <!-- Commons -->
                <dependency>

diff --git a/eclipse/runtime/org.argeo.slc.client.core/pom.xml b/eclipse/runtime/org.argeo.slc.client.core/pom.xml
index 5c37a212eefbadab9476e7d1c53212f140cf03da..f622bf1878423f540941f06883ffa3aeb608bb5d 100644 (file)
--- a/eclipse/runtime/org.argeo.slc.client.core/pom.xml
+++ b/eclipse/runtime/org.argeo.slc.client.core/pom.xml
@@ -16,7 +16,7 @@
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.commons</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                
                <!-- Commons For Eclipse -->
@@ -38,7 +38,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <!-- Spring -->
                <dependency>

diff --git a/eclipse/runtime/org.argeo.slc.client.oxm/pom.xml b/eclipse/runtime/org.argeo.slc.client.oxm/pom.xml
index 373fa05267fa961f4f07f9a33163c750856e84a2..b153652d6e7830c39fa33e665b83416d103d4d0a 100644 (file)
--- a/eclipse/runtime/org.argeo.slc.client.oxm/pom.xml
+++ b/eclipse/runtime/org.argeo.slc.client.oxm/pom.xml
@@ -29,7 +29,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
 

diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index c45f877075615c5d69a210039a539f55337ba069..1c86dba39b475f0355c1a4368b7e6ec2967a3cd6 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -115,14 +115,14 @@
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.sdk.rcp</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <!-- Unit Tests -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index 09812e101d4e3e55cf5fc5deebfe0b9530e1dbca..eeab4dc53126e113ae2bf772a3f0f7b4d84442c1 100644 (file)
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -26,7 +26,7 @@
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.server</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                        <scope>test</scope>
                </dependency>
        </dependencies>

diff --git a/pom.xml b/pom.xml
index 3808b1e7ab1dc05d66235d3f63f209b6afa4cac2..cb36f1991220b74a1c19ce501631a63335ae7a2d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,10 +12,10 @@
        <name>Argeo SLC</name>
        <version>0.13.1-SNAPSHOT</version>
        <properties>
-               <developmentCycle>0.13</developmentCycle>
+               <developmentCycle.slc>0.13</developmentCycle.slc>
                <site.repoBase>file:///srv/projects/www/slc/site</site.repoBase>
                <site.urlBase>http://projects.argeo.org/slc/site</site.urlBase>
-               <version.argeo-slc>0.13.1-SNAPSHOT</version.argeo-slc>
+               <version.slc>${developmentCycle.slc}.1-SNAPSHOT</version.slc>
        </properties>
        <modules>
                <module>runtime</module>
@@ -28,7 +28,7 @@
                <!-- <module>archetypes</module> -->
                <module>dist</module>
        </modules>
-       <url>${site.urlBase}/${developmentCycle}</url>
+       <url>${site.urlBase}/${developmentCycle.slc}</url>
        <scm>
                <connection>scm:svn:https://svn.argeo.org/slc/trunk</connection>
                <developerConnection>scm:svn:https://svn.argeo.org/slc/trunk</developerConnection>
@@ -204,7 +204,7 @@ limitations under the License.
                </archive> </configuration> </plugin> <plugin> <groupId>org.apache.felix</groupId> 
                <artifactId>maven-bundle-plugin</artifactId> <version>${version.maven-bundle-plugin}</version> 
                <extensions>true</extensions> <configuration> <manifestLocation>target/classes/META-INF</manifestLocation> 
-               <instructions> <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version> 
+               <instructions> <Bundle-Version>${version.slc}-r${buildNumber}</Bundle-Version> 
                <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> 
                <_removeheaders>Bnd-LastModified</_removeheaders> </instructions> </configuration> 
                <executions> <execution> <id>bundle-manifest</id> <phase>process-classes</phase> 
@@ -244,92 +244,92 @@ limitations under the License.
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.specs</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.core</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.unit</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.launcher</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.detached</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.lib.detached</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.simple</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.ant</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.maven</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.hibernate</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.castor</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.activemq</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.jcr</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.server</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.osgi</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.equinox</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.jemmy</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.server</groupId>
                                <artifactId>org.argeo.slc.ria</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.ria</groupId>
@@ -339,14 +339,14 @@ limitations under the License.
                        <dependency>
                                <groupId>org.argeo.slc.server</groupId>
                                <artifactId>deploy</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                                <type>pom</type>
                        </dependency>
                        <!-- SLC dubious -->
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.detached.launcher</artifactId>
-                               <version>${project.version}</version>
+                               <version>${version.slc}</version>
                                <type>tar.gz</type>
                                <classifier>dist</classifier>
                        </dependency>
@@ -415,7 +415,7 @@ limitations under the License.
                <site>
                        <id>argeo-slc-site</id>
                        <name>SLC Site</name>
-                       <url>file://${site.repoBase}/${developmentCycle}/</url>
+                       <url>file://${site.repoBase}/${developmentCycle.slc}/</url>
                </site>
        </distributionManagement>
        <reporting>
@@ -534,7 +534,7 @@ limitations under the License.
                                <site>
                                        <id>argeo-slc-site</id>
                                        <name>SLC Site</name>
-                                       <url>file://${site.repoBase}/${project.version}</url>
+                                       <url>file://${site.repoBase}/${version.slc}</url>
                                </site>
                        </distributionManagement>
                </profile>

diff --git a/runtime/org.argeo.slc.core/pom.xml b/runtime/org.argeo.slc.core/pom.xml
index f64673e6df6828e83b7c1715d2cf1323e99dece5..5cb6294ef1ca292113f044ebc6ac021695fa2609 100644 (file)
--- a/runtime/org.argeo.slc.core/pom.xml
+++ b/runtime/org.argeo.slc.core/pom.xml
@@ -41,7 +41,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.specs</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>

diff --git a/runtime/org.argeo.slc.launcher/pom.xml b/runtime/org.argeo.slc.launcher/pom.xml
index 469923cc2f6c301186e89bc5d900d68c71178773..2e989c2b240e46f0dc193a392c2b6c1b4b1123e9 100644 (file)
--- a/runtime/org.argeo.slc.launcher/pom.xml
+++ b/runtime/org.argeo.slc.launcher/pom.xml
@@ -75,7 +75,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.osgi</groupId>

diff --git a/runtime/org.argeo.slc.lib.detached/pom.xml b/runtime/org.argeo.slc.lib.detached/pom.xml
index 178673a4c9d549cb73c92d57b3026e52903d3f83..82797f97008dfa35a8b94349e1221efa7f67f3f3 100644 (file)
--- a/runtime/org.argeo.slc.lib.detached/pom.xml
+++ b/runtime/org.argeo.slc.lib.detached/pom.xml
@@ -31,24 +31,24 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.detached</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!-- Unit Tests -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                        <scope>test</scope>
                </dependency>
 

diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index c826dd5696a010c92b010acdf9059d4c30092395..d797b63f66bc29e2cf68de0d4fa08e10849fd9dc 100644 (file)
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -47,7 +47,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!-- Spring -->

diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index 5303b7180bc80ed90f9cff7e0fd83a16e0617d05..395238490d0abeba81103fa7964d59f8162add0d 100644 (file)
--- a/runtime/org.argeo.slc.support.activemq/pom.xml
+++ b/runtime/org.argeo.slc.support.activemq/pom.xml
@@ -31,7 +31,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!-- Spring -->

diff --git a/runtime/org.argeo.slc.support.ant/pom.xml b/runtime/org.argeo.slc.support.ant/pom.xml
index 010451e7f3f134f783839942edd23e0f23a0511f..00122c3bf3ea29d9fc347b447c8d6838cebcf138 100644 (file)
--- a/runtime/org.argeo.slc.support.ant/pom.xml
+++ b/runtime/org.argeo.slc.support.ant/pom.xml
@@ -31,7 +31,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>

diff --git a/runtime/org.argeo.slc.support.castor/pom.xml b/runtime/org.argeo.slc.support.castor/pom.xml
index 6887117fd9eee00b61b62e9fe1da022c252d6192..f820067a7d98cec1ba33f61f6efc4037651c044e 100644 (file)
--- a/runtime/org.argeo.slc.support.castor/pom.xml
+++ b/runtime/org.argeo.slc.support.castor/pom.xml
@@ -63,7 +63,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>
@@ -91,7 +91,7 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/runtime/org.argeo.slc.support.equinox/pom.xml b/runtime/org.argeo.slc.support.equinox/pom.xml
index 44f0410ab0c13d08c9b272686e6349596d7d783c..a7510dc9599cbdec5a8bc97fc00fc5304101387b 100644 (file)
--- a/runtime/org.argeo.slc.support.equinox/pom.xml
+++ b/runtime/org.argeo.slc.support.equinox/pom.xml
@@ -44,7 +44,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.osgi</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>
@@ -57,7 +57,7 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/runtime/org.argeo.slc.support.gis/pom.xml b/runtime/org.argeo.slc.support.gis/pom.xml
index 250645068820ba1e40f9a239e5ba367d1f9fbbdc..23cab467c0d54419de431911b74edd8eb1366d6c 100644 (file)
--- a/runtime/org.argeo.slc.support.gis/pom.xml
+++ b/runtime/org.argeo.slc.support.gis/pom.xml
@@ -35,7 +35,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>

diff --git a/runtime/org.argeo.slc.support.hibernate/pom.xml b/runtime/org.argeo.slc.support.hibernate/pom.xml
index b9263025bee328c904221a1b2f2eb43b7e4e46ef..ef9e5f0baa7df5a20bf476bc93dfb3452d08dcb5 100644 (file)
--- a/runtime/org.argeo.slc.support.hibernate/pom.xml
+++ b/runtime/org.argeo.slc.support.hibernate/pom.xml
@@ -29,7 +29,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>
@@ -69,14 +69,14 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
                        <scope>test</scope>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>

diff --git a/runtime/org.argeo.slc.support.jcr/pom.xml b/runtime/org.argeo.slc.support.jcr/pom.xml
index 2513d1192af80c5f3ca64da68c6101005aac0673..9058c30d82b8dbf1bb56f55b14310662333d3734 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/pom.xml
+++ b/runtime/org.argeo.slc.support.jcr/pom.xml
@@ -31,7 +31,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>
@@ -52,7 +52,7 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/runtime/org.argeo.slc.support.maven/pom.xml b/runtime/org.argeo.slc.support.maven/pom.xml
index e2d5575699b88a70561c7109380cfec16c22c6bc..a69e2cca667028562eca74845a458f1c91d60b77 100644 (file)
--- a/runtime/org.argeo.slc.support.maven/pom.xml
+++ b/runtime/org.argeo.slc.support.maven/pom.xml
@@ -67,12 +67,12 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.specs</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.aether</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                
                <!-- <dependency> <groupId>org.argeo.dep.osgi</groupId> <artifactId>org.argeo.dep.osgi.maven.embedder</artifactId> 

diff --git a/runtime/org.argeo.slc.support.osgi/pom.xml b/runtime/org.argeo.slc.support.osgi/pom.xml
index ff34db74c79fa14491175ce29459c44c791d00e7..4e400c8e638c307774ccc4fd2f3bb906ae5cb9df 100644 (file)
--- a/runtime/org.argeo.slc.support.osgi/pom.xml
+++ b/runtime/org.argeo.slc.support.osgi/pom.xml
@@ -32,7 +32,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>

diff --git a/runtime/org.argeo.slc.support.simple/pom.xml b/runtime/org.argeo.slc.support.simple/pom.xml
index 158dc3aff535274e425ac806441500a09f9b137b..305e49cee46b83e636eae2d773bf7933ce40134b 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/pom.xml
+++ b/runtime/org.argeo.slc.support.simple/pom.xml
@@ -42,7 +42,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!-- SSH -->

diff --git a/runtime/org.argeo.slc.support.ws.client/pom.xml b/runtime/org.argeo.slc.support.ws.client/pom.xml
index 5123f883fad8e6b998faf48e6b2f2237b4ff1228..9a5939e00e045d18717ebb2795df2a01db37cfd9 100644 (file)
--- a/runtime/org.argeo.slc.support.ws.client/pom.xml
+++ b/runtime/org.argeo.slc.support.ws.client/pom.xml
@@ -38,12 +38,12 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>

diff --git a/runtime/org.argeo.slc.unit/pom.xml b/runtime/org.argeo.slc.unit/pom.xml
index 2c45f9707f141fbda0eac8a51b9e570735d50efb..5e49cb667175b639c632bc9603c770b714b3f41e 100644 (file)
--- a/runtime/org.argeo.slc.unit/pom.xml
+++ b/runtime/org.argeo.slc.unit/pom.xml
@@ -38,12 +38,12 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.junit</groupId>
@@ -85,7 +85,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.launcher</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!-- OXM -->

diff --git a/runtime/pom.xml b/runtime/pom.xml
index e554f1727fe245b357aed15eb0f66a4b84943834..cd7ad76a7824614863cd99d59568eb5464cbeaec 100644 (file)
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -84,7 +84,7 @@
                        </plugin>
                        <!-- TO BE DELETED Configuration herited from commons/pom.xml <version>${version.maven-bundle-plugin}</version> 
                                <extensions>true</extensions> <configuration> <manifestLocation>META-INF</manifestLocation> 
-                               <instructions> <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version> 
+                               <instructions> <Bundle-Version>${version.slc}-r${buildNumber}</Bundle-Version> 
                                <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> 
                                <_removeheaders>Bnd-LastModified</_removeheaders> </instructions> </configuration> 
                                <executions> <execution> <id>bundle-manifest</id> <phase>process-classes</phase> 

diff --git a/sandbox/argeo.slc.executionflow/pom.xml b/sandbox/argeo.slc.executionflow/pom.xml
index f275ad4060d8db2de3c1412322dbe88934b53aa0..1bce405c4487bbfb2bbe0bd70575b1508d71c02a 100644 (file)
--- a/sandbox/argeo.slc.executionflow/pom.xml
+++ b/sandbox/argeo.slc.executionflow/pom.xml
@@ -41,7 +41,7 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.detached.launcher</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>

diff --git a/sandbox/argeo.slc.jemmytest/pom.xml b/sandbox/argeo.slc.jemmytest/pom.xml
index c324c166cb25b947eb3c0906ae43dc950271ea5d..c36efd09c7fd258d1a7cd0645e293deb412457c8 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/pom.xml
+++ b/sandbox/argeo.slc.jemmytest/pom.xml
@@ -84,7 +84,7 @@
                                                                <artifactItem>
                                                                        <groupId>org.argeo.slc.runtime</groupId>
                                                                        <artifactId>org.argeo.slc.osgiboot</artifactId>
-                                                                       <version>${project.version}</version>
+                                                                       <version>${version.slc}</version>
                                                                        <type>tar.gz</type>
                                                                        <classifier>osgiboot</classifier>
                                                                </artifactItem>
@@ -124,12 +124,12 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.lib.detached</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.launcher</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.dep.jemmy</groupId>
@@ -139,7 +139,7 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.detached.launcher</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <dependency>
@@ -149,13 +149,13 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.equinox</artifactId>
-                       <version>${project.version}</version>
+                       <version>${version.slc}</version>
                </dependency>
 
                <!--
                        <dependency> <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.detached</artifactId>
-                       <version>${project.version}</version> <exclusions> <exclusion>
+                       <version>${version.slc}</version> <exclusions> <exclusion>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
                        </exclusion> </exclusions> </dependency> <dependency>
@@ -164,13 +164,13 @@
 
                        <dependency> <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.detached.launcher</artifactId>
-                       <version>${project.version}</version> <exclusions> <exclusion>
+                       <version>${version.slc}</version> <exclusions> <exclusion>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
                        </exclusion> </exclusions> </dependency> <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.agent</artifactId>
-                       <version>${project.version}</version> <exclusions> <exclusion>
+                       <version>${version.slc}</version> <exclusions> <exclusion>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
                        </exclusion> </exclusions> </dependency>