From 073762c9db51759d0685f5fa94560fa34914aaa4 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Fri, 26 May 2023 11:46:35 +0530 Subject: [PATCH] updated versions for apim 420 and jdk 17 --- .../pom.xml | 19 +- .../pom.xml | 16 +- .../pom.xml | 1 - .../pom.xml | 7 +- .../pom.xml | 12 +- .../pom.xml | 6 +- .../APIManagementProviderServiceImpl.java | 53 +-- .../pom.xml | 5 +- .../pom.xml | 5 +- .../pom.xml | 1 - .../extension/service/KeyMgtServiceImpl.java | 2 +- .../pom.xml | 11 +- .../publisher/APIPublisherServiceImpl.java | 4 +- .../org.wso2.carbon.apimgt.handlers/pom.xml | 7 +- .../pom.xml | 7 +- .../pom.xml | 1 - components/apimgt-extensions/pom.xml | 38 +- .../pom.xml | 7 +- .../pom.xml | 11 +- .../pom.xml | 6 +- .../pom.xml | 17 +- .../pom.xml | 11 +- .../pom.xml | 7 +- components/application-mgt/pom.xml | 34 +- .../pom.xml | 20 +- .../pom.xml | 26 +- .../pom.xml | 50 ++- ...CertificateManagementServiceImplTests.java | 15 +- components/certificate-mgt/pom.xml | 38 +- .../pom.xml | 16 +- .../pom.xml | 5 +- .../pom.xml | 6 +- .../pom.xml | 25 +- .../pom.xml | 5 + .../pom.xml | 7 +- .../pom.xml | 9 +- .../pom.xml | 8 +- .../pom.xml | 13 +- .../pom.xml | 7 +- .../pom.xml | 80 ++-- .../pom.xml | 1 - .../handlers/ScopeValidationHandler.java | 1 - .../pom.xml | 15 +- .../pom.xml | 7 +- .../pom.xml | 6 +- .../pom.xml | 11 +- .../pom.xml | 15 +- .../pom.xml | 10 +- .../pom.xml | 7 +- .../pom.xml | 28 +- .../pom.xml | 7 +- components/policy-mgt/pom.xml | 38 +- .../pom.xml | 21 +- .../pom.xml | 9 +- .../pom.xml | 5 +- .../pom.xml | 86 ++-- .../pom.xml | 11 +- .../pom.xml | 4 + .../pom.xml | 5 +- .../pom.xml | 26 +- .../interceptor/PermissionScopeHandler.java | 2 +- .../pom.xml | 9 +- .../webapp-authenticator-framework/pom.xml | 38 +- .../pom.xml | 5 +- .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 5 +- .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 5 +- .../pom.xml | 1 - .../pom.xml | 7 +- .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - .../pom.xml | 1 - pom.xml | 420 ++++++++++-------- 96 files changed, 801 insertions(+), 649 deletions(-) diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml index b2ddd8fa17..6f81d027e8 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml @@ -37,10 +37,7 @@ maven-compiler-plugin - - 1.8 - 1.8 - + maven-war-plugin @@ -61,7 +58,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 compile @@ -97,9 +93,8 @@ provided - org.apache.cxf + org.apache.cxf.wso2 cxf-bundle - 3.0.0-milestone2 test @@ -133,9 +128,10 @@ - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided + org.wso2.carbon.identity.inbound.auth.oauth2 @@ -333,6 +329,11 @@ io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common provided + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.application.mgt.common + provided + diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml index e72e7b62b9..0e921289d8 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml @@ -117,15 +117,22 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.common + provided + + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.application.mgt.common + provided org.wso2.carbon org.wso2.carbon.utils - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided + org.wso2.carbon @@ -147,7 +154,6 @@ org.apache.httpcomponents.wso2 httpclient - 4.1.1.wso2v1 compile @@ -191,8 +197,8 @@ provided - com.h2database.wso2 - h2-database-engine + org.wso2.orbit.com.h2database + h2 test diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension/pom.xml index e19cb9e0f3..438fb28d72 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension/pom.xml @@ -41,7 +41,6 @@ org.apache.velocity velocity - 1.7 diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml index 6fde8fc060..58e0ac2d1a 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml @@ -43,8 +43,10 @@ org.eclipse.osgi.services - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + javax.ws.rs @@ -60,7 +62,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.api/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.api/pom.xml index 364b6be7fe..a3dcb68c37 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.api/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.api/pom.xml @@ -159,21 +159,21 @@ org.wso2.carbon.registry.core provided + + org.wso2.orbit.javax.xml.bind + jaxb-api + + org.apache.maven.plugins maven-compiler-plugin - - UTF-8 - ${wso2.maven.compiler.source} - ${wso2.maven.compiler.target} - + org.apache.maven.plugins maven-war-plugin - 2.2 ${project.artifactId} diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml index 279733d44a..48ad10e3eb 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml @@ -47,8 +47,10 @@ org.wso2.carbon.utils - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.wso2.carbon.apimgt diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderServiceImpl.java b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderServiceImpl.java index 338af5a1e2..b73ea49b7e 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderServiceImpl.java +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * Copyright (c) 2018 - 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. * * WSO2 Inc. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -83,9 +83,9 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe try { APIConsumer apiConsumer = API_MANAGER_FACTORY.getAPIConsumer(username); - Application application = apiConsumer.getApplicationsByName(username, applicationName, ""); + Application application = null; // todo:apim - apiConsumer.getApplicationsByName(username, applicationName, ""); if (application != null) { - apiConsumer.removeApplication(application, username); + // todo:apim - apiConsumer.removeApplication(application, username); } } catch (APIManagementException e) { throw new APIManagerException("Failed to remove api application : " + applicationName, e); @@ -108,30 +108,30 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe } try { APIConsumer apiConsumer = API_MANAGER_FACTORY.getAPIConsumer(username); - Application application = apiConsumer.getApplicationsByName(username, applicationName, ""); + Application application = null; // todo:apim - apiConsumer.getApplicationsByName(username, applicationName, ""); int applicationId = 0; Subscriber subscriber = null; if (application == null) { - subscriber = apiConsumer.getSubscriber(username); + subscriber = null; // todo:apim - apiConsumer.getSubscriber(username); if (subscriber == null) { // create subscriber - apiConsumer.addSubscriber(username, ""); - subscriber = apiConsumer.getSubscriber(username); + // todo:apim - apiConsumer.addSubscriber(username, ""); + subscriber = null; // todo:apim - apiConsumer.getSubscriber(username); } //create application application = new Application(applicationName, subscriber); application.setTier(ApiApplicationConstants.DEFAULT_TIER); application.setGroupId(""); application.setTokenType("OAUTH"); - apiConsumer.addApplication(application, username); - application = apiConsumer.getApplicationsByName(username, applicationName, ""); + // todo:apim - apiConsumer.addApplication(application, username); + application = null; // todo:apim - apiConsumer.getApplicationsByName(username, applicationName, ""); } else { - subscriber = apiConsumer.getSubscriber(username); + subscriber = null; // todo:apim - apiConsumer.getSubscriber(username); } Set subscribedAPIs = - apiConsumer.getSubscribedAPIs(subscriber, applicationName, ""); + null; // todo:apim - apiConsumer.getSubscribedAPIs(subscriber, applicationName, ""); log.info("Already subscribed API count: " + subscribedAPIs.size()); @@ -141,7 +141,7 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe if (tags != null && tags.length > 0) { for (String tag : tags) { boolean startedTenantFlow = false; - Set apisWithTag = apiConsumer.getAPIsWithTag(tag, tenantDomain); + Set apisWithTag = null; // todo:apim - apiConsumer.getAPIsWithTag(tag, tenantDomain); /** * From APIM 4.0.0, APIs published in the super tenant can only be listed by @@ -164,7 +164,7 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe ". Caused by to inability to get super tenant username", e); } - apisWithTag = apiConsumerAPIPublishedTenant.getAPIsWithTag(tag, MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); + apisWithTag = null; // todo:apim - apiConsumerAPIPublishedTenant.getAPIsWithTag(tag, MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); startedTenantFlow = true; } @@ -176,10 +176,11 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe boolean subscriptionExist = false; if (subscribedAPIs.size() > 0) { for (SubscribedAPI subscribedAPI : subscribedAPIs) { - if (String.valueOf(subscribedAPI.getApiId().toString()).equals(id)) { - subscriptionExist = true; - break; - } + // todo:apim +// if (String.valueOf(subscribedAPI.getApiId().toString()).equals(id)) { +// subscriptionExist = true; +// break; +// } } } if (!subscriptionExist && !tempApiIds.contains(id)) { @@ -218,7 +219,7 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe * Oauth app for a child tenant. */ for (ApiTypeWrapper apiTypeWrapper : apiTypeWrapperList) { - apiConsumer.addSubscription(apiTypeWrapper, username, application); + // todo:apim - apiConsumer.addSubscription(apiTypeWrapper, username, application); } } } @@ -249,8 +250,8 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe APIAdmin apiAdmin = new APIAdminImpl(); String keyManagerId = null; try { - List keyManagerConfigurations = apiAdmin - .getKeyManagerConfigurationsByTenant(tenantDomain); + List keyManagerConfigurations = null; // todo:apim - apiAdmin +// .getKeyManagerConfigurationsByTenant(tenantDomain); if (keyManagerConfigurations != null) { for (KeyManagerConfigurationDTO keyManagerConfigurationDTO : keyManagerConfigurations) { keyManagerId = keyManagerConfigurationDTO.getUuid(); @@ -269,10 +270,10 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe "\\\"id_token_expiry_time\\\":\\\"N\\/A\\\"}\"," + "\"username\":\"" + username + "\"}"; - Map keyDetails = apiConsumer - .requestApprovalForApplicationRegistration(username, applicationName, keyType, "", - allowedDomains.toArray(new String[allowedDomains.size()]), validityTime, "default", "", - jsonString, keyManagerId, tenantDomain); + Map keyDetails = null; // todo:apim - apiConsumer +// .requestApprovalForApplicationRegistration(username, applicationName, keyType, "", +// allowedDomains.toArray(new String[allowedDomains.size()]), validityTime, "default", "", +// jsonString, keyManagerId, tenantDomain); if (keyDetails != null) { ApiApplicationKey apiApplicationKey = new ApiApplicationKey(); @@ -281,7 +282,9 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe return apiApplicationKey; } throw new APIManagerException("Failed to generate keys for tenant: " + tenantDomain); - } catch (APIManagementException e) { +// todo:apim - commected as it says never throw since we commented apim calls above +// } catch (APIManagementException e) { + } catch (Exception e) { throw new APIManagerException("Failed to create api application for tenant: " + tenantDomain, e); } } catch (APIManagementException e) { diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml index 7dd0c74914..47bdfcc258 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml @@ -40,8 +40,8 @@ provided - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided @@ -95,7 +95,6 @@ org.apache.felix maven-bundle-plugin - 5.1.7 true diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/pom.xml index e1d584a964..5561082608 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/pom.xml @@ -17,10 +17,7 @@ maven-compiler-plugin - - 1.8 - 1.8 - + maven-war-plugin diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/pom.xml index aac78c17e4..c7d84703db 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/pom.xml @@ -43,7 +43,6 @@ org.apache.felix maven-bundle-plugin - 5.1.7 true diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/service/KeyMgtServiceImpl.java b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/service/KeyMgtServiceImpl.java index f04f67704d..c7da98973b 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/service/KeyMgtServiceImpl.java +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/src/main/java/io/entgra/device/mgt/core/apimgt/keymgt/extension/service/KeyMgtServiceImpl.java @@ -435,7 +435,7 @@ public class KeyMgtServiceImpl implements KeyMgtService { try { APIManagerFactory apiManagerFactory = APIManagerFactory.getInstance(); APIConsumer apiConsumer = apiManagerFactory.getAPIConsumer(owner); - return apiConsumer.getApplicationsByName(owner, applicationName, ""); + return null; // todo:apim - apiConsumer.getApplicationsByName(owner, applicationName, ""); } catch (APIManagementException e) { msg = "Error while trying to retrieve the application"; log.error(msg); diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/pom.xml index e23a764fbb..2a45ffeea1 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/pom.xml @@ -64,8 +64,10 @@ org.wso2.carbon.core - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.wso2.carbon @@ -118,8 +120,8 @@ provided - com.h2database.wso2 - h2-database-engine + org.wso2.orbit.com.h2database + h2 test @@ -143,7 +145,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherServiceImpl.java b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherServiceImpl.java index 5b0f094a4c..c24e38fdd2 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherServiceImpl.java +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherServiceImpl.java @@ -240,7 +240,9 @@ public class APIPublisherServiceImpl implements APIPublisherService { // need remove the local scope and add as a shared scope if (!publisherRESTAPIServices.isSharedScopeNameExists(apiApplicationKey, accessTokenInfo, apiScope.getKey())) { - if (apiProvider.isScopeKeyAssignedLocally(apiIdentifier, apiScope.getKey(), tenantId)) { + //todo:apim + // if (apiProvider.isScopeKeyAssignedLocally(apiIdentifier, apiScope.getKey(), tenantId)) { + if (true) { // collect scope to move as shared scopes scopesToMoveAsSharedScopes.add(apiScope); } else { diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml index 24ee2eb967..bb79290fd6 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml @@ -35,8 +35,10 @@ - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.apache.synapse @@ -70,7 +72,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml index 4ae55f3a63..c91bf08475 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml @@ -33,7 +33,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true @@ -132,8 +131,10 @@ feign-okhttp - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.eclipse.osgi diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml index 026c034c88..98240ce166 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml @@ -69,7 +69,6 @@ com.google.code.maven-replacer-plugin replacer - 1.5.2 diff --git a/components/apimgt-extensions/pom.xml b/components/apimgt-extensions/pom.xml index 040f3a9ed0..ae5f8c040c 100644 --- a/components/apimgt-extensions/pom.xml +++ b/components/apimgt-extensions/pom.xml @@ -43,23 +43,23 @@ io.entgra.device.mgt.core.apimgt.extension.rest.api - - - - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml index 5ce4c88fa3..78dfa71168 100644 --- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml @@ -39,7 +39,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true @@ -85,8 +84,10 @@ org.eclipse.equinox.common - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + commons-codec.wso2 diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/pom.xml index 08e0e2561f..30cc4268e9 100644 --- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/pom.xml @@ -54,7 +54,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.8 compile @@ -84,7 +83,6 @@ org.codehaus.mojo exec-maven-plugin - 1.5.0 test @@ -139,9 +137,10 @@ provided - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided + org.json.wso2 @@ -220,5 +219,9 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.application.mgt.addons + + commons-io.wso2 + commons-io + \ No newline at end of file diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml index d6cb21f583..d1c04250dd 100644 --- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml @@ -76,8 +76,10 @@ org.eclipse.equinox.common - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + commons-codec.wso2 diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml index 2845ac4f9c..d7283553df 100644 --- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml @@ -97,7 +97,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18 src/test/resources/testng.xml @@ -134,8 +133,10 @@ test - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.wso2.carbon @@ -230,7 +231,6 @@ commons-validator commons-validator - 1.6 commons-collections @@ -246,7 +246,6 @@ cglib cglib-nodep - 3.2.7 compile @@ -256,30 +255,26 @@ mysql mysql-connector-java - 5.1.34 test xerces.wso2 xercesImpl - 2.8.1.wso2v2 test - com.h2database.wso2 - h2-database-engine + org.wso2.orbit.com.h2database + h2 test commons-dbcp.wso2 commons-dbcp - 1.4.0.wso2v1 test commons-pool.wso2 commons-pool - 1.5.6.wso2v1 test diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/pom.xml index e791d72f25..c24c704833 100644 --- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/pom.xml @@ -54,7 +54,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.8 compile @@ -84,7 +83,6 @@ org.codehaus.mojo exec-maven-plugin - 1.5.0 test @@ -139,9 +137,10 @@ provided - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided + org.json.wso2 @@ -220,5 +219,9 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.application.mgt.addons + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.device.mgt.common + \ No newline at end of file diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/pom.xml index b9ba8faf36..f1ca183fb5 100644 --- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/pom.xml @@ -54,7 +54,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.8 compile @@ -84,7 +83,6 @@ org.codehaus.mojo exec-maven-plugin - 1.5.0 test @@ -139,9 +137,10 @@ provided - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided + org.json.wso2 diff --git a/components/application-mgt/pom.xml b/components/application-mgt/pom.xml index 5d698230c1..4badfb0349 100644 --- a/components/application-mgt/pom.xml +++ b/components/application-mgt/pom.xml @@ -50,22 +50,22 @@ ${maven.checkstyle.vesion} - - - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - - - + + + + + + + + + + + + + + + + + diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/pom.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/pom.xml index a0c91ef23c..e95c4cf732 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/pom.xml +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/pom.xml @@ -37,10 +37,7 @@ maven-compiler-plugin - - 1.8 - 1.8 - + maven-war-plugin @@ -87,7 +84,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 compile @@ -117,7 +113,6 @@ org.codehaus.mojo exec-maven-plugin - 1.2.1 test @@ -160,9 +155,10 @@ test - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided + io.entgra.device.mgt.core @@ -206,6 +202,14 @@ io.entgra.device.mgt.core.apimgt.annotations provided + + com.google.code.gson + gson + + + org.wso2.orbit.javax.xml.bind + jaxb-api + diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml index e97cfa8bd0..d55518babd 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml @@ -37,10 +37,7 @@ maven-compiler-plugin - - 1.8 - 1.8 - + maven-war-plugin @@ -87,7 +84,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 compile @@ -117,7 +113,6 @@ org.codehaus.mojo exec-maven-plugin - 1.2.1 test @@ -164,9 +159,10 @@ provided - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided + io.entgra.device.mgt.core @@ -207,6 +203,20 @@ io.entgra.device.mgt.core.apimgt.annotations provided + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.device.mgt.common + provided + + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.device.mgt.core + provided + + + org.wso2.orbit.javax.xml.bind + jaxb-api + diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml index ddd6720485..668fb6352a 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml @@ -58,7 +58,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true @@ -126,7 +125,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18 src/test/resources/testng.xml @@ -142,16 +140,22 @@ jacoco-maven-plugin ${jacoco.maven.plugin.version} + + + + + + + + + + + + - default-instrument + jacoco-initialize - instrument - - - - default-restore-instrumented-classes - - restore-instrumented-classes + prepare-agent @@ -165,12 +169,12 @@ ${basedir}/target/coverage-reports/site - - default-report-integration - - report-integration - - + + + + + + @@ -196,8 +200,8 @@ testng - com.h2database.wso2 - h2-database-engine + org.wso2.orbit.com.h2database + h2 test @@ -217,8 +221,10 @@ test - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.wso2.orbit.org.bouncycastle @@ -270,6 +276,10 @@ slf4j-simple test + + org.wso2.orbit.javax.xml.bind + jaxb-api + diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java index 0094110b1d..74d761f373 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java @@ -45,7 +45,6 @@ import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateManagement import org.wso2.carbon.context.PrivilegedCarbonContext; import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException; import io.entgra.device.mgt.core.device.mgt.core.config.DeviceConfigurationManager; -import sun.misc.BASE64Encoder; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -54,6 +53,7 @@ import java.security.PrivateKey; import java.security.Security; import java.security.cert.*; import java.util.ArrayList; +import java.util.Base64; import java.util.List; /** @@ -180,7 +180,6 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC @Test(description = "This test case tests Signature verification of a Certificate against the keystore") public void testVerifySignature() throws KeystoreException, CertificateEncodingException, CMSException, IOException { - BASE64Encoder encoder = new BASE64Encoder(); //generate and save a certificate in the keystore X509Certificate x509Certificate = managementService.generateX509Certificate(); //Generate CMSdata @@ -191,7 +190,7 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC generator.addCertificates(store); CMSSignedData degenerateSd = generator.generate(new CMSAbsentContent()); byte[] signature = degenerateSd.getEncoded(); - boolean verifySignature = managementService.verifySignature(encoder.encode(signature)); + boolean verifySignature = managementService.verifySignature(Base64.getEncoder().encodeToString(signature)); Assert.assertNotNull(verifySignature); Assert.assertTrue(verifySignature); log.info("VerifySignature Test Successful"); @@ -262,11 +261,11 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC @Test(description = "This test case tests generation of signed Certificate from a CSR") public void testGetSignedCertificateFromCSR() throws KeystoreException { CSRGenerator csrGeneration = new CSRGenerator(); - BASE64Encoder encoder = new BASE64Encoder(); // Generate key pair KeyPair keyPair = csrGeneration.generateKeyPair("RSA", 1024); byte[] csrData = csrGeneration.generateCSR("SHA256WithRSA", keyPair); - X509Certificate signedCertificateFromCSR = managementService.getSignedCertificateFromCSR(encoder.encode(csrData)); + X509Certificate signedCertificateFromCSR = managementService.getSignedCertificateFromCSR( + Base64.getEncoder().encodeToString(csrData)); Assert.assertNotNull(signedCertificateFromCSR); Assert.assertEquals(signedCertificateFromCSR.getType(), CertificateManagementConstants.X_509); log.info("GetSignedCertificateFromCSR Test Successful"); @@ -303,9 +302,8 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC @Test(description = "This test case tests converting a pem file to X509 Certificate") public void testPemToX509Certificate() throws IOException, KeystoreException { File caCert = new File(CA_CERT_PEM); - BASE64Encoder encoder = new BASE64Encoder(); byte[] caBytes = FileUtils.readFileToByteArray(caCert); - X509Certificate certificate = managementService.pemToX509Certificate(encoder.encode(caBytes)); + X509Certificate certificate = managementService.pemToX509Certificate(Base64.getEncoder().encodeToString(caBytes)); Assert.assertNotNull(certificate); Assert.assertEquals(certificate.getType(), CertificateManagementConstants.X_509); log.info("PemToX509Certificate Test Successful"); @@ -313,7 +311,6 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC @Test(description = "This test case tests extracting Certificate from the header Signature") public void testExtractCertificateFromSignature() throws KeystoreException, CertificateEncodingException, CMSException, IOException, DeviceManagementException { - BASE64Encoder encoder = new BASE64Encoder(); DeviceConfigurationManager.getInstance().initConfig(); //generate and save a certificate in the keystore X509Certificate x509Certificate = managementService.generateX509Certificate(); @@ -325,7 +322,7 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC generator.addCertificates(store); CMSSignedData degenerateSd = generator.generate(new CMSAbsentContent()); byte[] signature = degenerateSd.getEncoded(); - X509Certificate certificate = managementService.extractCertificateFromSignature(encoder.encode(signature)); + X509Certificate certificate = managementService.extractCertificateFromSignature(Base64.getEncoder().encodeToString(signature)); Assert.assertNotNull(certificate); Assert.assertEquals(certificate.getType(), CertificateManagementConstants.X_509); log.info("ExtractCertificateFromSignature Test Successful"); diff --git a/components/certificate-mgt/pom.xml b/components/certificate-mgt/pom.xml index 137bd4040d..51691757c9 100644 --- a/components/certificate-mgt/pom.xml +++ b/components/certificate-mgt/pom.xml @@ -38,23 +38,23 @@ io.entgra.device.mgt.core.certificate.mgt.cert.admin.api - - - - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml index 283d9b9743..5bd1ca25cb 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml @@ -41,17 +41,12 @@ maven-scr-plugin + org.apache.maven.plugins maven-compiler-plugin - - 1.8 - 1.8 - - 2.3.2 org.apache.felix maven-bundle-plugin - 1.4.0 true @@ -141,8 +136,10 @@ org.wso2.carbon.core - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.wso2.carbon @@ -216,9 +213,8 @@ test - javax.xml.bind + org.wso2.orbit.javax.xml.bind jaxb-api - test diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml index 71b60f8381..70a9a195a3 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml @@ -64,9 +64,10 @@ - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided + diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml index cd3da29c98..3b8a1bbd9e 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml @@ -101,8 +101,10 @@ - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + com.google.code.gson diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/pom.xml b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/pom.xml index 82f53ee287..dd6554598e 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/pom.xml +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/pom.xml @@ -36,13 +36,11 @@ + org.apache.maven.plugins maven-compiler-plugin - - 1.8 - 1.8 - + org.apache.maven.plugins maven-war-plugin WEB-INF/lib/*cxf*.jar @@ -99,7 +97,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 compile @@ -129,7 +126,6 @@ org.codehaus.mojo exec-maven-plugin - 1.2.1 test @@ -156,11 +152,17 @@ provided - org.apache.cxf + org.apache.cxf.wso2 cxf-bundle - 3.0.0-milestone2 - test + + + + + + + + org.apache.cxf cxf-bundle-jaxrs @@ -192,9 +194,10 @@ - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided + io.entgra.device.mgt.core diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.common/pom.xml b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.common/pom.xml index 8a5d35696c..253f7c86bb 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.common/pom.xml +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.common/pom.xml @@ -99,6 +99,11 @@ com.google.code.gson gson + + org.wso2.orbit.javax.xml.bind + jaxb-api + + diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/pom.xml b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/pom.xml index 3e774609ae..c011c1acaf 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/pom.xml +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/pom.xml @@ -37,10 +37,7 @@ maven-compiler-plugin - - 1.8 - 1.8 - + maven-war-plugin @@ -99,7 +96,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 compile @@ -129,7 +125,6 @@ org.codehaus.mojo exec-maven-plugin - 1.2.1 test diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml index eac71008d5..8d473781ab 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml @@ -165,8 +165,9 @@ io.entgra.device.mgt.core.device.mgt.common - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided org.wso2.carbon @@ -187,8 +188,8 @@ - com.h2database.wso2 - h2-database-engine + org.wso2.orbit.com.h2database + h2 test diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml index 12dd685758..5b805b3b55 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml @@ -87,8 +87,8 @@ test - com.h2database.wso2 - h2-database-engine + org.wso2.orbit.com.h2database + h2 test @@ -136,6 +136,10 @@ org.apache.sling.testing.osgi-mock test + + org.wso2.orbit.javax.xml.bind + jaxb-api + diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.url.printer/pom.xml b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.url.printer/pom.xml index 4ed6e7b2b8..7d9e3da088 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.url.printer/pom.xml +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.url.printer/pom.xml @@ -41,17 +41,12 @@ maven-scr-plugin + org.apache.maven.plugins maven-compiler-plugin - - 1.8 - 1.8 - - 2.3.2 org.apache.felix maven-bundle-plugin - 1.4.0 true @@ -118,8 +113,10 @@ org.wso2.carbon.core - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.wso2.carbon diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml index d836b5d79e..954c10e8ff 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml @@ -59,8 +59,10 @@ org.wso2.carbon.core - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.wso2.carbon @@ -93,7 +95,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true diff --git a/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml index 9f1cc8619f..b04e6492c9 100644 --- a/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml @@ -73,44 +73,44 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - file:src/test/resources/log4j.properties - - - src/test/resources/testng.xml - - - - - org.jacoco - jacoco-maven-plugin - - ${basedir}/target/coverage-reports/jacoco-unit.exec - - - - jacoco-initialize - - prepare-agent - - - - jacoco-site - test - - report - - - ${basedir}/target/coverage-reports/jacoco-unit.exec - ${basedir}/target/coverage-reports/site - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -124,8 +124,8 @@ org.eclipse.osgi.services - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api org.wso2.carbon diff --git a/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/pom.xml b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/pom.xml index 054f9ed910..1198fd3b9a 100644 --- a/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/pom.xml +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/pom.xml @@ -68,7 +68,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true diff --git a/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/ScopeValidationHandler.java b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/ScopeValidationHandler.java index 97df2786f7..9799e8d8b8 100644 --- a/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/ScopeValidationHandler.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/ScopeValidationHandler.java @@ -27,7 +27,6 @@ import org.wso2.carbon.identity.oauth.cache.OAuthCacheKey; import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception; import org.wso2.carbon.identity.oauth2.dao.TokenManagementDAO; import org.wso2.carbon.identity.oauth2.dao.TokenManagementDAOImpl; -import org.wso2.carbon.identity.oauth2.dao.TokenMgtDAO; import org.wso2.carbon.identity.oauth2.model.AccessTokenDO; import org.wso2.carbon.identity.oauth2.model.ResourceScopeCacheEntry; import org.wso2.carbon.identity.oauth2.validators.OAuth2ScopeValidator; diff --git a/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml index 468996abc4..249ef62aec 100644 --- a/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml @@ -121,8 +121,10 @@ commons-codec - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.testng @@ -146,8 +148,8 @@ - com.h2database.wso2 - h2-database-engine + org.wso2.orbit.com.h2database + h2 test @@ -160,6 +162,10 @@ powermock-api-mockito test + + org.wso2.orbit.javax.xml.bind + jaxb-api + @@ -171,7 +177,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true diff --git a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml index 5757801392..51e8460173 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml +++ b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml @@ -47,8 +47,10 @@ org.wso2.carbon.core - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.wso2.carbon.identity.framework @@ -85,7 +87,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true diff --git a/components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml b/components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml index 7011b3e319..8cc5123ab6 100644 --- a/components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml +++ b/components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml @@ -33,8 +33,10 @@ - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.testng diff --git a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml index 7767cdc8b7..d92821cfc6 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml @@ -238,8 +238,8 @@ provided - com.h2database.wso2 - h2-database-engine + org.wso2.orbit.com.h2database + h2 test @@ -253,9 +253,10 @@ provided - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided + org.wso2.carbon @@ -352,7 +353,7 @@ provided - javax.xml.bind + org.wso2.orbit.javax.xml.bind jaxb-api test diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/pom.xml b/components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/pom.xml index 46083a1667..62d02c301c 100644 --- a/components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/pom.xml +++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/pom.xml @@ -23,7 +23,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true @@ -86,8 +85,9 @@ org.eclipse.equinox.common - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided io.entgra.device.mgt.core @@ -97,5 +97,14 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.policy.mgt.core + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.device.mgt.common + + + org.wso2.carbon + org.wso2.carbon.user.core + provided + diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.information.point/pom.xml b/components/policy-mgt/io.entgra.device.mgt.core.policy.information.point/pom.xml index 20b2c9298f..c32695d6b2 100644 --- a/components/policy-mgt/io.entgra.device.mgt.core.policy.information.point/pom.xml +++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.information.point/pom.xml @@ -25,7 +25,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true @@ -79,13 +78,18 @@ org.eclipse.equinox.common - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.policy.mgt.common + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.device.mgt.common + diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/pom.xml b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/pom.xml index 6477371b8b..2ac8356ba7 100644 --- a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/pom.xml +++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/pom.xml @@ -42,7 +42,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true @@ -102,8 +101,10 @@ org.eclipse.equinox.common - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.testng diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml index c9760e3e98..c31384c31d 100644 --- a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml +++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml @@ -42,7 +42,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true @@ -83,7 +82,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18 file:src/test/resources/log4j.properties @@ -132,8 +130,10 @@ org.eclipse.equinox.common - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.wso2.carbon @@ -181,6 +181,15 @@ io.entgra.device.mgt.core.policy.mgt.common + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.device.mgt.common + + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.device.mgt.core + + @@ -196,12 +205,11 @@ mysql mysql-connector-java - 5.1.34 test - com.h2database.wso2 - h2-database-engine + org.wso2.orbit.com.h2database + h2 test @@ -214,14 +222,12 @@ commons-dbcp.wso2 commons-dbcp - 1.4.0.wso2v1 test commons-pool.wso2 commons-pool - 1.5.6.wso2v1 test @@ -246,6 +252,10 @@ io.entgra.device.mgt.core.server.bootup.heartbeat.beacon test + + org.wso2.orbit.javax.xml.bind + jaxb-api + diff --git a/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml b/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml index c138d56414..3059b92749 100644 --- a/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml @@ -43,7 +43,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true @@ -97,8 +96,10 @@ org.eclipse.equinox.common - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + io.entgra.device.mgt.core diff --git a/components/policy-mgt/pom.xml b/components/policy-mgt/pom.xml index a17978dc66..5c5043ece5 100644 --- a/components/policy-mgt/pom.xml +++ b/components/policy-mgt/pom.xml @@ -41,24 +41,24 @@ - - - - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml index e056b0a6a2..4349157706 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml @@ -243,9 +243,10 @@ provided - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided + org.wso2.carbon @@ -340,19 +341,19 @@ com.google.guava guava - ${guava.version} + provided - org.json + org.json.wso2 json - ${json.version} + provided - com.fasterxml.jackson.core + org.wso2.orbit.com.fasterxml.jackson.core jackson-databind - ${fasterxml.jackson.version} + provided @@ -371,8 +372,8 @@ test - com.h2database.wso2 - h2-database-engine + org.wso2.orbit.com.h2database + h2 test @@ -406,7 +407,7 @@ test - javax.xml.bind + org.wso2.orbit.javax.xml.bind jaxb-api test diff --git a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml index 129b9b310b..8511e83f69 100755 --- a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml @@ -103,9 +103,10 @@ provided - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided + org.wso2.carbon @@ -134,6 +135,10 @@ org.wso2.carbon.ntask.core provided + + org.wso2.orbit.javax.xml.bind + jaxb-api + \ No newline at end of file diff --git a/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml index 3046dbcbc9..1011141e50 100755 --- a/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml +++ b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml @@ -84,9 +84,10 @@ provided - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided + io.entgra.device.mgt.core diff --git a/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml b/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml index 6cdaa2fcee..b25f17413a 100644 --- a/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml +++ b/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml @@ -80,44 +80,44 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - file:src/test/resources/log4j.properties - - - src/test/resources/testng.xml - - - - - org.jacoco - jacoco-maven-plugin - - ${basedir}/target/coverage-reports/jacoco-unit.exec - - - - jacoco-initialize - - prepare-agent - - - - jacoco-site - test - - report - - - ${basedir}/target/coverage-reports/jacoco-unit.exec - ${basedir}/target/coverage-reports/site - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -131,8 +131,10 @@ org.eclipse.osgi.services - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.wso2.carbon @@ -174,6 +176,10 @@ commons-collections.wso2 commons-collections + + org.wso2.orbit.javax.xml.bind + jaxb-api + diff --git a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/pom.xml b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/pom.xml index 801d901a8e..e04ee7b273 100644 --- a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/pom.xml +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/pom.xml @@ -37,10 +37,7 @@ maven-compiler-plugin - - 1.8 - 1.8 - + maven-war-plugin @@ -61,7 +58,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 compile @@ -134,9 +130,10 @@ provided - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided + io.entgra.device.mgt.core diff --git a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/pom.xml b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/pom.xml index 422c6a00e5..6b59870558 100644 --- a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/pom.xml +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/pom.xml @@ -90,6 +90,10 @@ swagger-annotations provided + + org.wso2.orbit.javax.xml.bind + jaxb-api + diff --git a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/pom.xml b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/pom.xml index d277b6289f..8b6bc1f41a 100644 --- a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/pom.xml +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/pom.xml @@ -99,9 +99,10 @@ - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided + org.wso2.carbon diff --git a/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml index 160f2b3094..dc3826357b 100644 --- a/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml +++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml @@ -81,7 +81,6 @@ org.codehaus.mojo exec-maven-plugin - 1.4.0 test @@ -319,5 +318,30 @@ httpmime compile + + commons-fileupload.wso2 + commons-fileupload + + + commons-lang + commons-lang + + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common + provided + + + javax.websocket + javax.websocket-api + + + xerces.wso2 + xercesImpl + + + org.json.wso2 + json + \ No newline at end of file diff --git a/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/PermissionScopeHandler.java b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/PermissionScopeHandler.java index 6d363cb4b3..974231dc9f 100644 --- a/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/PermissionScopeHandler.java +++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/PermissionScopeHandler.java @@ -22,7 +22,7 @@ import io.entgra.device.mgt.core.ui.request.interceptor.beans.AuthData; import io.entgra.device.mgt.core.ui.request.interceptor.beans.ProxyResponse; import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants; import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.http.HttpStatus; import org.json.JSONObject; diff --git a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml index 8b5c951f6a..3083d062f7 100644 --- a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml +++ b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml @@ -254,8 +254,8 @@ commons-codec - com.h2database.wso2 - h2-database-engine + org.wso2.orbit.com.h2database + h2 test @@ -281,13 +281,16 @@ org.wso2.carbon javax.cache.wso2 - 4.6.3-m5 test org.wso2.carbon.identity.inbound.auth.oauth2 org.wso2.carbon.identity.oauth.stub + + org.wso2.carbon + org.wso2.carbon.base + diff --git a/components/webapp-authenticator-framework/pom.xml b/components/webapp-authenticator-framework/pom.xml index 49ab101908..316f49a919 100644 --- a/components/webapp-authenticator-framework/pom.xml +++ b/components/webapp-authenticator-framework/pom.xml @@ -37,23 +37,23 @@ io.entgra.device.mgt.core.webapp.authenticator.framework - - - - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml index 767a64e491..47ffaa7795 100644 --- a/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml +++ b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml @@ -60,8 +60,8 @@ ${cxf.version} - com.h2database.wso2 - h2-database-engine + org.wso2.orbit.com.h2database + h2 @@ -69,7 +69,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension.feature/pom.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension.feature/pom.xml index 91223f189e..d8beb4374a 100644 --- a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension.feature/pom.xml +++ b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension.feature/pom.xml @@ -41,7 +41,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/pom.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/pom.xml index a1f97282cb..9bf539951e 100644 --- a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/pom.xml +++ b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/pom.xml @@ -45,7 +45,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/pom.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/pom.xml index 6056225fb8..9cdd5f9e48 100644 --- a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/pom.xml +++ b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/pom.xml @@ -44,7 +44,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml index 13402261d4..3b7e131862 100644 --- a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml +++ b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml @@ -61,7 +61,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml index e60e41a11e..6f2ae848bd 100644 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml +++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml @@ -45,7 +45,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml index 028f6998b9..9f8f8b4940 100644 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml +++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml @@ -47,7 +47,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml index 4130f33b6a..57cc63ea67 100644 --- a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml +++ b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml @@ -60,8 +60,8 @@ ${cxf.version} - com.h2database.wso2 - h2-database-engine + org.wso2.orbit.com.h2database + h2 @@ -69,7 +69,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml index 391a9e379a..d2b9cc6553 100644 --- a/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml +++ b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml @@ -73,7 +73,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml index d33f4f3724..71072922c1 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml @@ -47,7 +47,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml index 67df35fb5f..60734677e6 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml @@ -44,7 +44,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml index a7755227c6..a1b700bd6d 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml @@ -47,7 +47,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml index 1a3f2947e7..2779d21ec7 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml @@ -44,7 +44,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml index 487610ac59..9b660889a8 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml @@ -44,7 +44,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml index c1618dc366..43b3dde6fb 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml @@ -44,7 +44,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml index 09f69cfa8c..8014092801 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml @@ -44,7 +44,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml index 03139cbf87..5d2c978a74 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml @@ -47,7 +47,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml index cd3d512f57..f813b763a3 100644 --- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml @@ -49,7 +49,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml index 9042c6ac7e..a0263bae1e 100644 --- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml @@ -31,7 +31,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml index 5fc2b0ec18..4ca9d1a8af 100644 --- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml @@ -62,7 +62,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml index 388ae4a1f5..154ccae674 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml @@ -80,7 +80,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml index 0bd010d5d2..3e69f94efd 100644 --- a/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml +++ b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml @@ -37,8 +37,8 @@ - com.h2database.wso2 - h2-database-engine + org.wso2.orbit.com.h2database + h2 io.entgra.device.mgt.core @@ -80,7 +80,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml b/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml index cd8ae0076e..f6e5d38608 100644 --- a/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml +++ b/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml @@ -51,7 +51,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml b/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml index 962616027b..b0962c8ec5 100644 --- a/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml +++ b/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml @@ -38,8 +38,10 @@ - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api + provided + org.testng @@ -59,7 +61,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml b/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml index c28dd77f7a..3465606466 100644 --- a/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml +++ b/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml @@ -48,7 +48,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/pom.xml b/features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/pom.xml index f83dbe87ca..925f43997a 100644 --- a/features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/pom.xml +++ b/features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/pom.xml @@ -62,7 +62,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml b/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml index dbe8c0d4f1..35982643df 100644 --- a/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml +++ b/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml @@ -46,7 +46,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml b/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml index 373a9fa675..4993d7a081 100755 --- a/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml +++ b/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml @@ -46,7 +46,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml b/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml index d5768c90e9..3478f76af9 100644 --- a/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml +++ b/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml @@ -45,7 +45,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml index eea430f6d0..a38d042939 100644 --- a/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml +++ b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml @@ -50,7 +50,6 @@ org.apache.maven.plugins maven-resources-plugin - 2.6 copy-resources diff --git a/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml index bb4c779663..941bf1b64c 100644 --- a/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml +++ b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml @@ -49,7 +49,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/pom.xml b/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/pom.xml index 2b00b777dd..b35902a323 100644 --- a/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/pom.xml +++ b/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/pom.xml @@ -45,7 +45,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/pom.xml b/pom.xml index 4b549f56a7..5504751710 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.wso2 wso2 - 1 + 1.3 @@ -625,11 +625,11 @@ org.eclipse.osgi.services ${eclipse.equinox.services.version} - - org.osgi.ut - org.eclipse.osgi - ${eclipse.equinox.services.version} - + + + + + @@ -830,11 +830,6 @@ - - org.wso2.carbon - org.wso2.carbon.logging - ${org.wso2.carbon.logging.version} - org.wso2.carbon org.wso2.carbon.core.services @@ -843,11 +838,11 @@ - - com.h2database.wso2 - h2-database-engine - ${orbit.version.h2.engine} - + + + + + org.wso2.orbit.com.h2database @@ -881,10 +876,9 @@ - javax.xml.bind + org.wso2.orbit.javax.xml.bind jaxb-api - ${jaxb.api.version} - test + ${version.org.wso2.orbit.javax.xml.bind} @@ -1186,41 +1180,41 @@ cxf-rt-transports-http ${cxf.version} - - org.apache.cxf - cxf-rt-bindings-soap - ${cxf.version} - - - org.apache.cxf - cxf-rt-databinding-jaxb - - - - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.version} - - - org.apache.cxf - cxf-rt-ws-security - ${cxf.version} - - - net.sf.ehcache - ehcache-core - - - org.apache.ws.security - wss4j - - - commons-logging - commons-logging - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1290,11 +1284,11 @@ - - org.wso2.carbon.identity.inbound.auth.saml2 - org.wso2.carbon.identity.sso.saml - ${identity.inbound.auth.saml.version} - + + + + + com.googlecode.json-simple.wso2 json-simple @@ -1365,6 +1359,11 @@ httpmime ${apache.http.mime.version} + + commons-lang + commons-lang + ${commons-lang.version} + commons-lang.wso2 commons-lang @@ -1390,11 +1389,11 @@ okhttp ${squareup.okhttp3.version} - - com.squareup.okio - okio - ${okio.version} - + + + + + io.github.openfeign feign-okhttp @@ -1432,6 +1431,11 @@ commons-httpclient ${commons.httpclient.version} + + org.apache.velocity + velocity + 1.7 + org.wso2.orbit.org.apache.velocity velocity @@ -1447,12 +1451,12 @@ commons-collections ${commons-collections.version} - - javax - javaee-web-api - 6.0 - provided - + + + + + + @@ -1463,11 +1467,11 @@ - - org.wso2.carbon.analytics-common - org.wso2.carbon.databridge.core - ${carbon.analytics.common.version} - + + + + + org.wso2.carbon.analytics-common org.wso2.carbon.event.stream.core @@ -1562,6 +1566,11 @@ httpcore ${httpcore.version} + + org.apache.httpcomponents.wso2 + httpclient + ${httpclient.wso2.version} + org.wso2.orbit.org.apache.httpcomponents httpclient @@ -1586,15 +1595,15 @@ ${eclipse.paho.version} - - commons-configuration - commons-configuration - ${commons-configuration.version} - + + + + + io.swagger swagger-annotations - ${swagger.annotations.version} + ${swagger.version} io.swagger @@ -1616,16 +1625,16 @@ org.wso2.carbon.event.output.adapter.core ${carbon.analytics.common.version} - - org.wso2.carbon.analytics - org.wso2.carbon.analytics.datasource.commons - ${carbon.analytics.version} - - - org.wso2.carbon.analytics - org.wso2.carbon.analytics.dataservice.commons - ${carbon.analytics.version} - + + + + + + + + + + org.wso2.carbon.analytics-common org.wso2.carbon.event.publisher.stub @@ -1887,6 +1896,32 @@ mockito-inline ${mokito.version} + + org.ops4j.pax.logging + pax-logging-api + ${pax.logging.api.version} + + + org.apache.cxf.wso2 + cxf-bundle + ${cxf-bundle.version} + test + + + commons-fileupload.wso2 + commons-fileupload + ${commons-fileupload.version} + + + cglib + cglib-nodep + 3.2.7 + + + org.wso2.carbon + javax.cache.wso2 + 4.6.3-m5 + @@ -1922,17 +1957,17 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.8.1 UTF-8 - 1.8 - 1.8 + 17 + 17 org.apache.maven.plugins maven-war-plugin - 2.2 + 3.3.1 org.apache.maven.plugins @@ -1952,30 +1987,30 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + 3.8.1 UTF-8 - 1.8 - 1.8 + 17 + 17 - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - + + + + + + + + + + + + + org.apache.felix maven-bundle-plugin - 4.1.0 + 5.1.1 true NONE @@ -2016,7 +2051,13 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18 + 2.22.0 + + + ${basedir}/target/coverage-reports/jacoco-ut.exec + + + org.apache.maven.plugins @@ -2033,6 +2074,26 @@ jacoco-maven-plugin ${jacoco.maven.plugin.version} + + org.codehaus.mojo + exec-maven-plugin + 1.4.0 + + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + com.google.code.maven-replacer-plugin + replacer + 1.5.2 + + + io.swagger + swagger-codegen-maven-plugin + 2.2.1 + @@ -2040,76 +2101,76 @@ 2.2.1 7.4.0 - 4.6.2 + 4.8.1 [4.5.0, 5.0.0) 5.1.2 - 1.3 - 3.1.3 - 4.4.9 + + + - [1.6.1.wso2v11, 1.7.0) - 1.6.1.wso2v11 + [1.6.1, 1.7.0) + 1.6.1-wso2v85 1.1.0-wso2v10 - 1.0.0.Final + - 0.12.8 - 1.5.6 - 1.5.6 - 1.5.6 - 1.5.6 + + + + + - 4.3.1 - 4.4.2 - 1.1.0 - 4.8.2 + + + + 4.13.1 3.6.200.v20130402-1505 3.3.100.v20120522-1822 - 3.9.1.v20140110-1610 + 3.8.1.v20120830-144521 - 1.2.140.wso2v3 + - 7.0.85.wso2v1 - 7.0.85.wso2v1 + 7.0.93.wso2v1 + 7.0.93.wso2v1 7.0.34.wso2v2 - 4.7.15 + - 5.18.187 - [5.2.0, 7.0.0) - 6.4.111 - 5.5.2 - 1.0.31 - [1.0.31, 2.0.0) + 5.24.8 + [5.14.0, 6.0.0) + 6.9.6 + + 2.1.1 + [2.1.1, 3.0.0) [5.14.0, 6.0.0) [6.0.0, 7.0.0) - [5.3.0, 6.0.0) + - 4.9.10 + 4.9.20 - 4.8.21 + 4.8.30 - 1.2.11-wso2v10 + 1.2.11-wso2v25 [1.2.11, 1.3.0) - 1.2.11.wso2v10 + 1.2.11-wso2v25 5.0.26-SNAPSHOT - 4.7.35 + 4.9.2 1.4.0.wso2v1 [1.4.0,2.0.0) 2.4.0.wso2v1 @@ -2117,31 +2178,31 @@ [2.6.0,3.0.0) - 9.0.174 + 9.28.116 [9.0.0, 10.0.0) - 5.2.34 - [5.2.34,6.0.0) + 5.3.5 + [5.3.0,6.0.0) 1.3.25 - [1.3.0,2.0.0) - 2.1.23 + + 2.3.5 - 4.7.39 + 4.8.13 ${carbon.registry.version} [4.7.0, 5.0.0) - 3.3.6 + 3.5.5 1.1.wso2v1 - 1.9.0 + 1.9.13 - 20220924 - 2.4.5 - 27.0.1-jre + + + 1.60.0.wso2v1 @@ -2153,17 +2214,17 @@ 3.0.0.wso2v1 1.3 - 2.8.5 + 2.9.1 31.0.1-jre 4.6.0 1.13.0 - 9.3.1 + 11.0 1.1.1 1.2 4.5.6 - 4.4.10 - 4.5.8 + 4.4.13 + 4.5.10 1.9 @@ -2171,7 +2232,7 @@ 2.0.4.wso2v4 - github-scm + 1.0.3.wso2v1 @@ -2180,15 +2241,16 @@ 4.3.1.wso2v2 [4.3.1, 5.0.0) - 4.3.3.wso2v1 + 4.4.16.wso2v1 3.1.0.wso2v2 + 4.2.5.wso2v1 1.7.0.wso2v1 2.4.0.wso2v1 3.2.0.wso2v1 (3.2.0, 3.3.0] - 1.8 + 5.1.34 @@ -2199,13 +2261,13 @@ 1.0.2 - 7.3.0.wso2v1 + 7.9.0.wso2v1 [7.3, 8) 2.0.1 - 1.5.10 - 1.6.1 + 1.6.9 + 4.0.1 @@ -2221,8 +2283,8 @@ 1.8.10.wso2v2 - 4.2.1 - [1.0.0, 1.1.0) + + 1.7.0 @@ -2235,13 +2297,13 @@ 2.1.7-wso2v227 - 1.5.11.wso2v15 + 1.5.11-wso2v18 1.5.1 - 9.3.1 + 11.0 [9.3.1,10.0.0) 1.0.1 @@ -2268,22 +2330,28 @@ 3.1.0 - 7.0.85 + 9.0.24 1.1 - 1.13.1 + - 5.1.13.RELEASE + 5.3.23 2.7.18 + 2.6.1.wso2v2 [1.6.0, 2.0.0) [1.2.0,1.3.0) 4.2.0 - 2.3.1 + 2.8.1.wso2v2 4.3.1.wso2v1 - 1.4.199.wso2v1 + 2.1.210.wso2v1 1.1.3 + + 1.11.2 + 2.3.1.wso2v1 + 2.4 + 1.2.2.wso2v1