Skip to content

Commit f0c6b25

Browse files
Add Java 21 compile time support
1 parent 5b472d5 commit f0c6b25

File tree

87 files changed

+329
-3581
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+329
-3581
lines changed

components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/internal/service/impl/ActionExecutorServiceImpl.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.apache.commons.lang.StringUtils;
2626
import org.apache.commons.logging.Log;
2727
import org.apache.commons.logging.LogFactory;
28+
import org.osgi.annotation.bundle.Capability;
2829
import org.wso2.carbon.identity.action.execution.api.exception.ActionExecutionException;
2930
import org.wso2.carbon.identity.action.execution.api.exception.ActionExecutionRequestBuilderException;
3031
import org.wso2.carbon.identity.action.execution.api.exception.ActionExecutionResponseProcessorException;
@@ -83,6 +84,13 @@
8384
* It is responsible for building the request payload, calling the API, processing the response and
8485
* returning the status of the action execution.
8586
*/
87+
@Capability(
88+
namespace = "osgi.service",
89+
attribute = {
90+
"objectClass=org.wso2.carbon.identity.action.execution.api.service.ActionExecutorService",
91+
"service.scope=singleton"
92+
}
93+
)
8694
public class ActionExecutorServiceImpl implements ActionExecutorService {
8795

8896
private static final Log LOG = LogFactory.getLog(ActionExecutorServiceImpl.class);

components/action-mgt/org.wso2.carbon.identity.action.management/src/main/java/org/wso2/carbon/identity/action/management/internal/service/impl/CacheBackedActionManagementService.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.apache.commons.lang.StringUtils;
2222
import org.apache.commons.logging.Log;
2323
import org.apache.commons.logging.LogFactory;
24+
import org.osgi.annotation.bundle.Capability;
2425
import org.wso2.carbon.identity.action.management.api.exception.ActionMgtException;
2526
import org.wso2.carbon.identity.action.management.api.model.Action;
2627
import org.wso2.carbon.identity.action.management.api.model.Authentication;
@@ -35,6 +36,13 @@
3536
/**
3637
* CacheBackedActionManagementService act as the caching layer for the Action Management Service.
3738
*/
39+
@Capability(
40+
namespace = "osgi.service",
41+
attribute = {
42+
"objectClass=org.wso2.carbon.identity.action.management.api.service.ActionManagementService",
43+
"service.scope=singleton"
44+
}
45+
)
3846
public class CacheBackedActionManagementService implements ActionManagementService {
3947

4048
private static final CacheBackedActionManagementService INSTANCE = new CacheBackedActionManagementService();

components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/src/main/java/org/wso2/carbon/identity/api/resource/mgt/APIResourceManagerImpl.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.wso2.carbon.identity.api.resource.mgt;
2020

2121
import org.apache.commons.lang.StringUtils;
22+
import org.osgi.annotation.bundle.Capability;
2223
import org.wso2.carbon.identity.api.resource.mgt.constant.APIResourceManagementConstants;
2324
import org.wso2.carbon.identity.api.resource.mgt.dao.impl.APIResourceManagementDAOImpl;
2425
import org.wso2.carbon.identity.api.resource.mgt.dao.impl.CacheBackedAPIResourceMgtDAO;
@@ -38,6 +39,13 @@
3839
/**
3940
* API resource management service.
4041
*/
42+
@Capability(
43+
namespace = "osgi.service",
44+
attribute = {
45+
"objectClass=org.wso2.carbon.identity.api.resource.mgt.APIResourceManager",
46+
"service.scope=singleton"
47+
}
48+
)
4149
public class APIResourceManagerImpl implements APIResourceManager {
4250

4351
private static final APIResourceManager INSTANCE = new APIResourceManagerImpl();

components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/ApplicationManagementServiceImpl.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.apache.commons.lang3.SerializationUtils;
2626
import org.apache.commons.logging.Log;
2727
import org.apache.commons.logging.LogFactory;
28+
import org.osgi.annotation.bundle.Capability;
2829
import org.w3c.dom.Document;
2930
import org.wso2.carbon.CarbonConstants;
3031
import org.wso2.carbon.context.CarbonContext;
@@ -194,6 +195,13 @@
194195
/**
195196
* Application management service implementation.
196197
*/
198+
@Capability(
199+
namespace = "osgi.service",
200+
attribute = {
201+
"objectClass=org.wso2.carbon.identity.application.mgt.ApplicationManagementService",
202+
"service.scope=singleton"
203+
}
204+
)
197205
public class ApplicationManagementServiceImpl extends ApplicationManagementService {
198206

199207
private static final Log log = LogFactory.getLog(ApplicationManagementServiceImpl.class);

components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<artifactId>org.wso2.carbon.identity.user.profile</artifactId>
120120
</dependency>
121121
<dependency>
122-
<groupId>org.wso2.eclipse.osgi</groupId>
122+
<groupId>org.eclipse.platform</groupId>
123123
<artifactId>org.eclipse.osgi.services</artifactId>
124124
</dependency>
125125
<dependency>
@@ -265,7 +265,6 @@
265265
<Import-Package>
266266
javax.xml.namespace,
267267
javax.xml.stream,
268-
org.eclipse.equinox.http.helper,
269268

270269
javax.servlet.*; version="${imp.pkg.version.javax.servlet}",
271270
org.apache.axiom.*; version="${axiom.osgi.version.range}",

components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/main/java/org/wso2/carbon/identity/application/authentication/framework/config/model/graph/JsGraphBuilderFactory.java

Lines changed: 0 additions & 156 deletions
This file was deleted.

0 commit comments

Comments
 (0)