Use version properties for modules dependencies

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

diff --git a/security/dep/org.argeo.security.dep.ads/pom.xml b/security/dep/org.argeo.security.dep.ads/pom.xml
index 3ee670716854aa371fa19c63f3837189f475eaeb..38d37c0189fd904d2226bc32cbd1aff0f119fe57 100644 (file)
--- a/security/dep/org.argeo.security.dep.ads/pom.xml
+++ b/security/dep/org.argeo.security.dep.ads/pom.xml
@@ -21,7 +21,7 @@
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.server.ads.server</artifactId>
-                       <version>0.3.1-SNAPSHOT</version>
+                       <version>${version.argeo-commons}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index c8c73983211b3e4e9ae55c362f04a8bab0e48afa..be7de50caab90ec9a2f000f93aeeb5321b27457c 100644 (file)
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -62,17 +62,12 @@
                <dependency>
                        <groupId>org.argeo.commons.security</groupId>
                        <artifactId>org.argeo.security.services</artifactId>
-                       <version>0.3.1-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.services.admin</artifactId>
-                       <version>0.3.1-SNAPSHOT</version>
+                       <version>${version.argeo-commons}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.security</groupId>
                        <artifactId>org.argeo.security.dao.ldap</artifactId>
-                       <version>0.3.1-SNAPSHOT</version>
+                       <version>${version.argeo-commons}</version>
                </dependency>
 
                <!-- LDAP server -->
@@ -139,17 +134,17 @@
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.jackrabbit.webapp</artifactId>
-                       <version>0.3.1-SNAPSHOT</version>
+                       <version>${version.argeo-commons}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.node.repo.jackrabbit</artifactId>
-                       <version>0.3.1-SNAPSHOT</version>
+                       <version>${version.argeo-commons}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
-                       <version>0.3.1-SNAPSHOT</version>
+                       <version>${version.argeo-commons}</version>
                </dependency>
                <!-- Hibernate -->
                <dependency>

diff --git a/security/features/org.argeo.security.dep.node.rap/pom.xml b/security/features/org.argeo.security.dep.node.rap/pom.xml
index 5c1793877124c622e6d2489defca483aa258adb3..2250c50d37cee020ecc97b03ce1326da4fe6d538 100644 (file)
--- a/security/features/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rap/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.commons.security</groupId>
@@ -15,24 +16,24 @@
                                <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                        </plugin>
-<!--                   <plugin>-->
-<!--                           <groupId>org.apache.maven.plugins</groupId>-->
-<!--                           <artifactId>maven-assembly-plugin</artifactId>-->
-<!--                           <configuration>-->
-<!--                                   <descriptors>-->
-<!--                                           <descriptor>src/assembly/dist.xml</descriptor>-->
-<!--                                   </descriptors>-->
-<!--                           </configuration>-->
-<!--                           <executions>-->
-<!--                                   <execution>-->
-<!--                                           <id>attach-assembly</id>-->
-<!--                                           <phase>package</phase>-->
-<!--                                           <goals>-->
-<!--                                                   <goal>single</goal>-->
-<!--                                           </goals>-->
-<!--                                   </execution>-->
-<!--                           </executions>-->
-<!--                   </plugin>-->
+                       <!-- <plugin> -->
+                       <!-- <groupId>org.apache.maven.plugins</groupId> -->
+                       <!-- <artifactId>maven-assembly-plugin</artifactId> -->
+                       <!-- <configuration> -->
+                       <!-- <descriptors> -->
+                       <!-- <descriptor>src/assembly/dist.xml</descriptor> -->
+                       <!-- </descriptors> -->
+                       <!-- </configuration> -->
+                       <!-- <executions> -->
+                       <!-- <execution> -->
+                       <!-- <id>attach-assembly</id> -->
+                       <!-- <phase>package</phase> -->
+                       <!-- <goals> -->
+                       <!-- <goal>single</goal> -->
+                       <!-- </goals> -->
+                       <!-- </execution> -->
+                       <!-- </executions> -->
+                       <!-- </plugin> -->
                </plugins>
        </build>
        <dependencies>
@@ -60,5 +61,12 @@
                        <artifactId>org.argeo.security.ui.rap</artifactId>
                        <version>0.3.1-SNAPSHOT</version>
                </dependency>
+
+               <!-- For Tomcat deployment -->
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.osgi.webapp</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
        </dependencies>
 </project>

diff --git a/security/plugins/org.argeo.security.ui.rap/pom.xml b/security/plugins/org.argeo.security.ui.rap/pom.xml
index 5ea1ba4209499d3362f709782b467f3df3f5d5cf..76b7bd4e33d649a961c10a0d8df0c8d3cab010a3 100644 (file)
--- a/security/plugins/org.argeo.security.ui.rap/pom.xml
+++ b/security/plugins/org.argeo.security.ui.rap/pom.xml
@@ -75,10 +75,5 @@
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
                        <version>0.3.1-SNAPSHOT</version>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.osgi.webapp</artifactId>
-                       <version>0.3.1-SNAPSHOT</version>
-               </dependency>
        </dependencies>
 </project>

diff --git a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml b/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
index 525a7d48c85c38381da502d702cf2ff677015374..3ff37d4958f1b449437f6a995556a299fa25b5b4 100644 (file)
--- a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
+++ b/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
@@ -17,12 +17,12 @@
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.server.tika.jackrabbit</artifactId>
-                       <version>0.3.1-SNAPSHOT</version>
+                       <version>${version.argeo-commons}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.server.ext.jackrabbit</artifactId>
-                       <version>0.3.1-SNAPSHOT</version>
+                       <version>${version.argeo-commons}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.xalan</groupId>

diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
index ec989d77cb044b9b0e5a1b792999e774d426c8e6..62fa128f7a7966825d77fd5e7c74c0c2ced7976f 100644 (file)
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -22,7 +22,7 @@
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.server.catalina</artifactId>
-                       <version>0.3.1-SNAPSHOT</version>
+                       <version>${version.argeo-commons}</version>
                </dependency>
 <!--           <dependency> -->
 <!--                   <groupId>org.argeo.commons.server</groupId> -->