diff --git a/modules/api-resources/api-resources-full/pom.xml b/modules/api-resources/api-resources-full/pom.xml index 3f14f4fd316..7764c5fa629 100644 --- a/modules/api-resources/api-resources-full/pom.xml +++ b/modules/api-resources/api-resources-full/pom.xml @@ -117,14 +117,6 @@ org.wso2.carbon.identity.user.api org.wso2.carbon.identity.rest.api.user.authorized.apps.v2 - - org.wso2.carbon.identity.user.api - org.wso2.carbon.identity.rest.api.user.approval.v1 - - - org.wso2.carbon.identity.user.api - org.wso2.carbon.identity.api.user.approval.common - org.wso2.carbon.identity.user.api org.wso2.carbon.identity.rest.api.user.fido2.v1 @@ -260,10 +252,6 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.claim.management.common - - org.wso2.carbon.identity.server.api - org.wso2.carbon.identity.rest.api.server.workflow.engine.v1 - org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.permission.management.v1 diff --git a/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml b/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml index 7a7822d2d77..5742feb0972 100644 --- a/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml +++ b/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml @@ -22,7 +22,6 @@ xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd"> - @@ -198,7 +197,6 @@ - @@ -236,7 +234,6 @@ - diff --git a/modules/api-resources/pom.xml b/modules/api-resources/pom.xml index 34cd9ae0f68..c390bf108b6 100644 --- a/modules/api-resources/pom.xml +++ b/modules/api-resources/pom.xml @@ -78,16 +78,6 @@ org.wso2.carbon.identity.api.user.session.common ${identity.user.api.version} - - org.wso2.carbon.identity.user.api - org.wso2.carbon.identity.rest.api.user.approval.v1 - ${identity.user.api.version} - - - org.wso2.carbon.identity.user.api - org.wso2.carbon.identity.api.user.approval.common - ${identity.user.api.version} - org.wso2.carbon.identity.user.api org.wso2.carbon.identity.api.user.application.common @@ -156,11 +146,6 @@ org.wso2.carbon.identity.api.server.claim.management.common ${identity.server.api.version} - - org.wso2.carbon.identity.server.api - org.wso2.carbon.identity.rest.api.server.workflow.engine.v1 - ${identity.server.api.version} - org.wso2.carbon.identity.rest.dispatcher diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 614c61151f6..ac1a70c19a4 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -428,10 +428,6 @@ ${pom.artifactId}-${pom.version}/lib/ - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/bps - ${pom.artifactId}-${pom.version}/dbscripts/bps - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge @@ -928,33 +924,6 @@ wso2is-${pom.version}/repository/conf/identity - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/jpadb.mv.db - - wso2is-${pom.version}/repository/database/ - 644 - - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/bps-datasources.xml - - wso2is-${pom.version}/repository/conf/datasources/ - 644 - - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/b4p-coordination-config.xml - - wso2is-${pom.version}/repository/conf/ - 644 - - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/humantask.xml - - wso2is-${pom.version}/repository/conf/ - 644 - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/output-event-adapters.xml @@ -962,20 +931,6 @@ wso2is-${pom.version}/repository/conf/ 644 - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/attachment-management.xml - - wso2is-${pom.version}/repository/conf/ - 644 - - - - - conf/bps/bps.xml - - wso2is-${pom.version}/repository/conf/ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/oidc-scope-config.xml diff --git a/modules/distribution/src/repository/resources/conf/catalina.properties b/modules/distribution/src/repository/resources/conf/catalina.properties index f918adcb184..3161d1dba63 100644 --- a/modules/distribution/src/repository/resources/conf/catalina.properties +++ b/modules/distribution/src/repository/resources/conf/catalina.properties @@ -186,7 +186,6 @@ org.wso2.carbon.databridge.commons.thrift_*.jar,\ org.apache.felix.gogo.shell_*.jar,\ org.wso2.carbon.identity.rest.api.user.fido2.v1-*.jar,\ org.wso2.carbon.identity.api.user.fido2.common-*.jar,\ -org.wso2.carbon.identity.rest.api.server.workflow.engine.*.jar,\ pax-logging-api-*.jar,\ hibernate-validator-*.jar,\ shiro-web-*.jar,\ diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml index 7a83b624b30..bc2811cb920 100644 --- a/modules/integration/tests-common/admin-clients/pom.xml +++ b/modules/integration/tests-common/admin-clients/pom.xml @@ -112,14 +112,21 @@ org.wso2.carbon.identity.association.account org.wso2.carbon.identity.user.account.association.stub + + org.wso2.carbon.identity.framework org.wso2.carbon.identity.workflow.mgt.stub + 5.25.547 + compile org.wso2.carbon.identity.workflow.impl.bps org.wso2.carbon.identity.workflow.impl.stub + 5.5.5 + compile + org.wso2.carbon.deployment org.wso2.carbon.service.mgt.stub diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml index 303b8367c65..3de90a9548e 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml @@ -146,7 +146,8 @@ - + + @@ -276,7 +277,8 @@ - + + diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index 4ab7e15a0c3..d8a1220a4ad 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -374,34 +374,6 @@ org.wso2.ciphertool:org.wso2.ciphertool.feature:${cipher-tool.version} - - - - org.wso2.carbon.identity.framework:org.wso2.carbon.identity.workflow.mgt.feature:${carbon.identity.framework.version} - - - org.wso2.carbon.identity.workflow.user:org.wso2.carbon.user.mgt.workflow.feature:${identity.user.workflow.version} - - - org.wso2.carbon.identity.workflow.impl.bps:org.wso2.carbon.identity.workflow.impl.feature:${identity.workflow.impl.bps.version} - - - org.wso2.carbon.identity.workflow.template.multisteps:org.wso2.carbon.identity.workflow.template.server.feature:${identity.workflow.template.multisteps.version} - - - - - org.wso2.carbon.business-process:org.wso2.carbon.bpel.server.feature:${carbon.business-process.version} - - - org.wso2.carbon.business-process:org.wso2.carbon.humantask.server.feature:${carbon.business-process.version} - - - org.wso2.carbon.business-process:org.wso2.carbon.attachment.mgt.feature:${carbon.business-process.version} - - - org.wso2.carbon.business-process:org.wso2.carbon.unifiedendpoint.server.feature:${carbon.business-process.version} - org.wso2.carbon.analytics-common:org.wso2.carbon.event.output.adapter.server.feature:${carbon.analytics-common.version} @@ -973,41 +945,6 @@ org.wso2.carbon.identity.user.account.association.feature.group ${identity.user.account.association.version} - - org.wso2.carbon.identity.workflow.mgt.feature.group - ${carbon.identity.framework.version} - - - org.wso2.carbon.identity.workflow.impl.feature.group - ${identity.workflow.impl.bps.version} - - - org.wso2.carbon.identity.workflow.template.server.feature.group - ${identity.workflow.template.multisteps.version} - - - - org.wso2.carbon.user.mgt.workflow.feature.group - ${identity.user.workflow.version} - - - - - org.wso2.carbon.bpel.server.feature.group - ${carbon.business-process.version} - - - org.wso2.carbon.humantask.server.feature.group - ${carbon.business-process.version} - - - org.wso2.carbon.attachment.mgt.feature.group - ${carbon.business-process.version} - - - org.wso2.carbon.unifiedendpoint.server.feature.group - ${carbon.business-process.version} - org.wso2.carbon.event.output.adapter.server.feature.group ${carbon.analytics-common.version} diff --git a/pom.xml b/pom.xml index 7834ad7b1b1..efad82c7f92 100755 --- a/pom.xml +++ b/pom.xml @@ -1321,21 +1321,11 @@ org.wso2.carbon.identity.test.integration.service.stubs ${project.version} - - org.wso2.carbon.identity.framework - org.wso2.carbon.identity.workflow.mgt.stub - ${carbon.identity.framework.version} - org.wso2.carbon.identity.framework org.wso2.carbon.security.mgt.stub ${carbon.identity.framework.version} - - org.wso2.carbon.identity.workflow.impl.bps - org.wso2.carbon.identity.workflow.impl.stub - ${identity.workflow.impl.bps.version} - org.jacoco org.jacoco.agent @@ -1381,16 +1371,6 @@ xercesImpl ${xercesImpl.version} - - org.wso2.carbon.identity.framework - org.wso2.carbon.identity.workflow.mgt - ${carbon.identity.framework.version} - - - org.wso2.carbon.identity.workflow.impl.bps - org.wso2.carbon.identity.workflow.impl - ${identity.workflow.impl.bps.version} - org.wso2.carbon.identity.framework org.wso2.carbon.identity.application.authentication.framework @@ -1756,11 +1736,6 @@ org.wso2.carbon.identity.authenticator.mutualssl.feature ${identity.carbon.auth.mutual.ssl.version} - - org.wso2.carbon.identity.workflow.user - org.wso2.carbon.user.mgt.workflow.feature - ${identity.user.workflow.version} - org.wso2.carbon.identity.userstore.remote org.wso2.carbon.identity.user.store.remote.feature @@ -1771,11 +1746,6 @@ org.wso2.carbon.identity.authenticator.iwa.feature ${identity.carbon.auth.iwa.version} - - org.wso2.carbon.identity.workflow.template.multisteps - org.wso2.carbon.identity.workflow.template.server.feature - ${identity.workflow.template.multisteps.version} - org.wso2.carbon.identity.local.auth.requestpath.oauth org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature @@ -2283,7 +2253,7 @@ - 5.25.597 + 5.25.598 [5.14.67, 6.0.0] @@ -2311,12 +2281,6 @@ 5.7.4 3.4.50 - - 5.6.0 - 5.5.5 - 5.5.0 - - 5.5.6 5.7.4 @@ -2404,8 +2368,8 @@ 2.0.13 - 1.3.28 - 1.2.135 + 1.3.29 + 1.2.137 5.5.9 5.5.7 @@ -2435,7 +2399,6 @@ 4.8.15 4.11.17 1.3.12 - 4.5.66 5.2.56 2.0.27 2.1.7