DDF-04342 Upgraded Karaf to 4.2.3

codice · Jul 8, 2019 · f833e63 · f833e63
1 parent c09f469
commit f833e63
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 764 deletions.
diff --git a/catalog/admin/catalog-admin-poller-service/pom.xml b/catalog/admin/catalog-admin-poller-service/pom.xml
@@ -89,6 +89,10 @@
                         <Embed-Dependency>
                             catalog-core-api-impl;scope=!test,platform-util
                         </Embed-Dependency>
+                        <Import-Package>
+                            !javax.activation,
+                            *
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/catalog/core/catalog-core-commands/pom.xml b/catalog/core/catalog-core-commands/pom.xml
@@ -154,6 +154,7 @@
                         </Export-Package>
                         <Import-Package>
                             org.osgi.framework;version="[1.5,2)",
+                            !javax.activation,
                             *
                         </Import-Package>
                         <Karaf-Commands>*</Karaf-Commands>

diff --git a/catalog/spatial/spatial-commands/pom.xml b/catalog/spatial/spatial-commands/pom.xml
@@ -70,6 +70,10 @@
                             catalog-core-api-impl,
                             platform-util
                         </Embed-Dependency>
+                        <Import-Package>
+                            !javax.activation,
+                            *
+                        </Import-Package>
                         <Export-Package/>
                     </instructions>
                 </configuration>

diff --git a/distribution/ddf-common/src/main/resources-filtered/etc/custom.properties b/distribution/ddf-common/src/main/resources-filtered/etc/custom.properties
@@ -97,12 +97,12 @@ org.osgi.framework.system.packages.extra = \
     org.xml.sax;version=2.0.2, \
     org.xml.sax.ext;uses:=\"org.xml.sax,org.xml.sax.helpers\";version=2.0.2, \
     org.xml.sax.helpers;uses:=org.xml.sax;version=2.0.2, \
-    javax.xml.bind;uses:=\"javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.namespace,javax.xml.stream,javax.xml.transform,javax.xml.validation,org.w3c.dom,org.xml.sax\";version=2.2.8, \
-    javax.xml.bind.annotation;uses:=\"javax.xml.bind,javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,org.w3c.dom\";version=2.2.8, \
-    javax.xml.bind.annotation.adapters;version=2.2.8, \
-    javax.xml.bind.attachment;uses:=javax.activation;version=2.2.8, \
-    javax.xml.bind.helpers;uses:=\"javax.xml.bind,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.stream,javax.xml.transform,javax.xml.validation,org.w3c.dom,org.xml.sax\";version=2.2.8, \
-    javax.xml.bind.util;uses:=\"javax.xml.bind,javax.xml.transform.sax\";version=2.2.8, \
+    javax.xml.bind;uses:=\"javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.namespace,javax.xml.stream,javax.xml.transform,javax.xml.validation,org.w3c.dom,org.xml.sax\";version=2.3.0, \
+    javax.xml.bind.annotation;uses:=\"javax.xml.bind,javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,org.w3c.dom\";version=2.3.0, \
+    javax.xml.bind.annotation.adapters;version=2.3.0, \
+    javax.xml.bind.attachment;uses:=javax.activation;version=2.3.0, \
+    javax.xml.bind.helpers;uses:=\"javax.xml.bind,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.stream,javax.xml.transform,javax.xml.validation,org.w3c.dom,org.xml.sax\";version=2.3.0, \
+    javax.xml.bind.util;uses:=\"javax.xml.bind,javax.xml.transform.sax\";version=2.3.0, \
     org.apache.html.dom;uses:=\"org.w3c.dom.html,org.apache.xerces.dom,org.w3c.dom,org.xml.sax\";version=2.11.0, \
     org.apache.wml.dom;uses:=\"org.apache.wml,org.apache.xerces.dom,org.w3c.dom\";version=2.11.0, \
     org.apache.wml;uses:=org.w3c.dom;version=2.11.0, \

diff --git a/distribution/ddf-common/src/main/resources-filtered/etc/startup.properties b/distribution/ddf-common/src/main/resources-filtered/etc/startup.properties
@@ -6,7 +6,7 @@ mvn\:org.codice.acdebugger/acdebugger-api/${acdebugger.version}=2
 mvn\:org.codice.acdebugger/acdebugger-backdoor/${acdebugger.version}=2
 mvn\:org.apache.felix/org.apache.felix.metatype/1.2.2=5
 mvn\:org.apache.karaf.services/org.apache.karaf.services.eventadmin/${karaf.version}=5
-mvn\:org.ops4j.pax.url/pax-url-aether/2.5.4=5
+mvn\:org.ops4j.pax.url/pax-url-aether/${pax.url.version}=5
 mvn\:org.fusesource.jansi/jansi/1.17.1 = 8
 mvn\:org.ops4j.pax.logging/pax-logging-api/1.10.1=8
 mvn\:org.ops4j.pax.logging/pax-logging-log4j2/1.10.1=8
@@ -18,4 +18,4 @@ mvn\:ddf.platform.osgi/platform-osgi-configadmin/${project.version}=10
 mvn\:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}=11
 mvn\:org.apache.felix/org.apache.felix.fileinstall/3.6.4=12
 mvn\:org.apache.karaf.features/org.apache.karaf.features.core/${karaf.version}=15
-mvn\:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.5.0 = 30
+mvn\:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.9.0 = 30
diff --git a/distribution/ddf-common/src/main/resources/common-bin.xml b/distribution/ddf-common/src/main/resources/common-bin.xml
@@ -25,8 +25,6 @@
                 <exclude>bin/**</exclude>
                 <!-- Don't copy over config files that are customized -->
                 <exclude>etc/custom.properties</exclude>
-                <!-- Needed until Karaf fixes bundle 0 exporting javax.xml (KARAF-6093) -->
-                <exclude>etc/jre.properties</exclude>
                 <exclude>etc/jetty.xml</exclude>
                 <exclude>etc/profile.cfg</exclude>
                 <exclude>etc/org.apache.karaf.command.acl.shell.cfg</exclude>