Improve and simplify OSGi Boot

[lgpl/argeo-commons.git] / dep / org.argeo.dep.cms.client / pom.xml

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index ebfca54c02b92bcf0dfd6c337d1988526251de9e..da2dc1160995f0a89a7b0757ad785cf90fc22403 100644 (file)
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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</groupId>
-               <version>2.1.31-SNAPSHOT</version>
+               <version>2.1.46-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -16,23 +15,12 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.util</artifactId>
-                       <version>2.1.31-SNAPSHOT</version>
+                       <version>2.1.46-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.server.jcr</artifactId>
-                       <version>2.1.31-SNAPSHOT</version>
-               </dependency>
-               <!-- <dependency> -->
-               <!-- <groupId>org.argeo.commons</groupId> -->
-               <!-- <artifactId>org.argeo.security.jackrabbit</artifactId> -->
-               <!-- <version>2.1.31-SNAPSHOT</version> -->
-               <!-- </dependency> -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>2.1.31-SNAPSHOT</version>
-                       <scope>test</scope>
+                       <version>2.1.46-SNAPSHOT</version>
                </dependency>
 
                <!-- Third Parties -->
@@ -120,10 +108,6 @@
                        <groupId>org.argeo.tp.equinox</groupId>
                        <artifactId>org.eclipse.osgi.util</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.tp.equinox</groupId>
                        <artifactId>org.eclipse.equinox.util</artifactId>
@@ -160,6 +144,14 @@
                        <groupId>org.argeo.tp.equinox</groupId>
                        <artifactId>org.eclipse.equinox.app</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.ds</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.metatype</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.tp.apache.felix</groupId>
                        <artifactId>org.apache.felix.gogo.runtime</artifactId>
@@ -201,6 +193,19 @@
                        <artifactId>org.apache.jackrabbit.jcr2spi</artifactId>
                </dependency>
 
+               <!-- Required by Jackrabbit 2.12 -->
+               <dependency>
+                       <groupId>org.argeo.tp.misc</groupId>
+                       <artifactId>com.google.guava</artifactId>
+               </dependency>
+
+               <!-- Test only -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>2.1.46-SNAPSHOT</version>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
 
        <profiles>
@@ -275,6 +280,7 @@
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>argeo-cms-client-tp</require>
+                                                                               <require>osgi-boot</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>