Merge remote-tracking branch 'origin' into jetty-12.1.x

jetty · Jan 9, 2025 · 6f198e8 · 6f198e8
2 parents 8ec6283 + 6b48a19
commit 6f198e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/JettyBootstrapActivator.java b/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/JettyBootstrapActivator.java
@@ -65,7 +65,6 @@ public class JettyBootstrapActivator implements BundleActivator
     public static final String DEFAULT_JETTYHOME = "/jettyhome";
 
     private ServiceRegistration<?> _registeredServer;
-    /*    private PackageAdminServiceTracker _packageAdminServiceTracker;*/
 
     /**
      * Setup a new jetty Server, register it as a service. 
@@ -75,10 +74,6 @@ public class JettyBootstrapActivator implements BundleActivator
     @Override
     public void start(final BundleContext context) throws Exception
     {
-        // track other bundles and fragments attached to this bundle that we
-        // should activate, as OSGi will not call activators for them.
-        /*        _packageAdminServiceTracker = new PackageAdminServiceTracker(context);*/
-
         ServiceReference[] references = context.getAllServiceReferences("org.eclipse.jetty.http.HttpFieldPreEncoder", null);
 
         if (references == null || references.length == 0)
@@ -96,14 +91,6 @@ public void start(final BundleContext context) throws Exception
     @Override
     public void stop(BundleContext context) throws Exception
     {
-
-        /*       if (_packageAdminServiceTracker != null)
-        {
-            _packageAdminServiceTracker.stop();
-            context.removeServiceListener(_packageAdminServiceTracker);
-            _packageAdminServiceTracker = null;
-        }
-        */
         try
         {
             if (_registeredServer != null)
@@ -194,7 +181,7 @@ else if (jettyHomeBundleSysProp != null)
             }
             if (jettyHomeBundle == null)
             {
-                LOG.warn("Unable to find the jetty.home.bundle named {}", jettyHomeSysProp);
+                LOG.warn("Unable to find the jetty.home.bundle named {}", jettyHomeBundleSysProp);
                 return;
             }
         }

diff --git a/pom.xml b/pom.xml
@@ -372,7 +372,7 @@
     <maven.surefire.plugin.version>3.3.0</maven.surefire.plugin.version>
     <maven.version>3.9.9</maven.version>
     <maven.war.plugin.version>3.4.0</maven.war.plugin.version>
-    <mina.core.version>2.2.3</mina.core.version>
+    <mina.core.version>2.2.4</mina.core.version>
     <mongo.docker.version>5.0.26</mongo.docker.version>
     <mongodb.version>5.1.3</mongodb.version>
     <netty.version>4.1.115.Final</netty.version>