Fix package exposing issues

wso2 · Jan 25, 2025 · 9426492 · 9426492
1 parent 415638b
commit 9426492
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml b/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml
@@ -100,6 +100,11 @@
                             org.wso2.carbon.identity.action.management.util
                         </Private-Package>
                         <Export-Package>
+                            !org.wso2.carbon.identity.action.management.constant,
+                            !org.wso2.carbon.identity.action.management.dao.*,
+                            !org.wso2.carbon.identity.action.management.internal,
+                            !org.wso2.carbon.identity.action.management.service.impl,
+                            !org.wso2.carbon.identity.action.management.util,
                             org.wso2.carbon.identity.action.management.cache,
                             org.wso2.carbon.identity.action.management.constant.error,
                             org.wso2.carbon.identity.action.management.exception,

diff --git a/components/user-mgt/org.wso2.carbon.identity.user.pre.update.password.action/pom.xml b/components/user-mgt/org.wso2.carbon.identity.user.pre.update.password.action/pom.xml
@@ -34,11 +34,6 @@
     <description>The Pre Update Password Action Service backend component</description>
     <url>http://wso2.org</url>
 
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>org.wso2.carbon.identity.framework</groupId>
@@ -75,12 +70,11 @@
                         </Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Private-Package>
-                            org.wso2.carbon.identity.user.pre.update.password.action.core,
+                            org.wso2.carbon.identity.user.pre.update.password.action.core.constant,
+                            org.wso2.carbon.identity.user.pre.update.password.action.core.management,
                             org.wso2.carbon.identity.user.pre.update.password.action.internal
                         </Private-Package>
                         <Export-Package>
-                            !org.wso2.carbon.identity.user.pre.update.password.action.core,
-                            !org.wso2.carbon.identity.user.pre.update.password.action.internal,
                             org.wso2.carbon.identity.user.pre.update.password.action.service.*;
                             version="${carbon.identity.package.export.version}"
                         </Export-Package>

diff --git a/...ity/user/pre/update/password/action/internal/PreUpdatePasswordActionServiceComponent.java b/...ity/user/pre/update/password/action/internal/PreUpdatePasswordActionServiceComponent.java
@@ -66,14 +66,7 @@ protected void activate(ComponentContext context) {
     @Deactivate
     protected void deactivate(ComponentContext context) {
 
-        try {
-            BundleContext bundleCtx = context.getBundleContext();
-            bundleCtx.ungetService(bundleCtx.getServiceReference(PreUpdatePasswordActionConverter.class));
-            bundleCtx.ungetService(bundleCtx.getServiceReference(PreUpdatePasswordActionDTOModelResolver.class));
-            LOG.debug("Pre Update Password Action bundle is deactivated");
-        } catch (Throwable e) {
-            LOG.error("Error while deactivating Pre Update Password Action service component.", e);
-        }
+        LOG.debug("Pre Update Password Action bundle is deactivated");
     }
 
     @Reference(