Add support to compile with Java 17 #4014

madurangasiriwardena · 2024-06-25T15:26:39Z

No description provided.

madurangasiriwardena · 2024-06-25T15:34:17Z

core/javax.cache/src/main/java/javax/cache/CacheManager.java

-     * @throws UnsupportedOperationException if JTA is not supported
-     */
-    UserTransaction getUserTransaction();
+    // TODO javax.transaction package is no longer available. Need to find a way to add this back


javax.transaction is not available with JDK 17. Since this seems to be not used, removed. But need to validate the functionality.

madurangasiriwardena · 2024-06-25T15:34:37Z

core/javax.cache/src/main/java/org/wso2/carbon/caching/impl/CarbonCacheManager.java

-        touch();
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
+//    @Override


javax.transaction is not available with JDK 17. Since this seems to be not used, removed. But need to validate the functionality.

madurangasiriwardena · 2024-06-25T15:35:08Z

core/org.wso2.carbon.base/src/main/java/org/wso2/carbon/base/ServerConfiguration.java

@@ -55,6 +56,7 @@
 * This class stores the configuration of the Carbon Server.
 */
 @SuppressWarnings("unused")
+//@Component(service = ServerConfigurationService.class)


Remove this.

madurangasiriwardena · 2024-06-25T15:36:05Z

core/org.wso2.carbon.base/src/test/java/org/wso2/carbon/base/CarbonBaseUtilsTest.java

@@ -50,7 +50,7 @@ public void setSecurityManager() {
            String resourcePath = resourceURL.getPath();
            resourcePath = resourcePath + "policy-test.policy";
            System.setProperty("java.security.policy", resourcePath);
-            System.setSecurityManager(new SecurityManager());
+//            System.setSecurityManager(new SecurityManager());


Security manager not working properly with Java 17. Hence need to get rid of security manager.

madurangasiriwardena · 2024-06-25T15:37:30Z

core/org.wso2.carbon.base/src/test/resources/testng.xml

+            <class name="org.wso2.carbon.base.CarbonBaseUtilsTest" />
+<!--            <class name="org.wso2.carbon.base.CarbonBaseUtilsWithIncorrectSecPolicy" />-->
+            <class name="org.wso2.carbon.base.CarbonContextHolderBaseTest" />
+<!--            <class name="org.wso2.carbon.base.ServerConfigurationTest" />-->


This test was working incorrectly before. Due to a new validation added in Files API, this is failing now.

madurangasiriwardena · 2024-06-25T15:38:06Z

core/org.wso2.carbon.base/src/test/resources/testng.xml

+        <classes>
+            <class name="org.wso2.carbon.base.CarbonApplicationContextHolderBaseTest" />
+            <class name="org.wso2.carbon.base.CarbonBaseUtilsTest" />
+<!--            <class name="org.wso2.carbon.base.CarbonBaseUtilsWithIncorrectSecPolicy" />-->


Security manager related functionality is not working with JDK 17.

madurangasiriwardena · 2024-06-25T15:39:17Z

...org.wso2.carbon.bootstrap/src/main/java/org/wso2/carbon/bootstrap/CarbonSecurityManager.java

@@ -32,7 +27,11 @@
 */
 public class CarbonSecurityManager extends SecurityManager {


Possibly need to remove this.

madurangasiriwardena · 2024-06-25T15:40:51Z

features/org.wso2.carbon.core.common.feature/pom.xml

@@ -170,6 +168,11 @@
                                    org.wso2.carbon.crypto:org.wso2.carbon.crypto.provider:${carbon.crypto.version}
                                </bundleDef>
                                <bundleDef>org.wso2.orbit.sun.xml.bind:jaxb:${version.org.wso2.orbit.javax.xml.bind.jaxb}</bundleDef>
+                                <!-- TODO previously javax.activation package has come from org.eclipse.osgi_3.14.0.v20190517-1309 -->
+                                <bundleDef>org.wso2.orbit.javax.activation:activation:1.1.1.wso2v4</bundleDef>


Check if this is the best component to add javax.activation. Based on this, update the import packages as well.

madurangasiriwardena · 2024-06-25T15:41:16Z

features/org.wso2.carbon.core.common.feature/pom.xml

+                                <bundleDef>org.wso2.orbit.javax.activation:activation:1.1.1.wso2v4</bundleDef>
+                                <!-- TODO previously javax.transaction package has come from org.eclipse.osgi_3.14.0.v20190517-1309 -->
+                                <!-- TODO previously javax.xml.soap was provided by org.eclipse.osgi_3.14.0.v20190517-1309 -->
+                                <bundleDef>javax.xml.soap:javax.xml.soap-api:1.4.0</bundleDef>


Check if this is the best component to add javax.xml.soap. Based on this, update the import packages as well.

madurangasiriwardena · 2024-06-25T15:42:51Z

features/org.wso2.carbon.core.common.feature/pom.xml

@@ -170,6 +168,11 @@
                                    org.wso2.carbon.crypto:org.wso2.carbon.crypto.provider:${carbon.crypto.version}
                                </bundleDef>
                                <bundleDef>org.wso2.orbit.sun.xml.bind:jaxb:${version.org.wso2.orbit.javax.xml.bind.jaxb}</bundleDef>
+                                <!-- TODO previously javax.activation package has come from org.eclipse.osgi_3.14.0.v20190517-1309 -->
+                                <bundleDef>org.wso2.orbit.javax.activation:activation:1.1.1.wso2v4</bundleDef>
+                                <!-- TODO previously javax.transaction package has come from org.eclipse.osgi_3.14.0.v20190517-1309 -->


Temporarily removed the javax.transaction usages. Validate if this is actually required add a suitable dependency back.

madurangasiriwardena · 2024-06-25T15:42:51Z

distribution/product/modules/p2-profile-gen/pom.xml

@@ -80,6 +81,9 @@
                                <featureArtifactDef>
                                    org.wso2.ciphertool:org.wso2.ciphertool.feature:${version.ciphertool}
                                </featureArtifactDef>
+<!--                                <featureArtifactDef>-->


remove commented code.

madurangasiriwardena · 2024-06-25T15:43:46Z

core/pom.xml

@@ -113,7 +113,7 @@
        <module>org.wso2.carbon.registry.api</module>
        <module>org.wso2.carbon.user.api</module>
        <module>org.wso2.carbon.osgi.security</module>
-        <module>org.wso2.carbon.registry.xboot</module>
+<!--        <module>org.wso2.carbon.registry.xboot</module>-->


Remove commented code.

madurangasiriwardena · 2024-06-25T15:43:53Z

core/org.wso2.carbon.ui/src/main/resources/web/WEB-INF/web.xml

-        </init-param>-->
-        <load-on-startup>0</load-on-startup>
-    </servlet>
+<!--    <servlet>-->


Remove commented code.

madurangasiriwardena · 2024-06-25T15:46:22Z

core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/internal/CarbonUIServiceComponent.java

@@ -262,6 +255,9 @@ public void start(BundleContext context) throws Exception {
        //Registering filedownload servlet
        Servlet fileDownloadServlet = new ContextPathServletAdaptor(new FileDownloadServlet(
                context, getConfigurationContextService()), "/filedownload");
+//        Dictionary<String, Object> fileDownloadServletProperties = new Hashtable<>();


Will have to migrate the filedownload and fileupload services to Whiteboard pattern.

madurangasiriwardena · 2024-06-25T15:46:44Z

core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/deployment/UIBundleDeployer.java

@@ -425,6 +427,18 @@ public void registerServlet(Servlet servlet, String urlPattern, Dictionary param
                    httpService.registerServlet(urlPattern,
                            new FilterServletAdaptor(associatedFilter, null, adaptedJspServlet), params, httpContext);
                }
+//                Dictionary<String, Object> properties = new Hashtable<>();


Remove commented code.

madurangasiriwardena · 2024-06-25T15:48:18Z

core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/TilesJspServlet.java

    public TilesJspServlet(Bundle bundle, UIResourceRegistry uiResourceRegistry) {
        super(bundle, uiResourceRegistry);
    }

+    //TODO check if this is needed
+    @Override
+    public void init() throws ServletException {


This seems to be not needed. Validate and remove.

madurangasiriwardena · 2024-06-25T15:50:37Z

core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/FilterServletAdaptor.java

+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+public class FilterServletAdaptor implements Servlet {


This is copied from http helper component. Try to get rid of this.

madurangasiriwardena · 2024-06-25T15:50:50Z

core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/CustomTilesInitializerListener.java

+        return new CustomTilesInitializer();
+    }
+
+//    @Override


remove commented code.

madurangasiriwardena · 2024-06-25T15:52:42Z

core/org.wso2.carbon.ui/src/main/java/org/wso2/carbon/ui/CarbonUILoginUtil.java

@@ -161,9 +161,9 @@ protected static boolean saveOriginalUrl(CarbonUIAuthenticator authenticator,
            }
        } else {
            if (skipLoginPage) {
-                response.sendRedirect(contextPath + "/carbon/admin/login_action.jsp");


redirection after management console login is still not working properly. /carbon/ part is added twice sometimes.

madurangasiriwardena · 2024-06-25T15:53:01Z

core/org.wso2.carbon.ui/pom.xml

@@ -62,6 +73,17 @@
                </exclusion>
            </exclusions>
        </dependency>
+<!--        &lt;!&ndash; Adding temporarily to compile &ndash;&gt;-->


remove commented code.

madurangasiriwardena · 2024-06-25T15:53:28Z

....registry.core/src/main/java/org/wso2/carbon/registry/core/jdbc/EmbeddedRegistryService.java

@@ -71,6 +70,7 @@
 * @see EmbeddedRegistry
 * @see UserRegistry
 */
+//@Component(service = RegistryService.class)


remove commented code.

madurangasiriwardena · 2024-06-25T15:53:52Z

core/org.wso2.carbon.osgi.security/pom.xml

-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>org.eclipse.equinox.http.helper</artifactId>
-        </dependency>
+<!--        <dependency>-->


remove commented code.

madurangasiriwardena marked this pull request as draft June 25, 2024 15:26

madurangasiriwardena added 12 commits June 25, 2024 21:01

Add attempt 1

c082afa

Successfully compiling the kernel

1294ab5

Compile with Java17

7785b46

Revert the servlet registration flow

11b6ab0

Fix issues with tiles-jsp.tld scanning

ffb8865

Login page loading

284513f

Resources are loading correctly

7bdf395

Fix redirection issue

6e498d7

Add minor changes

4ae125a

Fix soap services

f034f49

Fix integration tests

a42d8bd

Fix registry tests

34a1854

madurangasiriwardena force-pushed the attempt1 branch from bfac13b to 34a1854 Compare June 25, 2024 15:32

madurangasiriwardena commented Jun 25, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support to compile with Java 17 #4014

Add support to compile with Java 17 #4014

madurangasiriwardena commented Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

madurangasiriwardena Jun 25, 2024

		@@ -32,7 +27,11 @@
		*/
		public class CarbonSecurityManager extends SecurityManager {

Add support to compile with Java 17 #4014

Are you sure you want to change the base?

Add support to compile with Java 17 #4014

Conversation

madurangasiriwardena commented Jun 25, 2024

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

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