Upgrade Equinox to 3.5

[gpl/argeo-slc.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 4816463ac0c371ef5b1f5f1159ba0ab568cc7998..cc92d1fe08bb6a3a24fe088075d0375452d6c9c5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,9 +23,10 @@
        <properties>
                <developmentCycle>0.12</developmentCycle>
                <version.argeo-ria>0.12.2-SNAPSHOT</version.argeo-ria>
-               <version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
+               <version.argeo-commons>0.1.2-SNAPSHOT</version.argeo-commons>
+               <version.equinox>3.5.1.R35x_v20090827</version.equinox>
                <version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
-               <version.maven-argeo-osgi>0.1.21</version.maven-argeo-osgi>
+               <version.maven-argeo-osgi>0.1.24</version.maven-argeo-osgi>
                <version.maven-argeo-qooxdoo>0.8.2.1</version.maven-argeo-qooxdoo>
                <site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
                <site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
@@ -195,6 +196,15 @@ limitations under the License.
        </build>
        <dependencyManagement>
                <dependencies>
+                       <!-- Third Parties -->
+                       <dependency>
+                               <groupId>org.argeo.dep</groupId>
+                               <artifactId>versions</artifactId>
+                               <version>1.0.1-SNAPSHOT</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+
                        <!-- SLC (itself) -->
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
@@ -256,11 +266,6 @@ limitations under the License.
                                <artifactId>org.argeo.slc.server</artifactId>
                                <version>${project.version}</version>
                        </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.osgiboot</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.osgi</artifactId>
@@ -316,13 +321,35 @@ limitations under the License.
                                <classifier>dist</classifier>
                        </dependency>
 
+                       <!-- Argeo Commons -->
                        <dependency>
-                               <groupId>org.argeo.dep</groupId>
-                               <artifactId>versions</artifactId>
-                               <version>1.0.0</version>
+                               <groupId>org.argeo.commons.security</groupId>
+                               <artifactId>org.argeo.security.dep.ads</artifactId>
+                               <version>${version.argeo-commons}</version>
                                <type>pom</type>
-                               <scope>import</scope>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.commons.osgi</groupId>
+                               <artifactId>org.argeo.osgi.boot</artifactId>
+                               <version>${version.argeo-commons}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.commons.server</groupId>
+                               <artifactId>org.argeo.server.ads</artifactId>
+                               <version>${version.argeo-commons}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.commons.server</groupId>
+                               <artifactId>org.argeo.server.dep.jackrabbit.server</artifactId>
+                               <version>${version.argeo-commons}</version>
+                               <type>pom</type>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.commons.server</groupId>
+                               <artifactId>org.argeo.server.jackrabbit</artifactId>
+                               <version>${version.argeo-commons}</version>
+                       </dependency>
+
                </dependencies>
        </dependencyManagement>
        <repositories>