From b280a1c72379da2afe64b8e16d6d5a1a1bc17e03 Mon Sep 17 00:00:00 2001 From: shanggeeth Date: Tue, 5 Nov 2024 23:49:36 +0530 Subject: [PATCH 1/2] Import org.graalvm.polyglot package and sub-packages --- .../pom.xml | 3 +++ .../pom.xml | 3 +++ .../pom.xml | 1 + .../pom.xml | 4 ++++ .../pom.xml | 9 +++++++++ .../pom.xml | 3 +++ .../pom.xml | 5 +++++ .../pom.xml | 4 ++++ .../pom.xml | 6 ++++++ .../pom.xml | 3 +++ 10 files changed, 41 insertions(+) diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.analytics/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.analytics/pom.xml index f8c7d495..2528d9c0 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.analytics/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.analytics/pom.xml @@ -187,6 +187,9 @@ org.wso2.carbon.utils.*; version="${carbon.kernel.package.import.version.range}", org.wso2.carbon.context, + + org.graalvm.polyglot.* + diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.choreo/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.choreo/pom.xml index c2abcdf6..0fc3ae1e 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.choreo/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.choreo/pom.xml @@ -220,6 +220,9 @@ com.nimbusds.jwt.*;version="${nimbusds.osgi.version.range}", org.wso2.carbon.identity.core.cache; version="${carbon.identity.package.import.version.range}", + + org.graalvm.polyglot.* + diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.common/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.common/pom.xml index f27f10d4..92332752 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.common/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.common/pom.xml @@ -107,6 +107,7 @@ org.wso2.carbon.identity.conditional.auth.functions.common.* + org.graalvm.polyglot.*, org.apache.http.auth, jdk.nashorn.api.scripting, org.openjdk.nashorn.api.scripting diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.elk/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.elk/pom.xml index 8aef7a63..a9e9c24e 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.elk/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.elk/pom.xml @@ -147,6 +147,7 @@ org.wso2.carbon.identity.application.authentication.framework.config.model.graph; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.application.authentication.framework.context; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.application.authentication.framework.exception; version="${carbon.identity.package.import.version.range}", + org.wso2.carbon.identity.application.authentication.framework.util; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.conditional.auth.functions.common.auth; version="${org.wso2.carbon.identity.conditional.auth.functions.version.range}", org.wso2.carbon.identity.conditional.auth.functions.common.utils; version="${org.wso2.carbon.identity.conditional.auth.functions.version.range}", org.wso2.carbon.identity.core.util; version="${carbon.identity.package.import.version.range}", @@ -155,6 +156,9 @@ org.wso2.carbon.identity.governance.common; version="${identity.governance.import.version.range}", org.wso2.carbon.utils.*;version="${carbon.kernel.package.import.version.range}", + + org.graalvm.polyglot.* + diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.http/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.http/pom.xml index fec47017..44b84ec3 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.http/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.http/pom.xml @@ -153,6 +153,8 @@ org.apache.commons.collections, org.apache.commons.io, org.apache.commons.lang, + org.apache.commons.lang3, + org.apache.commons.lang3.tuple, org.apache.commons.logging, org.apache.http.entity, org.apache.http.impl, @@ -164,6 +166,8 @@ org.apache.http.impl.client, org.apache.http.conn, org.apache.http.message, + com.google.gson, + com.google.gson.reflect, org.json.simple, org.json.simple.parser, org.apache.http, @@ -187,6 +191,8 @@ version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.application.authentication.framework.config.model.graph; version="${carbon.identity.package.import.version.range}", + org.wso2.carbon.identity.application.authentication.framework.util; + version="${carbon.identity.package.import.version.range}", org.wso2.carbon.security.keystore.service.*; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.core.util; version="${carbon.identity.package.import.version.range}", @@ -201,6 +207,9 @@ org.wso2.carbon.identity.core.cache; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.context, + + org.graalvm.polyglot.* + diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.jwt.decode/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.jwt.decode/pom.xml index 32a9d727..e99638f2 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.jwt.decode/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.jwt.decode/pom.xml @@ -101,6 +101,9 @@ com.nimbusds.jose.*;version="${nimbusds.osgi.version.range}", net.minidev.json; version="${net.minidev.json.imp.pkg.version.range}" + + org.graalvm.polyglot.* + diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.notification/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.notification/pom.xml index 5e50f583..a015262c 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.notification/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.notification/pom.xml @@ -135,12 +135,17 @@ org.wso2.carbon.identity.event; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.event.event; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.event.services; version="${carbon.identity.package.import.version.range}", + org.wso2.carbon.identity.event.handler.notification; + version="${identity.event.handler.notification.version.range}", org.wso2.carbon.identity.event.handler.notification.exception; version="${identity.event.handler.notification.version.range}", org.wso2.carbon.identity.central.log.mgt.utils; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.utils*;version="${carbon.kernel.package.import.version.range}", org.wso2.carbon.user.core.service; version="${carbon.kernel.package.import.version.range}" + + org.graalvm.polyglot.* + diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.user.store/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.user.store/pom.xml index 60c43399..0efedced 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.user.store/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.user.store/pom.xml @@ -113,6 +113,7 @@ org.wso2.carbon.identity.application.authentication.framework.util; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.application.authentication.framework.exception; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.application.authentication.framework.model; version="${carbon.identity.package.import.version.range}", + org.wso2.carbon.identity.application.authentication.framework.config.model.graph.js.base; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.application.authentication.framework.config.model.graph.js; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.application.authentication.framework.config.model.graph; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.application.authentication.framework.config.model; version="${carbon.identity.package.import.version.range}", @@ -124,6 +125,9 @@ org.wso2.carbon.user.api; version="${carbon.user.package.import.version.range}", org.wso2.carbon.identity.core.util; version="${carbon.identity.package.import.version.range}" + + org.graalvm.polyglot.* + diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.user/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.user/pom.xml index 384b04f5..9ba71f75 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.user/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.user/pom.xml @@ -169,6 +169,7 @@ org.wso2.carbon.identity.conditional.auth.functions.user.* + org.apache.commons.codec.binary, org.apache.commons.lang, org.apache.commons.logging, org.osgi.service.component, @@ -201,6 +202,8 @@ version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.application.authentication.framework.config.model.graph.graaljs; version="${carbon.identity.package.import.version.range}", + org.wso2.carbon.identity.application.authentication.framework.config.model.graph.js.base; + version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.application.authentication.framework.config.model; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.application.authentication.framework.context; @@ -236,6 +239,9 @@ org.wso2.carbon.identity.conditional.auth.functions.common.utils, org.wso2.carbon.utils*;version="${carbon.kernel.package.import.version.range}" + + org.graalvm.polyglot.* + diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.utils/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.utils/pom.xml index b05c38bb..181edd76 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.utils/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.utils/pom.xml @@ -129,6 +129,9 @@ org.wso2.carbon.utils*;version="${carbon.kernel.package.import.version.range}", org.wso2.carbon.identity.core.util; version="${carbon.identity.package.import.version.range}" + + org.graalvm.polyglot.* + From 4976071c960b6874f99994a541f5b41bbcab39d2 Mon Sep 17 00:00:00 2001 From: shanggeeth Date: Sun, 19 Jan 2025 22:17:40 +0530 Subject: [PATCH 2/2] Remove unnecessary import of sub-packages --- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 3 ++- .../pom.xml | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.analytics/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.analytics/pom.xml index 2528d9c0..f57a48a8 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.analytics/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.analytics/pom.xml @@ -188,7 +188,7 @@ org.wso2.carbon.context, - org.graalvm.polyglot.* + org.graalvm.polyglot diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.choreo/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.choreo/pom.xml index 0fc3ae1e..c0ed4f40 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.choreo/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.choreo/pom.xml @@ -221,7 +221,7 @@ org.wso2.carbon.identity.core.cache; version="${carbon.identity.package.import.version.range}", - org.graalvm.polyglot.* + org.graalvm.polyglot diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.common/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.common/pom.xml index 92332752..b661adaa 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.common/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.common/pom.xml @@ -107,7 +107,7 @@ org.wso2.carbon.identity.conditional.auth.functions.common.* - org.graalvm.polyglot.*, + org.graalvm.polyglot, org.apache.http.auth, jdk.nashorn.api.scripting, org.openjdk.nashorn.api.scripting diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.elk/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.elk/pom.xml index a9e9c24e..b229d74d 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.elk/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.elk/pom.xml @@ -157,7 +157,7 @@ org.wso2.carbon.utils.*;version="${carbon.kernel.package.import.version.range}", - org.graalvm.polyglot.* + org.graalvm.polyglot diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.http/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.http/pom.xml index 44b84ec3..6cf5638d 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.http/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.http/pom.xml @@ -208,7 +208,7 @@ org.wso2.carbon.context, - org.graalvm.polyglot.* + org.graalvm.polyglot diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.jwt.decode/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.jwt.decode/pom.xml index e99638f2..4997b075 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.jwt.decode/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.jwt.decode/pom.xml @@ -102,7 +102,7 @@ net.minidev.json; version="${net.minidev.json.imp.pkg.version.range}" - org.graalvm.polyglot.* + org.graalvm.polyglot diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.notification/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.notification/pom.xml index a015262c..df152554 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.notification/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.notification/pom.xml @@ -144,7 +144,7 @@ org.wso2.carbon.user.core.service; version="${carbon.kernel.package.import.version.range}" - org.graalvm.polyglot.* + org.graalvm.polyglot diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.user.store/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.user.store/pom.xml index 0efedced..381974f2 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.user.store/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.user.store/pom.xml @@ -126,7 +126,7 @@ org.wso2.carbon.identity.core.util; version="${carbon.identity.package.import.version.range}" - org.graalvm.polyglot.* + org.graalvm.polyglot diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.user/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.user/pom.xml index 9ba71f75..c3d79bb0 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.user/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.user/pom.xml @@ -240,7 +240,8 @@ org.wso2.carbon.utils*;version="${carbon.kernel.package.import.version.range}" - org.graalvm.polyglot.* + org.graalvm.polyglot, + org.graalvm.polyglot.proxy diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.utils/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.utils/pom.xml index 181edd76..32e7bb68 100644 --- a/components/org.wso2.carbon.identity.conditional.auth.functions.utils/pom.xml +++ b/components/org.wso2.carbon.identity.conditional.auth.functions.utils/pom.xml @@ -130,7 +130,7 @@ org.wso2.carbon.identity.core.util; version="${carbon.identity.package.import.version.range}" - org.graalvm.polyglot.* + org.graalvm.polyglot