Ignore OSGi framework version

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index 6ec2db8e389d427532f758069ca21c73f0e3896b..99e2f565918e64629066a19554c8ce4496174d00 100644 (file)
--- a/demo/slc_demo_rap.properties
+++ b/demo/slc_demo_rap.properties
@@ -35,7 +35,7 @@ org.argeo.slc.demo.minimal,\
 
 org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.dist.distributionPerspective
 
-argeo.node.useradmin.uris="ipa:/// dc=example,dc=com.ldif"
+#argeo.node.useradmin.uris="ipa:/// dc=example,dc=com.ldif"
 
 # override ports to run the demo as a server
 argeo.server.port.http=7070

diff --git a/org.argeo.slc.agent.jcr/bnd.bnd b/org.argeo.slc.agent.jcr/bnd.bnd
index 96ddb0d8d7d8fffb8865119b8c360c7fc35a876f..519cb03417c5e9c619c636d8580fe3ad0d6c7c23 100644 (file)
--- a/org.argeo.slc.agent.jcr/bnd.bnd
+++ b/org.argeo.slc.agent.jcr/bnd.bnd
@@ -16,4 +16,5 @@ org.apache.commons.vfs2.provider.url,\
 org.apache.commons.vfs2.provider.temp,\
 org.apache.commons.vfs2.provider.webdav,\
 org.apache.commons.vfs2.provider.zip,\
+org.osgi.*;version=0.0.0,\
 *

diff --git a/org.argeo.slc.agent/bnd.bnd b/org.argeo.slc.agent/bnd.bnd
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7f2410c173baa931035566f84532e18cfc8dcee0 100644 (file)
--- a/org.argeo.slc.agent/bnd.bnd
+++ b/org.argeo.slc.agent/bnd.bnd
@@ -0,0 +1,2 @@
+Import-Package: org.osgi.*;version=0.0.0,\
+*
\ No newline at end of file

diff --git a/org.argeo.slc.client.rcp/bnd.bnd b/org.argeo.slc.client.rcp/bnd.bnd
index b1d059bf2848eafca6dcbffd1de964f36737d6db..f02227257ba9d94d5cc648800bf8eb81853b3e20 100644 (file)
--- a/org.argeo.slc.client.rcp/bnd.bnd
+++ b/org.argeo.slc.client.rcp/bnd.bnd
@@ -8,5 +8,6 @@ Import-Package: javax.jcr.nodetype,\
 org.argeo.eclipse.spring,\
 org.argeo.slc.repo.core,\
 org.argeo.cms.util,\
+org.osgi.*;version=0.0.0,\
 *
                                                        
\ No newline at end of file

diff --git a/org.argeo.slc.client.rcp/pom.xml b/org.argeo.slc.client.rcp/pom.xml
index e5d0c4f116344c348d025492049686e6f171473f..1098fcaf96fa256be0f5e55c95b71eae3e09153e 100644 (file)
--- a/org.argeo.slc.client.rcp/pom.xml
+++ b/org.argeo.slc.client.rcp/pom.xml
@@ -2,11 +2,18 @@
        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.slc</groupId>
-               <artifactId>argeo-slc</artifactId>
-               <version>2.1.8-SNAPSHOT</version>
+               <groupId>org.argeo.commons.rcp</groupId>
+               <artifactId>argeo-rcp</artifactId>
+               <version>2.1.16-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
+       <!-- <parent> -->
+       <!-- <groupId>org.argeo.slc</groupId> -->
+       <!-- <artifactId>argeo-slc</artifactId> -->
+       <!-- <version>2.1.10-SNAPSHOT</version> -->
+       <!-- <relativePath>..</relativePath> -->
+       <!-- </parent> -->
+       <groupId>org.argeo.slc</groupId>
        <artifactId>org.argeo.slc.client.rcp</artifactId>
        <name>SLC Client RCP</name>
        <packaging>jar</packaging>
@@ -46,5 +53,12 @@
                        <artifactId>org.argeo.cms.ui.workbench.rcp</artifactId>
                        <version>${version.argeo-rcp}</version>
                </dependency>
+
+               <!-- RCP for build -->
+               <dependency>
+                       <groupId>org.argeo.commons.rcp</groupId>
+                       <artifactId>org.argeo.dep.cms.rcp</artifactId>
+               </dependency>
+
        </dependencies>
 </project>

diff --git a/org.argeo.slc.client.ui.dist/bnd.bnd b/org.argeo.slc.client.ui.dist/bnd.bnd
index 3b5709a4dacd9c67ccd82df6f84b741541afb1b2..c2eeb8769df955fa0b48d82d6dd0c5d5c1c98c59 100644 (file)
--- a/org.argeo.slc.client.ui.dist/bnd.bnd
+++ b/org.argeo.slc.client.ui.dist/bnd.bnd
@@ -10,6 +10,6 @@ Import-Package: org.argeo.eclipse.spring,\
 javax.jcr.nodetype,\
 javax.jcr.security,\
 aQute.lib.*;resolution:=optional,\
-org.argeo.slc.client.ui.specific,\
+org.osgi.*;version=0.0.0,\
 *
                                                        
\ No newline at end of file

diff --git a/org.argeo.slc.client.ui/bnd.bnd b/org.argeo.slc.client.ui/bnd.bnd
index 7d74571bfe022e08a440a3ed181ac6e3bb6ef26c..497210cbc2e6d7b51ea1be8b738c3ce8c75f2c54 100644 (file)
--- a/org.argeo.slc.client.ui/bnd.bnd
+++ b/org.argeo.slc.client.ui/bnd.bnd
@@ -8,4 +8,5 @@ org.eclipse.rap.ui.workbench;resolution:=optional
 Bundle-Activator: org.argeo.slc.client.ui.ClientUiPlugin
 Import-Package: org.argeo.eclipse.spring,\
 org.eclipse.core.runtime,\
+org.osgi.*;version=0.0.0,\
 *

diff --git a/org.argeo.slc.core/bnd.bnd b/org.argeo.slc.core/bnd.bnd
index 5b3c49ffa96255e5ec423c884a1de2b3eeba49b0..fb76254e2b98a12d44abefa44459123ca495616d 100644 (file)
--- a/org.argeo.slc.core/bnd.bnd
+++ b/org.argeo.slc.core/bnd.bnd
@@ -2,4 +2,5 @@ Import-Package: javax.jcr.nodetype,\
 javax.jcr.security,\
 org.apache.tools.ant.*;resolution:="optional",\
 junit.framework;resolution:="optional",\
+org.osgi.*;version=0.0.0,\
 *

diff --git a/org.argeo.slc.factory/bnd.bnd b/org.argeo.slc.factory/bnd.bnd
index e2184b61d65159b515d542d56cadae2eeef124fe..35c4c44cb26cc8abd2d4fc1249f090dbd3380496 100644 (file)
--- a/org.argeo.slc.factory/bnd.bnd
+++ b/org.argeo.slc.factory/bnd.bnd
@@ -1,4 +1,5 @@
 Import-Package: javax.jcr.nodetype,\
 org.argeo.slc.repo,\
+org.osgi.*;version=0.0.0,\
 *
                                                        
\ No newline at end of file

diff --git a/org.argeo.slc.repo/bnd.bnd b/org.argeo.slc.repo/bnd.bnd
index 6ead58491b7a5a5a7cff119a585ddf4be53f31b1..43b20ebc27bb0393c768d088ac944e3f0246ea58 100644 (file)
--- a/org.argeo.slc.repo/bnd.bnd
+++ b/org.argeo.slc.repo/bnd.bnd
@@ -4,6 +4,7 @@ javax.xml.transform.*,\
 javax.xml.parsers.*,\
 javax.jcr.nodetype,\
 org.eclipse.aether.*;version=1.0.1,\
+org.osgi.*;version=0.0.0,\
 *
 
 Private-Package: org.eclipse.aether.*

diff --git a/org.argeo.slc.server.repo/bnd.bnd b/org.argeo.slc.server.repo/bnd.bnd
index 5ee499b61c9130be85e1bcad0b63d80503865290..4931ae65833c626b921badd2f6b533c7aed1f625 100644 (file)
--- a/org.argeo.slc.server.repo/bnd.bnd
+++ b/org.argeo.slc.server.repo/bnd.bnd
@@ -3,4 +3,5 @@ org.argeo.slc.jcr,\
 org.argeo.slc.repo,\
 org.h2;resolution:=optional,\
 org.postgresql;resolution:=optional,\
+org.osgi.*;version=0.0.0,\
 *

diff --git a/org.argeo.slc.support/bnd.bnd b/org.argeo.slc.support/bnd.bnd
index acf329fc8631a88e40d70b1b1311a807b2f5612a..a6f93eda77a81084106fc70ee13360614d316a33 100644 (file)
--- a/org.argeo.slc.support/bnd.bnd
+++ b/org.argeo.slc.support/bnd.bnd
@@ -3,4 +3,5 @@ org.dbunit.*;resolution:="optional",\
 junit.framework;resolution:="optional",\
 org.apache.commons.vfs.*,\
 javax.swing.plaf.metal,\
+org.osgi.*;version=0.0.0,\
 *
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index cf85fe6ac8757ed4c3541611a9321f39a3d1a5d9..87e8cb2ee5267b4260c6df5db68e8eddc7f230af 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,6 @@
                <module>org.argeo.slc.client.ui</module>
                <module>org.argeo.slc.client.ui.dist</module>
                <module>org.argeo.slc.client.rap</module>
-               <!-- <module>org.argeo.slc.client.rcp</module> -->
 
                <module>lib</module>
                <module>dep</module>