Fix SLC build with OSGi check

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

diff --git a/runtime/org.argeo.slc.core/pom.xml b/runtime/org.argeo.slc.core/pom.xml
index 38a71728086e6db4874c7a8e6b90149af7b2265d..b99ac12eef63562f61d3f3239000268fe58ca0b7 100644 (file)
--- a/runtime/org.argeo.slc.core/pom.xml
+++ b/runtime/org.argeo.slc.core/pom.xml
@@ -1,4 +1,6 @@
-<?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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
@@ -21,14 +23,15 @@
                                                <Export-Package>
                                                        org.argeo.slc.*,org.argeo.slc.core.test.spring
                                                </Export-Package>
-                                               <Import-Package>*,org.apache.commons.logging;version="1.1",
+                                               <Import-Package>
+                                                       org.w3c.dom;version="0.0.0",
                                                        org.dbunit;resolution:="optional",
                                                        org.dbunit.database;resolution:="optional",
                                                        org.dbunit.dataset;resolution:="optional",
                                                        org.dbunit.dataset.xml;resolution:="optional",
                                                        org.dbunit.operation;resolution:="optional",
                                                        junit.framework;resolution:="optional",
-                                                       org.springframework.context.support;resolution:=optional
+                                                       *
                                                </Import-Package>
                                        </instructions>
                                </configuration>

diff --git a/runtime/org.argeo.slc.repo/pom.xml b/runtime/org.argeo.slc.repo/pom.xml
index 51484fca09eed38cc1d9c8ca26c960414e73861c..9c8b6790daacf5a2b5fe2d2fa999b1df6ed9290c 100644 (file)
--- a/runtime/org.argeo.slc.repo/pom.xml
+++ b/runtime/org.argeo.slc.repo/pom.xml
@@ -1,4 +1,6 @@
-<?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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
@@ -20,7 +22,13 @@
                                                <Export-Package>
                                                        org.argeo.slc.repo.*
                                                </Export-Package>
-                                               <Import-Package>javax.jcr.nodetype,*</Import-Package>
+                                               <Import-Package>
+                                                       org.w3c.dom.*;version="0.0.0",
+                                                       javax.xml.transform.*;version="0.0.0",
+                                                       javax.xml.parsers.*;version="0.0.0",
+                                                       javax.jcr.nodetype,
+                                                       *
+                                               </Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>

diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index 62848dd8d12378127db04301b904334aed2cec78..77bbff7e85ac8cfb3a9c7967cda1cd8a2fbf96e0 100644 (file)
--- a/runtime/org.argeo.slc.support.activemq/pom.xml
+++ b/runtime/org.argeo.slc.support.activemq/pom.xml
@@ -1,4 +1,6 @@
-<?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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
@@ -20,6 +22,10 @@
                                                <Export-Package>
                                                        org.argeo.slc.jms.*,org.argeo.slc.activemq
                                                </Export-Package>
+                                               <Import-Package>
+                                                       javax.xml.transform;version="0.0.0",
+                                                       *
+                                               </Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>

diff --git a/runtime/org.argeo.slc.support.maven/pom.xml b/runtime/org.argeo.slc.support.maven/pom.xml
index 1a5b79e77fcb5cd09b8475b346c2905036b9185e..74a1c07905070c230e8e2c282899958dd0a233b7 100644 (file)
--- a/runtime/org.argeo.slc.support.maven/pom.xml
+++ b/runtime/org.argeo.slc.support.maven/pom.xml
@@ -1,4 +1,6 @@
-<?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">
+<?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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
@@ -27,6 +29,8 @@
                                                        org.argeo.slc.maven.*
                                                </Export-Package>
                                                <Import-Package>
+                                                       org.w3c.dom.*;version="0.0.0",
+                                                       org.xml.sax.*;version="0.0.0",
                                                        com.google.*;resolution:=optional,
                                                        javax.*;resolution:=optional,
                                                        com.sun.*;resolution:=optional,