Skip to content

Add Java 21 compile time support #881

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

Draft
madurangasiriwardena wants to merge 1 commit into
base: 5.2.x
Choose a base branch
from
Draft

Add Java 21 compile time support #881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.17.1</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
2 changes: 1 addition & 1 deletion 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
10 changes: 8 additions & 2 deletions 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 @@ -69,7 +69,8 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency> <dependency>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.core</artifactId>
</dependency>
Expand All @@ -93,6 +94,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
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
2 changes: 1 addition & 1 deletion components/data-bridge/org.wso2.carbon.databridge.streamdefn.registry/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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 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 @@ -67,6 +67,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 @@ -23,6 +23,7 @@
import com.hazelcast.core.HazelcastInstance;
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;
Expand All @@ -49,6 +50,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
14 changes: 13 additions & 1 deletion 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 @@ -81,11 +89,15 @@
<groupId>org.json.wso2</groupId>
<artifactId>json</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>

<build>
<plugins>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
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 @@ -40,6 +40,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);
Comment on lines +43 to 52
Copy link

@wso2-engineering wso2-engineering bot Nov 13, 2025

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
@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);
@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);
static {
log.info("Initializing CarbonOutputEventAdapterService with OSGi capability.");
}

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
10 changes: 9 additions & 1 deletion .../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 Expand Up @@ -684,4 +692,4 @@ public Map<Integer, EventPublisherDeployer> getTenantSpecificDeployerMap() {
return tenantSpecificDeployerMap;
}

}
}
5 changes: 5 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 @@ -51,6 +51,11 @@
<groupId>org.wso2.orbit.com.hazelcast</groupId>
<artifactId>hazelcast</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 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,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 ...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
13 changes: 9 additions & 4 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 @@ -31,10 +31,10 @@
<url>http://wso2.org</url>

<dependencies>
<dependency>
<groupId>org.wso2.org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
Expand Down 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
1 change: 1 addition & 0 deletions ...alytics-data-agents/jmx/org.wso2.carbon.analytics.common.jmx.agent.server.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,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 ...s/analytics-data-agents/jmx/org.wso2.carbon.analytics.common.jmx.agent.ui.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,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
5 changes: 3 additions & 2 deletions ...gadget-templates/org.wso2.carbon.analytics.gadget.batch.provider.template.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<version>1.5.3</version>
<version>${carbon.p2.plugin.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<id>p2-feature-generation</id>
Expand All @@ -117,4 +118,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
5 changes: 3 additions & 2 deletions ...nalytics-gadget-templates/org.wso2.carbon.analytics.gadget.chart.template.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<version>1.5.3</version>
<version>${carbon.p2.plugin.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<id>p2-feature-generation</id>
Expand All @@ -112,4 +113,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
Loading