[2.29.x] Java 21 upgrades #6835

malmgrens4 · 2025-01-23T19:29:02Z

What does this PR do?

Who is reviewing it?

Select relevant component teams:

Ask 2 committers to review/merge the PR and tag them here.

How should this be tested?

Any background context you want to provide?

What are the relevant tickets?

Fixes: #____

Screenshots

Checklist:

Documentation Updated
Update / Add Threat Dragon models
Update / Add Unit Tests
Update / Add Integration Tests

Notes on Review Process

Please see Notes on Review Process for further guidance on requirements for merging and abbreviated reviews.

Review Comment Legend:

✏️ (Pencil) This comment is a nitpick or style suggestion, no action required for approval. This comment should provide a suggestion either as an in line code snippet or a gist.
❓ (Question Mark) This comment is to gain a clearer understanding of design or code choices, clarification is required but action may not be necessary for approval.
❗ (Exclamation Mark) This comment is critical and requires clarification or action before approval.

malmgrens4 · 2025-01-23T19:29:43Z

distribution/ddf-catalog/pom.xml

@@ -182,7 +182,7 @@
                        <configuration>
                            <rules>
                                <requireFilesSize>
-                                    <maxsize>280000000</maxsize>
+                                    <maxsize>350000000</maxsize>


See if this can be reduced again

malmgrens4 · 2025-01-23T19:30:20Z

distribution/ddf-common/src/main/resources-filtered/etc/org.apache.karaf.features.xml

@@ -24,6 +24,7 @@
    <!-- A list of blacklisted feature identifiers that can't be installed in Karaf and are not part of the distribution -->
    <blacklistedFeatures>
        <feature>pax-jetty-http2</feature>
+        <feature>pax-web-jetty-http2</feature>


The pax web upgrade comes with this (which we don't use)

malmgrens4 · 2025-01-23T19:30:40Z

features/admin/src/main/feature/feature.xml

@@ -139,7 +139,7 @@
             description="Contains the modules that should be installed after the installer is finished.">
        <feature>admin-modules-configuration</feature>
        <feature>admin-modules-application</feature>
-        <feature>admin-modules-docs</feature>
+<!--        <feature>admin-modules-docs</feature>-->


Reintegrate

malmgrens4 · 2025-01-23T19:31:08Z

features/security/src/main/feature/feature.xml

@@ -178,8 +178,9 @@
            #######################################

            # Set the authmethod/realmname so that our JettyAuthenticator is used
-            org.ops4j.pax.web.default.authmethod=DDF
-            org.ops4j.pax.web.default.realmname=DDF
+            org.ops4j.pax.web.default.authMethod=DDF


Delete - these aren't being picked up anymore

malmgrens4 · 2025-01-23T19:34:49Z

platform/admin/core/admin-core-jolokia/src/main/resources/OSGI-INF/blueprint/blueprint.xml

-            <entry key="alias" value="/admin/jolokia"/>
+            <entry key="osgi.http.whiteboard.servlet.pattern" value="/jolokia/*"/>
+            <entry key="osgi.http.whiteboard.servlet.name" value="jolokia"/>
+            <entry key="osgi.http.whiteboard.context.select" value="(osgi.http.whiteboard.context.path=/*)"/>


The ddf-admin-ui apps register based on their Context-Paths. Previously pax-web/ jetty would still register all servlets under each context. Now any servlets that need to work with those WABs apps will need to register under /* for the context path (believe it defaults to just /).

malmgrens4 · 2025-01-23T19:35:03Z

platform/admin/modules/pom.xml

@@ -27,7 +27,7 @@
        <module>admin-modules-installer</module>
        <module>admin-modules-configuration</module>
        <module>admin-modules-application</module>
-        <module>admin-modules-docs</module>
+<!--        <module>admin-modules-docs</module>-->


Reintegrate

malmgrens4 · 2025-01-23T19:35:49Z

...or-page-injector/src/main/java/org/codice/ddf/platform/error/injector/ErrorPageInjector.java

@@ -82,6 +82,7 @@ public void event(ServiceEvent event, Map<BundleContext, Collection<ListenerInfo

  public void init() {
    checkForMissedServletContexts();
+    LOGGER.trace("skipping error page initialization.");


The class reflection the error page injector used no longer works under j21. But registering a global error page is now easier with the new pax web version. So that should be done instead of this method.

malmgrens4 · 2025-01-23T19:39:56Z

...r/security-filter-web-sso/src/main/java/org/codice/ddf/security/filter/websso/Activator.java

+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+public class Activator implements BundleActivator {


This was placed fairly arbitrarily so can probably go somewhere better.
Previously we were able to do this via config but those config values aren't supported anymore. So using this bundle activator we can set the auth method and realm name we need for triggering out JettyAuthenticator

malmgrens4 · 2025-01-23T19:40:06Z

...r/security-filter-web-sso/src/main/java/org/codice/ddf/security/filter/websso/Activator.java

+  @Override
+  public void start(BundleContext bundleContext) throws Exception {
+    DefaultSecurityConfigurationMapping security = new DefaultSecurityConfigurationMapping();
+    security.setAuthMethod("DDF");


Switch to constants

malmgrens4 · 2025-01-23T19:40:57Z

...security/servlet/security-servlet-logout/src/main/resources/OSGI-INF/blueprint/blueprint.xml

@@ -37,20 +37,24 @@

    <reference id="securityManager" interface="ddf.security.service.SecurityManager"/>

-    <service interface="javax.servlet.Servlet">
+
+    <bean id="locallogout" class="org.codice.ddf.security.servlet.logout.LocalLogoutServlet">


Something worth noting: You can no longer create the bean in the service tags. Simply does not work with the latest upgrades.

malmgrens4 · 2025-01-23T19:41:24Z

platform/security/servlet/security-servlet-whoami/pom.xml

@@ -62,6 +62,38 @@
            <artifactId>security-core-services</artifactId>
            <scope>test</scope>
        </dependency>
+<!--        &lt;!&ndash; Provided dependencies &ndash;&gt;-->


malmgrens4 · 2025-01-23T19:41:40Z

platform/security/servlet/security-servlet-web-socket-api/pom.xml

@@ -58,6 +65,9 @@
                <configuration>
                    <instructions>
                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Import-Package>


needs to be investigated further

malmgrens4 · 2025-01-24T01:33:03Z

build now

malmgrens4 · 2025-01-24T01:33:38Z

build now

malmgrens4 · 2025-01-24T01:35:14Z

build now

…ctly

alexabird · 2025-01-24T05:19:16Z

Not sure why it "doesnt meet criteria" when it is the same as other branches.. I've seen jenkins do weird things when it doesnt like branch names, maybe that? Think we want to update the java version in the jenkins file too

alexabird · 2025-02-04T22:32:57Z

The PR is showing up in Jenkins now, however is not buildable because of the merge conflicts

malmgrens4 requested review from andrewkfiedler and stustison as code owners January 23, 2025 19:29

malmgrens4 commented Jan 23, 2025

View reviewed changes

malmgrens4 requested a review from coyotesqrl as a code owner January 24, 2025 01:32

malmgrens4 changed the title ~~[WIP] Java 21 upgrades~~ Java 21 upgrades Jan 24, 2025

malmgrens4 added 11 commits January 23, 2025 18:39

j21-minimum changes

bc48b74

working jetty. issues with servlets. believe auth isn't working corre…

0bd6c5d

…ctly

activator security config hardcoded

ba65e90

metrics. jolokia still not functional

1900e81

landing page values updated

15a6d2b

correct jolokia configuration

ba71e9f

config jaxrs server

2fd5625

proper config

6ead5ae

j21-run

a47c6c1

asm dependency override for j21 compatibility

9c3834e

error page

3ba0bb7

malmgrens4 force-pushed the no-camel-with-updates branch from 85674b0 to 3ba0bb7 Compare January 24, 2025 02:55

remove error page injector

8504de6

jlcsmith changed the title ~~Java 21 upgrades~~ [2.29.x] Java 21 upgrades Jan 31, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[2.29.x] Java 21 upgrades #6835

[2.29.x] Java 21 upgrades #6835

malmgrens4 commented Jan 23, 2025

malmgrens4 Jan 23, 2025

malmgrens4 Jan 23, 2025

malmgrens4 Jan 23, 2025

malmgrens4 Jan 23, 2025

malmgrens4 Jan 23, 2025

malmgrens4 Jan 23, 2025

malmgrens4 Jan 23, 2025

malmgrens4 Jan 23, 2025

malmgrens4 Jan 23, 2025

malmgrens4 Jan 23, 2025

malmgrens4 Jan 23, 2025

malmgrens4 Jan 23, 2025

malmgrens4 commented Jan 24, 2025

malmgrens4 commented Jan 24, 2025

malmgrens4 commented Jan 24, 2025

alexabird commented Jan 24, 2025 •

edited

Loading

alexabird commented Feb 4, 2025

[2.29.x] Java 21 upgrades #6835

Are you sure you want to change the base?

[2.29.x] Java 21 upgrades #6835

Conversation

malmgrens4 commented Jan 23, 2025

What does this PR do?

Who is reviewing it?

Select relevant component teams:

Ask 2 committers to review/merge the PR and tag them here.

How should this be tested?

Any background context you want to provide?

What are the relevant tickets?

Screenshots

Checklist:

Notes on Review Process

Review Comment Legend:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

malmgrens4 commented Jan 24, 2025

malmgrens4 commented Jan 24, 2025

malmgrens4 commented Jan 24, 2025

alexabird commented Jan 24, 2025 • edited Loading

alexabird commented Feb 4, 2025

alexabird commented Jan 24, 2025 •

edited

Loading