Pack of dependency updates

- eclipse parent 1.0.7 - OSGI and Felix to latest - excluded scr, promise, function, cmpn - hibernate-validator from 7 to 8 - jline from 2.14.5 to 3.21.0 Signed-off-by: David Matějček <dmatej@seznam.cz>
eclipse-ee4j · Mar 31, 2022 · 00bbae0 · 00bbae0
1 parent 5167b98
commit 00bbae0
Show file tree

Hide file tree

Showing 17 changed files with 199 additions and 244 deletions.
diff --git a/appserver/extras/embedded/common/bootstrap/pom.xml b/appserver/extras/embedded/common/bootstrap/pom.xml
@@ -77,11 +77,6 @@
             <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.main.core</groupId>
             <artifactId>glassfish</artifactId>

diff --git a/appserver/featuresets/debug/pom.xml b/appserver/featuresets/debug/pom.xml
@@ -45,6 +45,10 @@
     <name>Debug</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.core</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.resolver</artifactId>
@@ -53,16 +57,12 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.resolver</artifactId>
-            <version>2.0.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>7.0.3</version>
         </dependency>
-
-
-
+
         <dependency>
             <groupId>org.glassfish.main.featuresets</groupId>
             <artifactId>glassfish</artifactId>

diff --git a/appserver/osgi-platforms/felix-webconsole-extension/pom.xml b/appserver/osgi-platforms/felix-webconsole-extension/pom.xml
@@ -55,18 +55,17 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.webconsole</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <artifactId>osgi.enterprise</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.webconsole</artifactId>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.core</artifactId>
         </dependency>
-        <!-- TangYong's contribution towards Glassfish-12975 begins -->
         <dependency>
             <groupId>org.glassfish.main.security</groupId>
             <artifactId>security-services</artifactId>
@@ -77,6 +76,5 @@
             <artifactId>simple-glassfish-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- TangYong's contribution towards Glassfish-12975 ends -->
     </dependencies>
 </project>
diff --git a/...n/java/org/glassfish/osgi/felixwebconsoleextension/FelixWebConsoleExtensionActivator.java b/...n/java/org/glassfish/osgi/felixwebconsoleextension/FelixWebConsoleExtensionActivator.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -16,18 +17,21 @@
 
 package org.glassfish.osgi.felixwebconsoleextension;
 
-import org.apache.felix.webconsole.BrandingPlugin;
-import org.apache.felix.webconsole.WebConsoleSecurityProvider;
-import org.osgi.framework.*;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.util.tracker.ServiceTracker;
-
 import java.io.IOException;
 import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.apache.felix.webconsole.BrandingPlugin;
+import org.apache.felix.webconsole.WebConsoleSecurityProvider;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.util.tracker.ServiceTracker;
+
 /**
  *
  * This activator servers following purposes:
@@ -41,7 +45,7 @@
  */
 public class FelixWebConsoleExtensionActivator implements BundleActivator {
 
-    private Logger logger = Logger.getLogger(getClass().getPackage().getName());
+    private final Logger logger = Logger.getLogger(getClass().getPackage().getName());
     private BundleContext context;
     private static final String WEBCONSOLE_PID = "org.apache.felix.webconsole.internal.servlet.OsgiManager";
     private static final String PROP_HTTP_SERVICE_SELECTOR = "http.service.filter";

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
         <relativePath />
     </parent>
     <version>7.0.0-SNAPSHOT</version>

diff --git a/nucleus/common/common-util/pom.xml b/nucleus/common/common-util/pom.xml
@@ -63,13 +63,11 @@
             <artifactId>logging-annotation-processor</artifactId>
             <optional>true</optional>
         </dependency>
-        <!-- Needed to have a bundle activator to set up a different serialization policy -->
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!-- Needed to have a bundle activator to set up a different serialization policy -->
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.enterprise</artifactId>

diff --git a/nucleus/core/bootstrap/pom.xml b/nucleus/core/bootstrap/pom.xml
@@ -63,11 +63,6 @@
             <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
         <!-- Although we package simple-glassfish-api bundle's content in glassfish.jar, in standalone mode, we have to create
             a launcher classloader that has the launching APIs and OSGi APIs in same level. SO, we need this jar to be part of distribution.

diff --git a/nucleus/core/kernel/osgi.bundle b/nucleus/core/kernel/osgi.bundle
@@ -36,5 +36,5 @@ DynamicImport-Package: org.glassfish.flashlight.provider, \
 Import-Package: \
     com.sun.enterprise.server.logging.*; resolution:=optional, \
     org.jvnet.tiger_types;version="${project.version}", \
-    org.hibernate.validator.*;resolution:=optional;version="[7.0.0,8.0.0)", \
+    org.hibernate.validator.*;resolution:=optional;version="[8,9)", \
     *
diff --git a/nucleus/distributions/nucleus-common/src/main/resources/config/osgi.properties b/nucleus/distributions/nucleus-common/src/main/resources/config/osgi.properties
@@ -1,4 +1,5 @@
 #
+# Copyright (c) 2022 Contributors to the Eclipse Foundation
 # Copyright (c) 1997-2021 Oracle and/or its affiliates. All rights reserved.
 # Copyright 2004 The Apache Software Foundation
 #
@@ -18,18 +19,12 @@
 # limitations under the License.
 #
 
-
-
-#
-# Framework config properties.
-#
-
 # Packages exported by system bundle when framework is Felix.
 # Unlike Equinox, Felix requires us to list all packages from felix.jar
 # while using org.osgi.framework.system.packages property.
 Felix.system.packages=\
- org.osgi.dto; version=1.1, \
- org.osgi.framework; version=1.9, \
+ org.osgi.dto; version=1.1.1, \
+ org.osgi.framework; version=1.10, \
  org.osgi.framework.dto; version=1.8, \
  org.osgi.framework.hooks.bundle; version=1.1, \
  org.osgi.framework.hooks.resolver; version=1.0, \
@@ -41,13 +36,13 @@ Felix.system.packages=\
  org.osgi.framework.startlevel.dto; version=1.0, \
  org.osgi.framework.wiring; version=1.2, \
  org.osgi.framework.wiring.dto; version=1.3, \
- org.osgi.resource; version=1.0, \
- org.osgi.resource.dto; version=1.0, \
- org.osgi.service.packageadmin; version=1.2, \
- org.osgi.service.resolver; version=1.1, \
- org.osgi.service.startlevel; version=1.1, \
- org.osgi.service.url; version=1.0, \
- org.osgi.util.tracker; version=1.5.2, \
+ org.osgi.resource; version=1.0.1, \
+ org.osgi.resource.dto; version=1.0.1, \
+ org.osgi.service.packageadmin; version=1.2.1, \
+ org.osgi.service.resolver; version=1.1.1, \
+ org.osgi.service.startlevel; version=1.1.1, \
+ org.osgi.service.url; version=1.0.1, \
+ org.osgi.util.tracker; version=1.5.3, \
  ${extra-system-packages}
 
 
@@ -548,38 +543,39 @@ felix.fileinstall.disableConfigSave=false
 # If we don't set this, when we run our tests in embedded mode, gogo shell stops the framework after running the login command.
 gosh.args=--nointeractive
 
-# New-style generic execution environment capabilities.
-#fix for GLASSFISH-21236
-org.osgi.framework.system.capabilities= \
- ${eecap-${java.specification.version}}
- #we are not adding eecap entries upto 1.7 as GF is supported for JDK>1.7 (?)
-eecap-21= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+# Generic execution environment capabilities.
+org.osgi.framework.system.capabilities=${eecap-${java.vm.specification.version}}
+
+eecap-21= \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
  osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11,12,13,14,15,16,17,18,19,20,21"
-eecap-20= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+eecap-20= \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
  osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11,12,13,14,15,16,17,18,19,20"
-eecap-19= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
- osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11,12,13,14,15,16,17,18,19"
-eecap-18= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
- osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11,12,13,14,15,16,17,18"
-eecap-17= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+eecap-19= \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11,12,13,14,15,16,17,18,19",
+eecap-18= \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+ osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11,12,13,14,15,16,17,18",
+eecap-17= \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
  osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11,12,13,14,15,16,17"
-eecap-16= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+eecap-16= \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
  osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11,12,13,14,15,16"
-eecap-15= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+eecap-15= \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
  osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11,12,13,14,15"
-eecap-14= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+eecap-14= \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
  osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11,12,13,14"
-eecap-13= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+eecap-13= \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
  osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11,12,13"
-eecap-12= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+eecap-12= \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
  osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11,12"
-eecap-11= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
+eecap-11= \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
  osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11"
-eecap-10= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
- osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10"
-eecap-9= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
- osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9"
-eecap-1.8= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
- osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8"
-eecap-1.7= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
- osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7"
diff --git a/nucleus/distributions/nucleus/src/main/assembly/nucleus-new.xml b/nucleus/distributions/nucleus/src/main/assembly/nucleus-new.xml
@@ -141,6 +141,8 @@
                 <exclude>org.apache.felix.gogo.runtime.jar</exclude>
                 <exclude>org.apache.felix.gogo.shell.jar</exclude>
                 <exclude>org.apache.felix.scr.jar</exclude>
+                <exclude>org.osgi.util.function.jar</exclude>
+                <exclude>org.osgi.util.promise.jar</exclude>
                 <exclude>grizzly-npn-api.jar</exclude>
                 <exclude>felix.jar</exclude>
                 <exclude>nucleus-domain.jar</exclude>

diff --git a/nucleus/featuresets/atomic/pom.xml b/nucleus/featuresets/atomic/pom.xml
@@ -86,7 +86,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- We install fileinstall bundle which monitors modules dir and autodeploy dir for addition/removal/updation of 
+        <!-- We install fileinstall bundle which monitors modules dir and autodeploy dir for addition/removal/updation of
             bundles -->
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -109,25 +109,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- Felix SCR always needs to be deployed as 3 bundles since 2.0.12 -->
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.util.promise</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.util.function</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.main.osgi-platforms</groupId>
             <artifactId>osgi-cli-remote</artifactId>

diff --git a/nucleus/hk2/hk2-config/pom.xml b/nucleus/hk2/hk2-config/pom.xml
@@ -118,7 +118,7 @@
                     <instructions>
                         <Import-Package>
                             jakarta.validation.*;resolution:=optional;version="${jakarta.validation-api.version}",
-                            org.hibernate.validator.*;resolution:=optional;version="[7.0.0,8.0.0)",
+                            org.hibernate.validator.*;resolution:=optional;version="[8.0.0,9.0.0)",
                             org.jvnet.tiger_types;version=${project.version},
                             *
                         </Import-Package>

diff --git a/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml b/nucleus/osgi-platforms/osgi-cli-interactive/pom.xml
@@ -49,7 +49,7 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>jline</groupId>
+            <groupId>org.jline</groupId>
             <artifactId>jline</artifactId>
             <scope>provided</scope>
             <optional>true</optional>
@@ -71,7 +71,7 @@
                             <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>jline</groupId>
+                                    <groupId>org.jline</groupId>
                                     <artifactId>jline</artifactId>
                                     <overWrite>true</overWrite>
                                 </artifactItem>