From f792774e01adc4ad7f0398ba6d85fd677f7620dc Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 14 Nov 2017 09:07:17 +0100 Subject: [PATCH 1/1] Ignore OSGi framework version --- demo/slc_demo_rap.properties | 2 +- org.argeo.slc.agent.jcr/bnd.bnd | 1 + org.argeo.slc.agent/bnd.bnd | 2 ++ org.argeo.slc.client.rcp/bnd.bnd | 1 + org.argeo.slc.client.rcp/pom.xml | 20 +++++++++++++++++--- org.argeo.slc.client.ui.dist/bnd.bnd | 2 +- org.argeo.slc.client.ui/bnd.bnd | 1 + org.argeo.slc.core/bnd.bnd | 1 + org.argeo.slc.factory/bnd.bnd | 1 + org.argeo.slc.repo/bnd.bnd | 1 + org.argeo.slc.server.repo/bnd.bnd | 1 + org.argeo.slc.support/bnd.bnd | 1 + pom.xml | 1 - 13 files changed, 29 insertions(+), 6 deletions(-) diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties index 6ec2db8e3..99e2f5659 100644 --- 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 96ddb0d8d..519cb0341 100644 --- 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 e69de29bb..7f2410c17 100644 --- 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 b1d059bf2..f02227257 100644 --- 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 e5d0c4f11..1098fcaf9 100644 --- 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"> 4.0.0 - org.argeo.slc - argeo-slc - 2.1.8-SNAPSHOT + org.argeo.commons.rcp + argeo-rcp + 2.1.16-SNAPSHOT .. + + + + + + + org.argeo.slc org.argeo.slc.client.rcp SLC Client RCP jar @@ -46,5 +53,12 @@ org.argeo.cms.ui.workbench.rcp ${version.argeo-rcp} + + + + org.argeo.commons.rcp + org.argeo.dep.cms.rcp + + diff --git a/org.argeo.slc.client.ui.dist/bnd.bnd b/org.argeo.slc.client.ui.dist/bnd.bnd index 3b5709a4d..c2eeb8769 100644 --- 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 7d74571bf..497210cbc 100644 --- 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 5b3c49ffa..fb76254e2 100644 --- 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 e2184b61d..35c4c44cb 100644 --- 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 6ead58491..43b20ebc2 100644 --- 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 5ee499b61..4931ae658 100644 --- 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 acf329fc8..a6f93eda7 100644 --- 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 cf85fe6ac..87e8cb2ee 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,6 @@ org.argeo.slc.client.ui org.argeo.slc.client.ui.dist org.argeo.slc.client.rap - lib dep -- 2.39.2