Skip to content

JDK21 compilation changes #886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chamilaadhi wants to merge 4 commits into
base: 5.3.x
Choose a base branch
from
Open

JDK21 compilation changes #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c278a34
JDK21 compilation changes
chamilaadhi Jan 7, 2026
9de174c
Upgrade commons version
chamilaadhi Jan 7, 2026
5a66f73
Provide capability
chamilaadhi Jan 7, 2026
0f6b9f8
Add capability
chamilaadhi Jan 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions components/analytics-data-agents/org.wso2.carbon.analytics.common.jmx.agent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>

<properties>
Expand Down
9 changes: 7 additions & 2 deletions components/data-bridge/org.wso2.carbon.databridge.agent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@

<dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
</dependency>
<dependency>
Expand Down Expand Up @@ -114,6 +114,11 @@
<version>2.24.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>

<build>
Expand Down
2 changes: 1 addition & 1 deletion components/data-bridge/org.wso2.carbon.databridge.commons.thrift/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions components/data-bridge/org.wso2.carbon.databridge.commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

<dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
Expand Down Expand Up @@ -78,7 +78,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>

<version>5.1.9</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
11 changes: 10 additions & 1 deletion components/data-bridge/org.wso2.carbon.databridge.core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

<dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
Expand Down Expand Up @@ -93,6 +93,11 @@
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down Expand Up @@ -124,6 +129,10 @@
</Export-Package>
<Import-Package>org.osgi.framework,*;resolution:=optional</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
<Provide-Capability>
osgi.service;objectClass=org.wso2.carbon.databridge.core.DataBridgeSubscriberService,
osgi.service;objectClass=org.wso2.carbon.databridge.core.DataBridgeReceiverService
</Provide-Capability>
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion components/data-bridge/org.wso2.carbon.databridge.receiver.binary/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion components/data-bridge/org.wso2.carbon.databridge.receiver.thrift/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<dependencies>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion components/data-bridge/org.wso2.carbon.databridge.streamdefn.filesystem/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<artifactId>org.wso2.carbon.databridge.core</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
Expand Down
8 changes: 8 additions & 0 deletions ...ava/org/wso2/carbon/databridge/streamdefn/filesystem/FileSystemStreamDefinitionStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.osgi.annotation.bundle.Capability;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.databridge.commons.StreamDefinition;
import org.wso2.carbon.databridge.core.definitionstore.AbstractStreamDefinitionStore;
Expand All @@ -31,6 +32,13 @@

import java.util.Collection;

@Capability(
namespace = "osgi.service",
attribute = {
"objectClass=org.wso2.carbon.databridge.core.definitionstore.AbstractStreamDefinitionStore",
"service.scope=singleton"
}
)
public class FileSystemStreamDefinitionStore extends AbstractStreamDefinitionStore {
private static final Log log = LogFactory.getLog(FileSystemStreamDefinitionStore.class);

Expand Down
8 changes: 8 additions & 0 deletions components/event-processor-manager/org.wso2.carbon.event.processor.manager.core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,14 @@
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
</dependency>
</dependencies>
<build>

Expand Down
8 changes: 8 additions & 0 deletions ...a/org/wso2/carbon/event/processor/manager/core/internal/CarbonEventManagementService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.osgi.annotation.bundle.Capability;
import org.wso2.carbon.databridge.commons.Event;
import org.wso2.carbon.event.processor.manager.core.EventManagementService;
import org.wso2.carbon.event.processor.manager.core.EventProcessorManagementService;
Comment on lines +22 to 25
Copy link
Copy Markdown

@wso2-engineering wso2-engineering Bot Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Log Improvement Suggestion No: 1

Suggested change
import org.osgi.annotation.bundle.Capability;
import org.wso2.carbon.databridge.commons.Event;
import org.wso2.carbon.event.processor.manager.core.EventManagementService;
import org.wso2.carbon.event.processor.manager.core.EventProcessorManagementService;
import org.osgi.annotation.bundle.Capability;
import org.wso2.carbon.databridge.commons.Event;
import org.wso2.carbon.event.processor.manager.core.EventManagementService;
import org.wso2.carbon.event.processor.manager.core.EventProcessorManagementService;
log.info("Initializing CarbonEventManagementService with OSGi capability annotation");

Expand All @@ -45,6 +46,13 @@
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;

@Capability(
namespace = "osgi.service",
attribute = {
"objectClass=org.wso2.carbon.event.processor.manager.core.EventManagementService",
"service.scope=singleton"
}
)
public class CarbonEventManagementService implements EventManagementService {

private static Log log = LogFactory.getLog(CarbonEventManagementService.class);
Expand Down
10 changes: 10 additions & 0 deletions ...t.adapter.websocket.local/org.wso2.carbon.event.output.adapter.websocket.endpoint/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,15 @@

<build>
<finalName>outputwebsocket</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.5.0</version>
</plugin>
</plugins>
</build>
</project>
13 changes: 13 additions & 0 deletions components/event-publisher/org.wso2.carbon.event.output.adapter.core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@
<url>http://wso2.org</url>

<dependencies>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
Expand Down Expand Up @@ -73,6 +81,11 @@
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>

<build>
Expand Down
7 changes: 7 additions & 0 deletions ...a/org/wso2/carbon/event/output/adapter/core/internal/CarbonOutputEventAdapterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@
/**
* EventAdapter service implementation.
*/
@org.osgi.annotation.bundle.Capability(
namespace = "osgi.service",
attribute = {
"objectClass=org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService",
"service.scope=singleton"
}
)
public class CarbonOutputEventAdapterService implements OutputEventAdapterService {

private static Log log = LogFactory.getLog(CarbonOutputEventAdapterService.class);
Expand Down
8 changes: 8 additions & 0 deletions components/event-publisher/org.wso2.carbon.event.publisher.core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@
<artifactId>org.wso2.securevault</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
8 changes: 8 additions & 0 deletions .../main/java/org/wso2/carbon/event/publisher/core/internal/CarbonEventPublisherService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.apache.axis2.util.XMLUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.osgi.annotation.bundle.Capability;
import org.w3c.dom.Document;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.databridge.commons.StreamDefinition;
Expand Down Expand Up @@ -59,6 +60,13 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.stream.XMLStreamException;

@Capability(
namespace = "osgi.service",
attribute = {
"objectClass=org.wso2.carbon.event.publisher.core.EventPublisherService",
"service.scope=singleton"
}
)
public class CarbonEventPublisherService implements EventPublisherService {

private static final Log log = LogFactory.getLog(CarbonEventPublisherService.class);
Expand Down
10 changes: 10 additions & 0 deletions ...ut.adapter.websocket.local/org.wso2.carbon.event.input.adapter.websocket.endpoint/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,15 @@

<build>
<finalName>inputwebsocket</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.5.0</version>
</plugin>
</plugins>
</build>
</project>
8 changes: 8 additions & 0 deletions components/event-receiver/org.wso2.carbon.event.input.adapter.core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -74,6 +79,9 @@
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
<Provide-Capability>
osgi.service;objectClass=org.wso2.carbon.event.input.adapter.core.InputEventAdapterService
</Provide-Capability>
</instructions>
</configuration>
</plugin>
Expand Down
3 changes: 3 additions & 0 deletions components/event-receiver/org.wso2.carbon.event.receiver.core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
<Provide-Capability>
osgi.service;objectClass=org.wso2.carbon.event.receiver.core.EventReceiverService
</Provide-Capability>
<Axis2Deployer>EventReceiverDeployer</Axis2Deployer>
<Axis2RequiredServices>
org.wso2.carbon.event.receiver.core.EventReceiverService
Expand Down
13 changes: 13 additions & 0 deletions components/event-stream/org.wso2.carbon.event.stream.core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,19 @@
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>

<build>
Expand Down
8 changes: 8 additions & 0 deletions ...re/src/main/java/org/wso2/carbon/event/stream/core/internal/CarbonEventStreamService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.osgi.annotation.bundle.Capability;
import org.wso2.carbon.base.MultitenantConstants;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.core.multitenancy.utils.TenantAxisUtils;
Expand Down Expand Up @@ -49,6 +50,13 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

@Capability(
namespace = "osgi.service",
attribute = {
"objectClass=org.wso2.carbon.event.stream.core.EventStreamService",
"service.scope=singleton"
}
)
public class CarbonEventStreamService implements EventStreamService {

private static final Log log = LogFactory.getLog(CarbonEventStreamService.class);
Expand Down
5 changes: 5 additions & 0 deletions components/template-manager/org.wso2.carbon.event.template.manager.core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>

<build>
Expand Down
1 change: 1 addition & 0 deletions features/analytics-dashboard/org.wso2.carbon.analytics.dashboard.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<version>${carbon.p2.plugin.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<id>4-p2-feature-generation</id>
Expand Down
1 change: 1 addition & 0 deletions ...ures/analytics-data-agents/jmx/org.wso2.carbon.analytics.common.jmx.agent.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<version>${carbon.p2.plugin.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<id>4-p2-feature-generation</id>
Expand Down
Loading