#22931 Update components to more recent versions
This commit first updates many of the relatively "easy" dependencies.
QuickLook tests have been run locally.
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientDeployerHelper.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientDeployerHelper.java
index cec10de..c1d2910 100644
--- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientDeployerHelper.java
+++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientDeployerHelper.java
@@ -16,17 +16,7 @@
package org.glassfish.appclient.server.core;
-import com.sun.enterprise.deploy.shared.FileArchive;
-import com.sun.enterprise.deployment.Application;
-import com.sun.enterprise.deployment.ApplicationClientDescriptor;
-import com.sun.enterprise.deployment.archivist.AppClientArchivist;
-import com.sun.enterprise.deployment.deploy.shared.OutputJarArchive;
-import com.sun.enterprise.util.io.FileUtils;
-import com.sun.enterprise.util.shared.ArchivistUtils;
-import com.sun.logging.LogDomains;
-import java.io.BufferedInputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -44,7 +34,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.zip.ZipException;
-import javax.inject.Inject;
+
import org.glassfish.api.admin.ProcessEnvironment;
import org.glassfish.api.deployment.DeployCommandParameters;
import org.glassfish.api.deployment.DeploymentContext;
@@ -62,7 +52,13 @@
import org.glassfish.deployment.versioning.VersioningUtils;
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.internal.api.ServerContext;
-import org.jboss.logging.LogMessage;
+
+import com.sun.enterprise.deploy.shared.FileArchive;
+import com.sun.enterprise.deployment.Application;
+import com.sun.enterprise.deployment.ApplicationClientDescriptor;
+import com.sun.enterprise.deployment.archivist.AppClientArchivist;
+import com.sun.enterprise.deployment.deploy.shared.OutputJarArchive;
+import com.sun.enterprise.util.shared.ArchivistUtils;
/**
* Encapsulates the details of generating the required JAR file(s),
diff --git a/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplUnitTest.java b/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplUnitTest.java
index 01055e9..da2b3fd 100644
--- a/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplUnitTest.java
+++ b/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplUnitTest.java
@@ -16,25 +16,21 @@
package org.glassfish.diagnostics.context.impl;
-import mockit.Mock;
-import mockit.MockUp;
-import mockit.Mocked;
-import mockit.Verifications;
-import mockit.Expectations;
-import mockit.integration.junit4.JMockit;
+import java.util.EnumSet;
import org.glassfish.contextpropagation.Location;
import org.glassfish.contextpropagation.PropagationMode;
import org.glassfish.contextpropagation.View;
-
-import org.junit.Test;
import org.junit.Assert;
-import org.junit.runner.RunWith;
import org.junit.Ignore;
+import org.junit.Test;
-import java.util.EnumSet;
+import mockit.Expectations;
+import mockit.Mock;
+import mockit.MockUp;
+import mockit.Mocked;
+import mockit.Verifications;
-@RunWith(JMockit.class)
public class ContextImplUnitTest {
/**
diff --git a/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextManagerImplUnitTest.java b/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextManagerImplUnitTest.java
index 59723fa..37d5adf 100644
--- a/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextManagerImplUnitTest.java
+++ b/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextManagerImplUnitTest.java
@@ -16,25 +16,20 @@
package org.glassfish.diagnostics.context.impl;
+import org.glassfish.contextpropagation.ContextMap;
+import org.glassfish.contextpropagation.ContextViewFactory;
+import org.glassfish.contextpropagation.spi.ContextMapHelper;
+import org.glassfish.diagnostics.context.Context;
+import org.glassfish.diagnostics.context.ContextManager;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import mockit.Expectations;
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
-import mockit.Verifications;
-import mockit.Expectations;
-import mockit.integration.junit4.JMockit;
-import org.glassfish.contextpropagation.*;
-import org.glassfish.contextpropagation.spi.ContextMapHelper;
-
-import org.glassfish.diagnostics.context.Context;
-import org.glassfish.diagnostics.context.ContextManager;
-
-import org.junit.Test;
-import org.junit.Assert;
-import org.junit.runner.RunWith;
-import org.junit.Ignore;
-
-@RunWith(JMockit.class)
public class ContextManagerImplUnitTest {
/**
diff --git a/nucleus/distributions/nucleus-common/src/main/resources/config/osgi.properties b/nucleus/distributions/nucleus-common/src/main/resources/config/osgi.properties
index 9dc369d..c8dbade 100755
--- a/nucleus/distributions/nucleus-common/src/main/resources/config/osgi.properties
+++ b/nucleus/distributions/nucleus-common/src/main/resources/config/osgi.properties
@@ -19,6 +19,7 @@
#
+
#
# Framework config properties.
#
@@ -27,21 +28,29 @@
# 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.0, \
- org.osgi.framework; version=1.8, \
+ org.osgi.dto; version=1.1, \
+ org.osgi.framework; version=1.9, \
org.osgi.framework.dto; version=1.8, \
- org.osgi.framework.launch; version=1.2, \
- org.osgi.framework.wiring; version=1.2, \
- org.osgi.framework.startlevel; version=1.1, \
org.osgi.framework.hooks.bundle; version=1.1, \
org.osgi.framework.hooks.resolver; version=1.0, \
org.osgi.framework.hooks.service; version=1.1, \
org.osgi.framework.hooks.weaving; version=1.1, \
+ org.osgi.framework.launch; version=1.2, \
+ org.osgi.framework.namespace; version=1.1, \
+ org.osgi.framework.startlevel; version=1.0, \
+ 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.1, \
+ org.osgi.util.tracker; version=1.5.2, \
${extra-system-packages}
+
+
# Packages exported by system bundle when framework is Equinox.
# Unlike Felix, It is not required to explicitly mention the packages exported by equinox framework jar.
diff --git a/nucleus/osgi-platforms/felix/src/main/resources/config/osgi.properties b/nucleus/osgi-platforms/felix/src/main/resources/config/osgi.properties
index 3bdb0f9..a8b8ce4 100755
--- a/nucleus/osgi-platforms/felix/src/main/resources/config/osgi.properties
+++ b/nucleus/osgi-platforms/felix/src/main/resources/config/osgi.properties
@@ -27,21 +27,29 @@
# 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.0, \
- org.osgi.framework; version=1.8, \
+ org.osgi.dto; version=1.1, \
+ org.osgi.framework; version=1.9, \
org.osgi.framework.dto; version=1.8, \
- org.osgi.framework.launch; version=1.2, \
- org.osgi.framework.wiring; version=1.2, \
- org.osgi.framework.startlevel; version=1.1, \
org.osgi.framework.hooks.bundle; version=1.1, \
org.osgi.framework.hooks.resolver; version=1.0, \
org.osgi.framework.hooks.service; version=1.1, \
org.osgi.framework.hooks.weaving; version=1.1, \
+ org.osgi.framework.launch; version=1.2, \
+ org.osgi.framework.namespace; version=1.1, \
+ org.osgi.framework.startlevel; version=1.0, \
+ 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.1, \
+ org.osgi.util.tracker; version=1.5.2, \
${extra-system-packages}
+
+
# Packages exported by system bundle when framework is Equinox.
# Unlike Felix, It is not required to explicitly mention the packages exported by equinox framework jar.
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index cf0d24c..0dce63d 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -80,7 +80,7 @@
<findbugs.glassfish.logging.validLoggerPrefixes>javax.enterprise</findbugs.glassfish.logging.validLoggerPrefixes>
<webservices.version>2.4.3</webservices.version>
- <glassfish-corba.version>4.2.0</glassfish-corba.version>
+ <glassfish-corba.version>4.2.1</glassfish-corba.version>
<stax-api.version>1.0-2</stax-api.version>
<slf4j.version>1.7.21</slf4j.version>
<javax.validation.osgi.version>2.0.0</javax.validation.osgi.version>
@@ -88,31 +88,31 @@
<servlet-api.version>4.0.3</servlet-api.version>
<grizzly.version>2.4.4</grizzly.version>
<grizzly.npn.version>1.9</grizzly.npn.version>
- <jboss.logging.annotation.version>2.1.0.Final</jboss.logging.annotation.version>
+ <jboss.logging.annotation.version>2.2.1.Final</jboss.logging.annotation.version>
<!-- Ensure that appserver/pom.xml's javax.validation property is of same value as the one below -->
<javax.validation.version>2.0.1.Final</javax.validation.version>
<hibernate-validator.version>6.0.10.Final</hibernate-validator.version>
- <javassist.version>3.22.0-GA</javassist.version>
+ <javassist.version>3.26.0-GA</javassist.version>
<jakarta.el.version>3.0.3</jakarta.el.version>
<jakarta.el-api.version>3.0.2</jakarta.el-api.version>
<hk2.version>2.6.1</hk2.version>
<hk2.plugin.version>2.5.0</hk2.plugin.version>
- <jboss.logging.version>3.3.1.Final</jboss.logging.version>
+ <jboss.logging.version>3.4.1.Final</jboss.logging.version>
<fasterxml.classmate.version>1.5.1</fasterxml.classmate.version>
<jsch.version>0.1.56</jsch.version>
- <pfl.version>4.0.1</pfl.version>
+ <pfl.version>4.1.0</pfl.version>
<gmbal.version>4.0.0</gmbal.version>
<antlr.version>2.7.8</antlr.version>
<ant.version>1.10.2</ant.version>
<jersey.version>2.30.1</jersey.version>
<jackson.version>2.10.2</jackson.version>
- <jettison.version>1.3.7</jettison.version>
+ <jettison.version>1.4.0</jettison.version>
<jaxb-api.version>2.3.2</jaxb-api.version>
<jax-rs-api.spec.version>2.1</jax-rs-api.spec.version>
<jax-rs-api.impl.version>2.1.5</jax-rs-api.impl.version>
- <mimepull.version>1.9.11</mimepull.version>
- <glassfish-management-api.version>3.2.1</glassfish-management-api.version>
- <asm.version>7.1</asm.version>
+ <mimepull.version>1.9.12</mimepull.version>
+ <glassfish-management-api.version>3.2.2</glassfish-management-api.version>
+ <asm.version>7.3.1</asm.version>
<shoal.version>1.6.53</shoal.version>
<ha-api.version>3.1.12</ha-api.version>
<glassfishbuild.version>3.2.27</glassfishbuild.version>
@@ -122,7 +122,7 @@
<mail.version>1.6.4</mail.version>
<jakarta.annotation-api.version>1.3.4</jakarta.annotation-api.version>
<copyright-plugin.version>1.50</copyright-plugin.version>
- <testng.version>6.11</testng.version>
+ <testng.version>7.1.0</testng.version>
<jdk.version>1.7.0-09</jdk.version>
<nucleus.install.dir.name>nucleus</nucleus.install.dir.name>
<javadoc.skip>false</javadoc.skip>
@@ -130,7 +130,7 @@
<replacer.plugin.version>1.5.3</replacer.plugin.version>
<javaee.version.old>7</javaee.version.old>
<javaee.version.new>8</javaee.version.new>
- <jmockit.version>1.36</jmockit.version>
+ <jmockit.version>1.49</jmockit.version>
<osgi-resource-locator.version>1.0.3</osgi-resource-locator.version>
</properties>
@@ -687,25 +687,25 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.enterprise</artifactId>
- <version>6.0.0</version>
+ <version>7.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -716,12 +716,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
- <version>4.3.4</version>
+ <version>4.3.16</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.eventadmin</artifactId>
- <version>1.4.10</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
@@ -858,7 +858,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
@@ -873,7 +873,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>org.glassfish.external</groupId>
@@ -883,7 +883,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
- <version>1.8.2</version>
+ <version>1.10.7</version>
</dependency>
<dependency>
<groupId>org.glassfish.external</groupId>
@@ -913,7 +913,7 @@
<dependency>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
- <version>2.0.4</version>
+ <version>3.3.3</version>
</dependency>
<dependency>
<groupId>org.glassfish.annotations</groupId>
@@ -928,17 +928,17 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>1.0.10</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.shell</artifactId>
- <version>1.0.0</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.command</artifactId>
- <version>1.0.2</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -948,12 +948,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.8.16</version>
+ <version>1.9.16</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>2.0.12</version>
+ <version>2.1.16</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -969,7 +969,7 @@
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
+ <version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
