Fix SAX import in JCR session

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

diff --git a/pom.xml b/pom.xml
index 6cd3dd046a7320a9aa682a902e5fb24cef293bb8..d0c75d76bebb9fb47a299c56db355757494cb4da 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
                <version.argeo-distribution>1.1.3</version.argeo-distribution>
                <version.argeo-commons>0.2.3-SNAPSHOT</version.argeo-commons>
                <version.argeo-ria>0.12.5</version.argeo-ria>
-               <version.equinox>3.6.1</version.equinox>
+               <version.equinox>3.6.2</version.equinox>
                <version.maven-argeo-osgi>0.1.31</version.maven-argeo-osgi>
                <version.maven-bundle-plugin>2.2.0</version.maven-bundle-plugin>
                <version.maven-argeo-qooxdoo>1.1.1</version.maven-argeo-qooxdoo>

diff --git a/security/features/org.argeo.security.dep.node.rap/pom.xml b/security/features/org.argeo.security.dep.node.rap/pom.xml
index 32201f7dcc48b9f8266921c79ae7dd060179c77e..6df87986e8268c357fa28567dc62d002eb95faae 100644 (file)
--- a/security/features/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rap/pom.xml
@@ -43,6 +43,11 @@
                        <artifactId>org.argeo.jcr.ui.explorer</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.ui.admin</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
 
                <!-- Basis -->
                <dependency>

diff --git a/security/features/org.argeo.security.dep.node.rcp/pom.xml b/security/features/org.argeo.security.dep.node.rcp/pom.xml
index e93a6c450f6c9f6f0c4e9b7e17ad7991fb60b3f2..74e30e5541b9530d25182d7bf9f9b1148a09f5bd 100644 (file)
--- a/security/features/org.argeo.security.dep.node.rcp/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rcp/pom.xml
@@ -45,6 +45,11 @@
                        <artifactId>org.argeo.jcr.ui.explorer</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.ui.admin</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
 
                <!-- Basis -->
                <dependency>

diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index d9e943cc2aad73361daa1f850b55291f91a13785..91e884e8c3d70ce2700d94424e75e46f18682710 100644 (file)
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -38,6 +38,7 @@
                                                        org.springframework.context,
                                                        org.springframework.beans.factory,
                                                        org.argeo.jcr,
+                                                       org.xml.sax;version="0.0.0",
                                                        *
                                                </Import-Package>
                                        </instructions>

diff --git a/server/runtime/org.argeo.server.jcr/pom.xml b/server/runtime/org.argeo.server.jcr/pom.xml
index 0177d1d55434c205f8c7cb4a82e5ebcbf0861633..7248b6ed94b71b4ab982fe6c6f80e846bcce1670 100644 (file)
--- a/server/runtime/org.argeo.server.jcr/pom.xml
+++ b/server/runtime/org.argeo.server.jcr/pom.xml
@@ -30,7 +30,10 @@
                                <configuration>
                                        <instructions>
                                                <Export-Package>org.argeo.jcr.*</Export-Package>
-                                               <Import-Package>junit.framework;resolution:=optional,*</Import-Package>
+                                               <Import-Package>
+                                                       junit.framework;resolution:=optional,
+                                                       org.xml.sax;version="0.0.0",
+                                                       *</Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>