community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated versions for apim 420 and jdk 17

Browse Source
This commit is contained in:
Amalka Subasinghe 2023-05-26 11:46:35 +05:30
parent 302f62a264
commit 073762c9db
96 changed files with 801 additions and 649 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml
View File

@ -37,10 +37,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
@ -61,7 +58,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>
@ -97,9 +93,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf.wso2</groupId>
<artifactId>cxf-bundle</artifactId> <artifactId>cxf-bundle</artifactId>
<version>3.0.0-milestone2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -133,9 +128,10 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId> <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
@ -333,6 +329,11 @@
<artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common</artifactId> <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.application.mgt.common</artifactId>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

16
components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml
View File

@ -117,15 +117,22 @@
<dependency> <dependency>
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.application.mgt.common</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId> <artifactId>org.wso2.carbon.utils</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -147,7 +154,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents.wso2</groupId> <groupId>org.apache.httpcomponents.wso2</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>4.1.1.wso2v1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -191,8 +197,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

1
components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension/pom.xml
View File

@ -41,7 +41,6 @@
<dependency> <dependency>
<groupId>org.apache.velocity</groupId> <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId> <artifactId>velocity</artifactId>
<version>1.7</version>
</dependency> </dependency>
</dependencies> </dependencies>

7
components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml
View File

@ -43,8 +43,10 @@
<artifactId>org.eclipse.osgi.services</artifactId> <artifactId>org.eclipse.osgi.services</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.ws.rs</groupId> <groupId>javax.ws.rs</groupId>
@ -60,7 +62,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>

12
components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.api/pom.xml
View File

@ -159,21 +159,21 @@
<artifactId>org.wso2.carbon.registry.core</artifactId> <artifactId>org.wso2.carbon.registry.core</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
<source>${wso2.maven.compiler.source}</source>
<target>${wso2.maven.compiler.target}</target>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.2</version>
<configuration> <configuration>
<warName>${project.artifactId}</warName> <warName>${project.artifactId}</warName>
</configuration> </configuration>

6
components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml
View File

@ -47,8 +47,10 @@
<artifactId>org.wso2.carbon.utils</artifactId> <artifactId>org.wso2.carbon.utils</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.apimgt</groupId> <groupId>org.wso2.carbon.apimgt</groupId>

53
components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderServiceImpl.java
View File

@ -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, * WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except * Version 2.0 (the "License"); you may not use this file except
@ -83,9 +83,9 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
try { try {
APIConsumer apiConsumer = API_MANAGER_FACTORY.getAPIConsumer(username); 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) { if (application != null) {
apiConsumer.removeApplication(application, username); // todo:apim - apiConsumer.removeApplication(application, username);
} }
} catch (APIManagementException e) { } catch (APIManagementException e) {
throw new APIManagerException("Failed to remove api application : " + applicationName, e); throw new APIManagerException("Failed to remove api application : " + applicationName, e);
@ -108,30 +108,30 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
} }
try { try {
APIConsumer apiConsumer = API_MANAGER_FACTORY.getAPIConsumer(username); 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; int applicationId = 0;
Subscriber subscriber = null; Subscriber subscriber = null;
if (application == null) { if (application == null) {
subscriber = apiConsumer.getSubscriber(username); subscriber = null; // todo:apim - apiConsumer.getSubscriber(username);
if (subscriber == null) { if (subscriber == null) {
// create subscriber // create subscriber
apiConsumer.addSubscriber(username, ""); // todo:apim - apiConsumer.addSubscriber(username, "");
subscriber = apiConsumer.getSubscriber(username); subscriber = null; // todo:apim - apiConsumer.getSubscriber(username);
} }
//create application //create application
application = new Application(applicationName, subscriber); application = new Application(applicationName, subscriber);
application.setTier(ApiApplicationConstants.DEFAULT_TIER); application.setTier(ApiApplicationConstants.DEFAULT_TIER);
application.setGroupId(""); application.setGroupId("");
application.setTokenType("OAUTH"); application.setTokenType("OAUTH");
apiConsumer.addApplication(application, username); // todo:apim - apiConsumer.addApplication(application, username);
application = apiConsumer.getApplicationsByName(username, applicationName, ""); application = null; // todo:apim - apiConsumer.getApplicationsByName(username, applicationName, "");
} else { } else {
subscriber = apiConsumer.getSubscriber(username); subscriber = null; // todo:apim - apiConsumer.getSubscriber(username);
} }
Set<SubscribedAPI> subscribedAPIs = Set<SubscribedAPI> subscribedAPIs =
apiConsumer.getSubscribedAPIs(subscriber, applicationName, ""); null; // todo:apim - apiConsumer.getSubscribedAPIs(subscriber, applicationName, "");
log.info("Already subscribed API count: " + subscribedAPIs.size()); log.info("Already subscribed API count: " + subscribedAPIs.size());
@ -141,7 +141,7 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
if (tags != null && tags.length > 0) { if (tags != null && tags.length > 0) {
for (String tag : tags) { for (String tag : tags) {
boolean startedTenantFlow = false; boolean startedTenantFlow = false;
Set<API> apisWithTag = apiConsumer.getAPIsWithTag(tag, tenantDomain); Set<API> apisWithTag = null; // todo:apim - apiConsumer.getAPIsWithTag(tag, tenantDomain);
/** /**
* From APIM 4.0.0, APIs published in the super tenant can only be listed by * 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); ". 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; startedTenantFlow = true;
} }
@ -176,10 +176,11 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
boolean subscriptionExist = false; boolean subscriptionExist = false;
if (subscribedAPIs.size() > 0) { if (subscribedAPIs.size() > 0) {
for (SubscribedAPI subscribedAPI : subscribedAPIs) { for (SubscribedAPI subscribedAPI : subscribedAPIs) {
if (String.valueOf(subscribedAPI.getApiId().toString()).equals(id)) { // todo:apim
subscriptionExist = true; // if (String.valueOf(subscribedAPI.getApiId().toString()).equals(id)) {
break; // subscriptionExist = true;
} // break;
// }
} }
} }
if (!subscriptionExist && !tempApiIds.contains(id)) { if (!subscriptionExist && !tempApiIds.contains(id)) {
@ -218,7 +219,7 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
* Oauth app for a child tenant. * Oauth app for a child tenant.
*/ */
for (ApiTypeWrapper apiTypeWrapper : apiTypeWrapperList) { 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(); APIAdmin apiAdmin = new APIAdminImpl();
String keyManagerId = null; String keyManagerId = null;
try { try {
List<KeyManagerConfigurationDTO> keyManagerConfigurations = apiAdmin List<KeyManagerConfigurationDTO> keyManagerConfigurations = null; // todo:apim - apiAdmin
.getKeyManagerConfigurationsByTenant(tenantDomain); // .getKeyManagerConfigurationsByTenant(tenantDomain);
if (keyManagerConfigurations != null) { if (keyManagerConfigurations != null) {
for (KeyManagerConfigurationDTO keyManagerConfigurationDTO : keyManagerConfigurations) { for (KeyManagerConfigurationDTO keyManagerConfigurationDTO : keyManagerConfigurations) {
keyManagerId = keyManagerConfigurationDTO.getUuid(); keyManagerId = keyManagerConfigurationDTO.getUuid();
@ -269,10 +270,10 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
"\\\"id_token_expiry_time\\\":\\\"N\\/A\\\"}\"," + "\\\"id_token_expiry_time\\\":\\\"N\\/A\\\"}\"," +
"\"username\":\"" + username + "\"}"; "\"username\":\"" + username + "\"}";
Map<String, Object> keyDetails = apiConsumer Map<String, Object> keyDetails = null; // todo:apim - apiConsumer
.requestApprovalForApplicationRegistration(username, applicationName, keyType, "", // .requestApprovalForApplicationRegistration(username, applicationName, keyType, "",
allowedDomains.toArray(new String[allowedDomains.size()]), validityTime, "default", "", // allowedDomains.toArray(new String[allowedDomains.size()]), validityTime, "default", "",
jsonString, keyManagerId, tenantDomain); // jsonString, keyManagerId, tenantDomain);
if (keyDetails != null) { if (keyDetails != null) {
ApiApplicationKey apiApplicationKey = new ApiApplicationKey(); ApiApplicationKey apiApplicationKey = new ApiApplicationKey();
@ -281,7 +282,9 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
return apiApplicationKey; return apiApplicationKey;
} }
throw new APIManagerException("Failed to generate keys for tenant: " + tenantDomain); 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); throw new APIManagerException("Failed to create api application for tenant: " + tenantDomain, e);
} }
} catch (APIManagementException e) { } catch (APIManagementException e) {

5
components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml
View File

@ -40,8 +40,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -95,7 +95,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>5.1.7</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>

5
components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/pom.xml
View File

@ -17,10 +17,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>

1
components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/pom.xml
View File

@ -43,7 +43,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>5.1.7</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>

2
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
View File

@ -435,7 +435,7 @@ public class KeyMgtServiceImpl implements KeyMgtService {
try { try {
APIManagerFactory apiManagerFactory = APIManagerFactory.getInstance(); APIManagerFactory apiManagerFactory = APIManagerFactory.getInstance();
APIConsumer apiConsumer = apiManagerFactory.getAPIConsumer(owner); APIConsumer apiConsumer = apiManagerFactory.getAPIConsumer(owner);
return apiConsumer.getApplicationsByName(owner, applicationName, ""); return null; // todo:apim - apiConsumer.getApplicationsByName(owner, applicationName, "");
} catch (APIManagementException e) { } catch (APIManagementException e) {
msg = "Error while trying to retrieve the application"; msg = "Error while trying to retrieve the application";
log.error(msg); log.error(msg);

11
components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/pom.xml
View File

@ -64,8 +64,10 @@
<artifactId>org.wso2.carbon.core</artifactId> <artifactId>org.wso2.carbon.core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -118,8 +120,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -143,7 +145,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>

4
components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherServiceImpl.java
View File

@ -240,7 +240,9 @@ public class APIPublisherServiceImpl implements APIPublisherService {
// need remove the local scope and add as a shared scope // need remove the local scope and add as a shared scope
if (!publisherRESTAPIServices.isSharedScopeNameExists(apiApplicationKey, accessTokenInfo, if (!publisherRESTAPIServices.isSharedScopeNameExists(apiApplicationKey, accessTokenInfo,
apiScope.getKey())) { 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 // collect scope to move as shared scopes
scopesToMoveAsSharedScopes.add(apiScope); scopesToMoveAsSharedScopes.add(apiScope);
} else { } else {

7
components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml
View File

@ -35,8 +35,10 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.synapse</groupId> <groupId>org.apache.synapse</groupId>
@ -70,7 +72,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>

7
components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml
View File

@ -33,7 +33,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
@ -132,8 +131,10 @@
<artifactId>feign-okhttp</artifactId> <artifactId>feign-okhttp</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.osgi</groupId> <groupId>org.eclipse.osgi</groupId>

1
components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml
View File

@ -69,7 +69,6 @@
<plugin> <plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId> <groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId> <artifactId>replacer</artifactId>
<version>1.5.2</version>
<executions> <executions>
<!-- Replace java code that is generated from swagger to fix swagger client generation issues. --> <!-- Replace java code that is generated from swagger to fix swagger client generation issues. -->
<execution> <execution>

38
components/apimgt-extensions/pom.xml
View File

@ -43,23 +43,23 @@
<module>io.entgra.device.mgt.core.apimgt.extension.rest.api</module> <module>io.entgra.device.mgt.core.apimgt.extension.rest.api</module>
</modules> </modules>
<build> <!-- <build>-->
<pluginManagement> <!-- <pluginManagement>-->
<plugins> <!-- <plugins>-->
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!--&lt;!&ndash; <version>1.7.2</version>&ndash;&gt;-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-scrdescriptor</id> <!-- <id>generate-scr-scrdescriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</pluginManagement> <!-- </pluginManagement>-->
</build> <!-- </build>-->
</project> </project>

7
components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml
View File

@ -39,7 +39,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
@ -85,8 +84,10 @@
<artifactId>org.eclipse.equinox.common</artifactId> <artifactId>org.eclipse.equinox.common</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-codec.wso2</groupId> <groupId>commons-codec.wso2</groupId>

11
components/application-mgt/io.entgra.device.mgt.core.application.mgt.api/pom.xml
View File

@ -54,7 +54,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>
@ -84,7 +83,6 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.5.0</version>
<executions> <executions>
<execution> <execution>
<phase>test</phase> <phase>test</phase>
@ -139,9 +137,10 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.json.wso2</groupId> <groupId>org.json.wso2</groupId>
@ -220,5 +219,9 @@
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.application.mgt.addons</artifactId> <artifactId>io.entgra.device.mgt.core.application.mgt.addons</artifactId>
</dependency> </dependency>
<dependency>
<groupId>commons-io.wso2</groupId>
<artifactId>commons-io</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

6
components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml
View File

@ -76,8 +76,10 @@
<artifactId>org.eclipse.equinox.common</artifactId> <artifactId>org.eclipse.equinox.common</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-codec.wso2</groupId> <groupId>commons-codec.wso2</groupId>

17
components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml
View File

@ -97,7 +97,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.18</version>
<configuration> <configuration>
<suiteXmlFiles> <suiteXmlFiles>
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile> <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
@ -134,8 +133,10 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -230,7 +231,6 @@
<dependency> <dependency>
<groupId>commons-validator</groupId> <groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId> <artifactId>commons-validator</artifactId>
<version>1.6</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>commons-collections</artifactId> <artifactId>commons-collections</artifactId>
@ -246,7 +246,6 @@
<dependency> <dependency>
<groupId>cglib</groupId> <groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId> <artifactId>cglib-nodep</artifactId>
<version>3.2.7</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -256,30 +255,26 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.34</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xerces.wso2</groupId> <groupId>xerces.wso2</groupId>
<artifactId>xercesImpl</artifactId> <artifactId>xercesImpl</artifactId>
<version>2.8.1.wso2v2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-dbcp.wso2</groupId> <groupId>commons-dbcp.wso2</groupId>
<artifactId>commons-dbcp</artifactId> <artifactId>commons-dbcp</artifactId>
<version>1.4.0.wso2v1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-pool.wso2</groupId> <groupId>commons-pool.wso2</groupId>
<artifactId>commons-pool</artifactId> <artifactId>commons-pool</artifactId>
<version>1.5.6.wso2v1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

11
components/application-mgt/io.entgra.device.mgt.core.application.mgt.publisher.api/pom.xml
View File

@ -54,7 +54,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>
@ -84,7 +83,6 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.5.0</version>
<executions> <executions>
<execution> <execution>
<phase>test</phase> <phase>test</phase>
@ -139,9 +137,10 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.json.wso2</groupId> <groupId>org.json.wso2</groupId>
@ -220,5 +219,9 @@
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.application.mgt.addons</artifactId> <artifactId>io.entgra.device.mgt.core.application.mgt.addons</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

7
components/application-mgt/io.entgra.device.mgt.core.application.mgt.store.api/pom.xml
View File

@ -54,7 +54,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>
@ -84,7 +83,6 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.5.0</version>
<executions> <executions>
<execution> <execution>
<phase>test</phase> <phase>test</phase>
@ -139,9 +137,10 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.json.wso2</groupId> <groupId>org.json.wso2</groupId>

34
components/application-mgt/pom.xml
View File

@ -50,22 +50,22 @@
<version>${maven.checkstyle.vesion}</version> <version>${maven.checkstyle.vesion}</version>
</plugin> </plugin>
</plugins> </plugins>
<pluginManagement> <!-- <pluginManagement>-->
<plugins> <!-- <plugins>-->
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!-- <version>1.7.2</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-scrdescriptor</id> <!-- <id>generate-scr-scrdescriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</pluginManagement> <!-- </pluginManagement>-->
</build> </build>
</project> </project>

20
components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/pom.xml
View File

@ -37,10 +37,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
@ -87,7 +84,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>
@ -117,7 +113,6 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<executions> <executions>
<execution> <execution>
<phase>test</phase> <phase>test</phase>
@ -160,9 +155,10 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>
@ -206,6 +202,14 @@
<artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId> <artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

26
components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml
View File

@ -37,10 +37,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
@ -87,7 +84,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>
@ -117,7 +113,6 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<executions> <executions>
<execution> <execution>
<phase>test</phase> <phase>test</phase>
@ -164,9 +159,10 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>
@ -207,6 +203,20 @@
<artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId> <artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

50
components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml
View File

@ -58,7 +58,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
@ -126,7 +125,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.18</version>
<configuration> <configuration>
<suiteXmlFiles> <suiteXmlFiles>
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile> <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
@ -142,16 +140,22 @@
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.maven.plugin.version}</version> <version>${jacoco.maven.plugin.version}</version>
<executions> <executions>
<!-- <execution>-->
<!-- <id>default-instrument</id>-->
<!-- <goals>-->
<!-- <goal>instrument</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>default-restore-instrumented-classes</id>-->
<!-- <goals>-->
<!-- <goal>restore-instrumented-classes</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<execution> <execution>
<id>default-instrument</id> <id>jacoco-initialize</id>
<goals> <goals>
<goal>instrument</goal> <goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>default-restore-instrumented-classes</id>
<goals>
<goal>restore-instrumented-classes</goal>
</goals> </goals>
</execution> </execution>
<execution> <execution>
@ -165,12 +169,12 @@
<outputDirectory>${basedir}/target/coverage-reports/site</outputDirectory> <outputDirectory>${basedir}/target/coverage-reports/site</outputDirectory>
</configuration> </configuration>
</execution> </execution>
<execution> <!-- <execution>-->
<id>default-report-integration</id> <!-- <id>default-report-integration</id>-->
<goals> <!-- <goals>-->
<goal>report-integration</goal> <!-- <goal>report-integration</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
@ -196,8 +200,8 @@
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -217,8 +221,10 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.orbit.org.bouncycastle</groupId> <groupId>org.wso2.orbit.org.bouncycastle</groupId>
@ -270,6 +276,10 @@
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

15
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
View File

@ -45,7 +45,6 @@ import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateManagement
import org.wso2.carbon.context.PrivilegedCarbonContext; 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.common.exceptions.DeviceManagementException;
import io.entgra.device.mgt.core.device.mgt.core.config.DeviceConfigurationManager; import io.entgra.device.mgt.core.device.mgt.core.config.DeviceConfigurationManager;
import sun.misc.BASE64Encoder;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -54,6 +53,7 @@ import java.security.PrivateKey;
import java.security.Security; import java.security.Security;
import java.security.cert.*; import java.security.cert.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Base64;
import java.util.List; 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") @Test(description = "This test case tests Signature verification of a Certificate against the keystore")
public void testVerifySignature() throws KeystoreException, CertificateEncodingException, CMSException, IOException { public void testVerifySignature() throws KeystoreException, CertificateEncodingException, CMSException, IOException {
BASE64Encoder encoder = new BASE64Encoder();
//generate and save a certificate in the keystore //generate and save a certificate in the keystore
X509Certificate x509Certificate = managementService.generateX509Certificate(); X509Certificate x509Certificate = managementService.generateX509Certificate();
//Generate CMSdata //Generate CMSdata
@ -191,7 +190,7 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC
generator.addCertificates(store); generator.addCertificates(store);
CMSSignedData degenerateSd = generator.generate(new CMSAbsentContent()); CMSSignedData degenerateSd = generator.generate(new CMSAbsentContent());
byte[] signature = degenerateSd.getEncoded(); byte[] signature = degenerateSd.getEncoded();
boolean verifySignature = managementService.verifySignature(encoder.encode(signature)); boolean verifySignature = managementService.verifySignature(Base64.getEncoder().encodeToString(signature));
Assert.assertNotNull(verifySignature); Assert.assertNotNull(verifySignature);
Assert.assertTrue(verifySignature); Assert.assertTrue(verifySignature);
log.info("VerifySignature Test Successful"); 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") @Test(description = "This test case tests generation of signed Certificate from a CSR")
public void testGetSignedCertificateFromCSR() throws KeystoreException { public void testGetSignedCertificateFromCSR() throws KeystoreException {
CSRGenerator csrGeneration = new CSRGenerator(); CSRGenerator csrGeneration = new CSRGenerator();
BASE64Encoder encoder = new BASE64Encoder();
// Generate key pair // Generate key pair
KeyPair keyPair = csrGeneration.generateKeyPair("RSA", 1024); KeyPair keyPair = csrGeneration.generateKeyPair("RSA", 1024);
byte[] csrData = csrGeneration.generateCSR("SHA256WithRSA", keyPair); 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.assertNotNull(signedCertificateFromCSR);
Assert.assertEquals(signedCertificateFromCSR.getType(), CertificateManagementConstants.X_509); Assert.assertEquals(signedCertificateFromCSR.getType(), CertificateManagementConstants.X_509);
log.info("GetSignedCertificateFromCSR Test Successful"); 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") @Test(description = "This test case tests converting a pem file to X509 Certificate")
public void testPemToX509Certificate() throws IOException, KeystoreException { public void testPemToX509Certificate() throws IOException, KeystoreException {
File caCert = new File(CA_CERT_PEM); File caCert = new File(CA_CERT_PEM);
BASE64Encoder encoder = new BASE64Encoder();
byte[] caBytes = FileUtils.readFileToByteArray(caCert); byte[] caBytes = FileUtils.readFileToByteArray(caCert);
X509Certificate certificate = managementService.pemToX509Certificate(encoder.encode(caBytes)); X509Certificate certificate = managementService.pemToX509Certificate(Base64.getEncoder().encodeToString(caBytes));
Assert.assertNotNull(certificate); Assert.assertNotNull(certificate);
Assert.assertEquals(certificate.getType(), CertificateManagementConstants.X_509); Assert.assertEquals(certificate.getType(), CertificateManagementConstants.X_509);
log.info("PemToX509Certificate Test Successful"); 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") @Test(description = "This test case tests extracting Certificate from the header Signature")
public void testExtractCertificateFromSignature() throws KeystoreException, CertificateEncodingException, CMSException, IOException, DeviceManagementException { public void testExtractCertificateFromSignature() throws KeystoreException, CertificateEncodingException, CMSException, IOException, DeviceManagementException {
BASE64Encoder encoder = new BASE64Encoder();
DeviceConfigurationManager.getInstance().initConfig(); DeviceConfigurationManager.getInstance().initConfig();
//generate and save a certificate in the keystore //generate and save a certificate in the keystore
X509Certificate x509Certificate = managementService.generateX509Certificate(); X509Certificate x509Certificate = managementService.generateX509Certificate();
@ -325,7 +322,7 @@ public class CertificateManagementServiceImplTests extends BaseDeviceManagementC
generator.addCertificates(store); generator.addCertificates(store);
CMSSignedData degenerateSd = generator.generate(new CMSAbsentContent()); CMSSignedData degenerateSd = generator.generate(new CMSAbsentContent());
byte[] signature = degenerateSd.getEncoded(); byte[] signature = degenerateSd.getEncoded();
X509Certificate certificate = managementService.extractCertificateFromSignature(encoder.encode(signature)); X509Certificate certificate = managementService.extractCertificateFromSignature(Base64.getEncoder().encodeToString(signature));
Assert.assertNotNull(certificate); Assert.assertNotNull(certificate);
Assert.assertEquals(certificate.getType(), CertificateManagementConstants.X_509); Assert.assertEquals(certificate.getType(), CertificateManagementConstants.X_509);
log.info("ExtractCertificateFromSignature Test Successful"); log.info("ExtractCertificateFromSignature Test Successful");

38
components/certificate-mgt/pom.xml
View File

@ -38,23 +38,23 @@
<module>io.entgra.device.mgt.core.certificate.mgt.cert.admin.api</module> <module>io.entgra.device.mgt.core.certificate.mgt.cert.admin.api</module>
</modules> </modules>
<build> <!-- <build>-->
<pluginManagement> <!-- <pluginManagement>-->
<plugins> <!-- <plugins>-->
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!-- <version>1.7.2</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-scrdescriptor</id> <!-- <id>generate-scr-scrdescriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</pluginManagement> <!-- </pluginManagement>-->
</build> <!-- </build>-->
</project> </project>

16
components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml
View File

@ -41,17 +41,12 @@
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
<version>2.3.2</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
@ -141,8 +136,10 @@
<artifactId>org.wso2.carbon.core</artifactId> <artifactId>org.wso2.carbon.core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -216,9 +213,8 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
<scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

5
components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml
View File

@ -64,9 +64,10 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
</dependencies> </dependencies>

6
components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml
View File

@ -101,8 +101,10 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>

25
components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/pom.xml
View File

@ -36,13 +36,11 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<configuration> <configuration>
<packagingExcludes>WEB-INF/lib/*cxf*.jar</packagingExcludes> <packagingExcludes>WEB-INF/lib/*cxf*.jar</packagingExcludes>
@ -99,7 +97,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>
@ -129,7 +126,6 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<executions> <executions>
<execution> <execution>
<phase>test</phase> <phase>test</phase>
@ -156,11 +152,17 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf.wso2</groupId>
<artifactId>cxf-bundle</artifactId> <artifactId>cxf-bundle</artifactId>
<version>3.0.0-milestone2</version> <!-- <version>${cxf-bundle.version}</version>-->
<scope>test</scope> <!-- <scope>test</scope>-->
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.cxf</groupId>-->
<!-- <artifactId>cxf-bundle</artifactId>-->
<!-- <version>3.0.0-milestone2</version>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-jaxrs</artifactId> <artifactId>cxf-bundle-jaxrs</artifactId>
@ -192,9 +194,10 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>

5
components/device-mgt/io.entgra.device.mgt.core.device.mgt.common/pom.xml
View File

@ -99,6 +99,11 @@
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

7
components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/pom.xml
View File

@ -37,10 +37,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
@ -99,7 +96,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>
@ -129,7 +125,6 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<executions> <executions>
<execution> <execution>
<phase>test</phase> <phase>test</phase>

9
components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml
View File

@ -165,8 +165,9 @@
<artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -187,8 +188,8 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

8
components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml
View File

@ -87,8 +87,8 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -136,6 +136,10 @@
<artifactId>org.apache.sling.testing.osgi-mock</artifactId> <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>

13
components/device-mgt/io.entgra.device.mgt.core.device.mgt.url.printer/pom.xml
View File

@ -41,17 +41,12 @@
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
<version>2.3.2</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
@ -118,8 +113,10 @@
<artifactId>org.wso2.carbon.core</artifactId> <artifactId>org.wso2.carbon.core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>

7
components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml
View File

@ -59,8 +59,10 @@
<artifactId>org.wso2.carbon.core</artifactId> <artifactId>org.wso2.carbon.core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -93,7 +95,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>

80
components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml
View File

@ -73,44 +73,44 @@
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <!-- <plugin>-->
<groupId>org.apache.maven.plugins</groupId> <!-- <groupId>org.apache.maven.plugins</groupId>-->
<artifactId>maven-surefire-plugin</artifactId> <!-- <artifactId>maven-surefire-plugin</artifactId>-->
<configuration> <!-- <configuration>-->
<systemPropertyVariables> <!-- <systemPropertyVariables>-->
<log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration> <!-- <log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>-->
</systemPropertyVariables> <!-- </systemPropertyVariables>-->
<suiteXmlFiles> <!-- <suiteXmlFiles>-->
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile> <!-- <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>-->
</suiteXmlFiles> <!-- </suiteXmlFiles>-->
</configuration> <!-- </configuration>-->
</plugin> <!-- </plugin>-->
<plugin> <!-- <plugin>-->
<groupId>org.jacoco</groupId> <!-- <groupId>org.jacoco</groupId>-->
<artifactId>jacoco-maven-plugin</artifactId> <!-- <artifactId>jacoco-maven-plugin</artifactId>-->
<configuration> <!-- <configuration>-->
<destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile> <!-- <destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>-->
</configuration> <!-- </configuration>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>jacoco-initialize</id> <!-- <id>jacoco-initialize</id>-->
<goals> <!-- <goals>-->
<goal>prepare-agent</goal> <!-- <goal>prepare-agent</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
<execution> <!-- <execution>-->
<id>jacoco-site</id> <!-- <id>jacoco-site</id>-->
<phase>test</phase> <!-- <phase>test</phase>-->
<goals> <!-- <goals>-->
<goal>report</goal> <!-- <goal>report</goal>-->
</goals> <!-- </goals>-->
<configuration> <!-- <configuration>-->
<dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile> <!-- <dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>-->
<outputDirectory>${basedir}/target/coverage-reports/site</outputDirectory> <!-- <outputDirectory>${basedir}/target/coverage-reports/site</outputDirectory>-->
</configuration> <!-- </configuration>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> </plugins>
</build> </build>
@ -124,8 +124,8 @@
<artifactId>org.eclipse.osgi.services</artifactId> <artifactId>org.eclipse.osgi.services</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>

1
components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/pom.xml
View File

@ -68,7 +68,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>

1
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
View File

@ -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.IdentityOAuth2Exception;
import org.wso2.carbon.identity.oauth2.dao.TokenManagementDAO; import org.wso2.carbon.identity.oauth2.dao.TokenManagementDAO;
import org.wso2.carbon.identity.oauth2.dao.TokenManagementDAOImpl; 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.AccessTokenDO;
import org.wso2.carbon.identity.oauth2.model.ResourceScopeCacheEntry; import org.wso2.carbon.identity.oauth2.model.ResourceScopeCacheEntry;
import org.wso2.carbon.identity.oauth2.validators.OAuth2ScopeValidator; import org.wso2.carbon.identity.oauth2.validators.OAuth2ScopeValidator;

15
components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml
View File

@ -121,8 +121,10 @@
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
@ -146,8 +148,8 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -160,6 +162,10 @@
<artifactId>powermock-api-mockito</artifactId> <artifactId>powermock-api-mockito</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -171,7 +177,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>

7
components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
View File

@ -47,8 +47,10 @@
<artifactId>org.wso2.carbon.core</artifactId> <artifactId>org.wso2.carbon.core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.identity.framework</groupId> <groupId>org.wso2.carbon.identity.framework</groupId>
@ -85,7 +87,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>

6
components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml
View File

@ -33,8 +33,10 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>

11
components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml
View File

@ -238,8 +238,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -253,9 +253,10 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -352,7 +353,7 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

15
components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/pom.xml
View File

@ -23,7 +23,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
@ -86,8 +85,9 @@
<artifactId>org.eclipse.equinox.common</artifactId> <artifactId>org.eclipse.equinox.common</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>
@ -97,5 +97,14 @@
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.policy.mgt.core</artifactId> <artifactId>io.entgra.device.mgt.core.policy.mgt.core</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.core</artifactId>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

10
components/policy-mgt/io.entgra.device.mgt.core.policy.information.point/pom.xml
View File

@ -25,7 +25,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
@ -79,13 +78,18 @@
<artifactId>org.eclipse.equinox.common</artifactId> <artifactId>org.eclipse.equinox.common</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.policy.mgt.common</artifactId> <artifactId>io.entgra.device.mgt.core.policy.mgt.common</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

7
components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/pom.xml
View File

@ -42,7 +42,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
@ -102,8 +101,10 @@
<artifactId>org.eclipse.equinox.common</artifactId> <artifactId>org.eclipse.equinox.common</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>

28
components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml
View File

@ -42,7 +42,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
@ -83,7 +82,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.18</version>
<configuration> <configuration>
<systemPropertyVariables> <systemPropertyVariables>
<log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration> <log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>
@ -132,8 +130,10 @@
<artifactId>org.eclipse.equinox.common</artifactId> <artifactId>org.eclipse.equinox.common</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -181,6 +181,15 @@
<artifactId>io.entgra.device.mgt.core.policy.mgt.common</artifactId> <artifactId>io.entgra.device.mgt.core.policy.mgt.common</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.core</artifactId>
</dependency>
<!--Test Case --> <!--Test Case -->
<dependency> <dependency>
@ -196,12 +205,11 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.34</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- <dependency>--> <!-- <dependency>-->
@ -214,14 +222,12 @@
<dependency> <dependency>
<groupId>commons-dbcp.wso2</groupId> <groupId>commons-dbcp.wso2</groupId>
<artifactId>commons-dbcp</artifactId> <artifactId>commons-dbcp</artifactId>
<version>1.4.0.wso2v1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-pool.wso2</groupId> <groupId>commons-pool.wso2</groupId>
<artifactId>commons-pool</artifactId> <artifactId>commons-pool</artifactId>
<version>1.5.6.wso2v1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -246,6 +252,10 @@
<artifactId>io.entgra.device.mgt.core.server.bootup.heartbeat.beacon</artifactId> <artifactId>io.entgra.device.mgt.core.server.bootup.heartbeat.beacon</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

7
components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
View File

@ -43,7 +43,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
@ -97,8 +96,10 @@
<artifactId>org.eclipse.equinox.common</artifactId> <artifactId>org.eclipse.equinox.common</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>

38
components/policy-mgt/pom.xml
View File

@ -41,24 +41,24 @@
<!--<module>org.wso2.carbon.complex.policy.decision.point</module>--> <!--<module>org.wso2.carbon.complex.policy.decision.point</module>-->
</modules> </modules>
<build> <!-- <build>-->
<pluginManagement> <!-- <pluginManagement>-->
<plugins> <!-- <plugins>-->
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!-- <version>1.7.2</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-scrdescriptor</id> <!-- <id>generate-scr-scrdescriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</pluginManagement> <!-- </pluginManagement>-->
</build> <!-- </build>-->
</project> </project>

21
components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml
View File

@ -243,9 +243,10 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -340,19 +341,19 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>${guava.version}</version> <!-- <version>${guava.version}</version>-->
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json.wso2</groupId>
<artifactId>json</artifactId> <artifactId>json</artifactId>
<version>${json.version}</version> <!-- <version>${json.version}</version>-->
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>org.wso2.orbit.com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>${fasterxml.jackson.version}</version> <!-- <version>${fasterxml.jackson.version}</version>-->
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -371,8 +372,8 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -406,7 +407,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

9
components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml
View File

@ -103,9 +103,10 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -134,6 +135,10 @@
<artifactId>org.wso2.carbon.ntask.core</artifactId> <artifactId>org.wso2.carbon.ntask.core</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

5
components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml
View File

@ -84,9 +84,10 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>

86
components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml
View File

@ -80,44 +80,44 @@
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <!-- <plugin>-->
<groupId>org.apache.maven.plugins</groupId> <!-- <groupId>org.apache.maven.plugins</groupId>-->
<artifactId>maven-surefire-plugin</artifactId> <!-- <artifactId>maven-surefire-plugin</artifactId>-->
<configuration> <!-- <configuration>-->
<systemPropertyVariables> <!-- <systemPropertyVariables>-->
<log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration> <!-- <log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>-->
</systemPropertyVariables> <!-- </systemPropertyVariables>-->
<suiteXmlFiles> <!-- <suiteXmlFiles>-->
<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile> <!-- <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>-->
</suiteXmlFiles> <!-- </suiteXmlFiles>-->
</configuration> <!-- </configuration>-->
</plugin> <!-- </plugin>-->
<plugin> <!-- <plugin>-->
<groupId>org.jacoco</groupId> <!-- <groupId>org.jacoco</groupId>-->
<artifactId>jacoco-maven-plugin</artifactId> <!-- <artifactId>jacoco-maven-plugin</artifactId>-->
<configuration> <!-- <configuration>-->
<destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile> <!-- <destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>-->
</configuration> <!-- </configuration>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>jacoco-initialize</id> <!-- <id>jacoco-initialize</id>-->
<goals> <!-- <goals>-->
<goal>prepare-agent</goal> <!-- <goal>prepare-agent</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
<execution> <!-- <execution>-->
<id>jacoco-site</id> <!-- <id>jacoco-site</id>-->
<phase>test</phase> <!-- <phase>test</phase>-->
<goals> <!-- <goals>-->
<goal>report</goal> <!-- <goal>report</goal>-->
</goals> <!-- </goals>-->
<configuration> <!-- <configuration>-->
<dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile> <!-- <dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>-->
<outputDirectory>${basedir}/target/coverage-reports/site</outputDirectory> <!-- <outputDirectory>${basedir}/target/coverage-reports/site</outputDirectory>-->
</configuration> <!-- </configuration>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> </plugins>
</build> </build>
@ -131,8 +131,10 @@
<artifactId>org.eclipse.osgi.services</artifactId> <artifactId>org.eclipse.osgi.services</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -174,6 +176,10 @@
<groupId>commons-collections.wso2</groupId> <groupId>commons-collections.wso2</groupId>
<artifactId>commons-collections</artifactId> <artifactId>commons-collections</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

11
components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/pom.xml
View File

@ -37,10 +37,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
@ -61,7 +58,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>
@ -134,9 +130,10 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>

4
components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/pom.xml
View File

@ -90,6 +90,10 @@
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</dependencies> </dependencies>

5
components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/pom.xml
View File

@ -99,9 +99,10 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>

26
components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml
View File

@ -81,7 +81,6 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<executions> <executions>
<execution> <execution>
<phase>test</phase> <phase>test</phase>
@ -319,5 +318,30 @@
<artifactId>httpmime</artifactId> <artifactId>httpmime</artifactId>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>commons-fileupload.wso2</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId>
</dependency>
<dependency>
<groupId>xerces.wso2</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>org.json.wso2</groupId>
<artifactId>json</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

2
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
View File

@ -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.beans.ProxyResponse;
import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants; import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerConstants;
import io.entgra.device.mgt.core.ui.request.interceptor.util.HandlerUtil; 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.apache.http.HttpStatus;
import org.json.JSONObject; import org.json.JSONObject;

9
components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml
View File

@ -254,8 +254,8 @@
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -281,13 +281,16 @@
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>javax.cache.wso2</artifactId> <artifactId>javax.cache.wso2</artifactId>
<version>4.6.3-m5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId> <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId> <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.base</artifactId>
</dependency>
</dependencies> </dependencies>
<!-- TODO --> <!-- TODO -->
<properties> <properties>

38
components/webapp-authenticator-framework/pom.xml
View File

@ -37,23 +37,23 @@
<module>io.entgra.device.mgt.core.webapp.authenticator.framework</module> <module>io.entgra.device.mgt.core.webapp.authenticator.framework</module>
</modules> </modules>
<build> <!-- <build>-->
<pluginManagement> <!-- <pluginManagement>-->
<plugins> <!-- <plugins>-->
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!-- <version>1.7.2</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-scrdescriptor</id> <!-- <id>generate-scr-scrdescriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</pluginManagement> <!-- </pluginManagement>-->
</build> <!-- </build>-->
</project> </project>

5
features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml
View File

@ -60,8 +60,8 @@
<version>${cxf.version}</version> <version>${cxf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
@ -69,7 +69,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension.feature/pom.xml
View File

@ -41,7 +41,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/pom.xml
View File

@ -45,7 +45,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/pom.xml
View File

@ -44,7 +44,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml
View File

@ -61,7 +61,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml
View File

@ -45,7 +45,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml
View File

@ -47,7 +47,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

5
features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml
View File

@ -60,8 +60,8 @@
<version>${cxf.version}</version> <version>${cxf.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
@ -69,7 +69,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml
View File

@ -73,7 +73,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml
View File

@ -47,7 +47,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml
View File

@ -44,7 +44,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml
View File

@ -47,7 +47,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
View File

@ -44,7 +44,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml
View File

@ -44,7 +44,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
View File

@ -44,7 +44,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
View File

@ -44,7 +44,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml
View File

@ -47,7 +47,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml
View File

@ -49,7 +49,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml
View File

@ -31,7 +31,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml
View File

@ -62,7 +62,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml
View File

@ -80,7 +80,6 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

5
features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml
View File

@ -37,8 +37,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>
@ -80,7 +80,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml
View File

@ -51,7 +51,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

7
features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml
View File

@ -38,8 +38,10 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
<!-- <version>${pax.logging.api.version}</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
@ -59,7 +61,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml
View File

@ -48,7 +48,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/pom.xml
View File

@ -62,7 +62,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml
View File

@ -46,7 +46,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml
View File

@ -46,7 +46,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml
View File

@ -45,7 +45,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml
View File

@ -50,7 +50,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml
View File

@ -49,7 +49,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

1
features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/pom.xml
View File

@ -45,7 +45,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

420
pom.xml
View File

@ -30,7 +30,7 @@
<parent> <parent>
<groupId>org.wso2</groupId> <groupId>org.wso2</groupId>
<artifactId>wso2</artifactId> <artifactId>wso2</artifactId>
<version>1</version> <version>1.3</version>
</parent> </parent>
<modules> <modules>
@ -625,11 +625,11 @@
<artifactId>org.eclipse.osgi.services</artifactId> <artifactId>org.eclipse.osgi.services</artifactId>
<version>${eclipse.equinox.services.version}</version> <version>${eclipse.equinox.services.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.osgi.ut</groupId> <!-- <groupId>org.osgi.ut</groupId>-->
<artifactId>org.eclipse.osgi</artifactId> <!-- <artifactId>org.eclipse.osgi</artifactId>-->
<version>${eclipse.equinox.services.version}</version> <!-- <version>${eclipse.equinox.services.version}</version>-->
</dependency> <!-- </dependency>-->
<!-- End of OSGi dependencies --> <!-- End of OSGi dependencies -->
<dependency> <dependency>
@ -830,11 +830,6 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${org.wso2.carbon.logging.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core.services</artifactId> <artifactId>org.wso2.carbon.core.services</artifactId>
@ -843,11 +838,11 @@
<!-- End of Carbon Kernel dependencies --> <!-- End of Carbon Kernel dependencies -->
<!-- Orbit dependencies --> <!-- Orbit dependencies -->
<dependency> <!-- <dependency>-->
<groupId>com.h2database.wso2</groupId> <!-- <groupId>com.h2database.wso2</groupId>-->
<artifactId>h2-database-engine</artifactId> <!-- <artifactId>h2-database-engine</artifactId>-->
<version>${orbit.version.h2.engine}</version> <!-- <version>${orbit.version.h2.engine}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.wso2.orbit.com.h2database</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
@ -881,10 +876,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>org.wso2.orbit.javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
<version>${jaxb.api.version}</version> <version>${version.org.wso2.orbit.javax.xml.bind}</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -1186,41 +1180,41 @@
<artifactId>cxf-rt-transports-http</artifactId> <artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version> <version>${cxf.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.apache.cxf</groupId> <!-- <groupId>org.apache.cxf</groupId>-->
<artifactId>cxf-rt-bindings-soap</artifactId> <!-- <artifactId>cxf-rt-bindings-soap</artifactId>-->
<version>${cxf.version}</version> <!-- <version>${cxf.version}</version>-->
<exclusions> <!-- <exclusions>-->
<exclusion> <!-- <exclusion>-->
<groupId>org.apache.cxf</groupId> <!-- <groupId>org.apache.cxf</groupId>-->
<artifactId>cxf-rt-databinding-jaxb</artifactId> <!-- <artifactId>cxf-rt-databinding-jaxb</artifactId>-->
</exclusion> <!-- </exclusion>-->
</exclusions> <!-- </exclusions>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.apache.cxf</groupId> <!-- <groupId>org.apache.cxf</groupId>-->
<artifactId>cxf-rt-rs-extension-providers</artifactId> <!-- <artifactId>cxf-rt-rs-extension-providers</artifactId>-->
<version>${cxf.version}</version> <!-- <version>${cxf.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.apache.cxf</groupId> <!-- <groupId>org.apache.cxf</groupId>-->
<artifactId>cxf-rt-ws-security</artifactId> <!-- <artifactId>cxf-rt-ws-security</artifactId>-->
<version>${cxf.version}</version> <!-- <version>${cxf.version}</version>-->
<exclusions> <!-- <exclusions>-->
<exclusion> <!-- <exclusion>-->
<groupId>net.sf.ehcache</groupId> <!-- <groupId>net.sf.ehcache</groupId>-->
<artifactId>ehcache-core</artifactId> <!-- <artifactId>ehcache-core</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>org.apache.ws.security</groupId> <!-- <groupId>org.apache.ws.security</groupId>-->
<artifactId>wss4j</artifactId> <!-- <artifactId>wss4j</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>commons-logging</groupId> <!-- <groupId>commons-logging</groupId>-->
<artifactId>commons-logging</artifactId> <!-- <artifactId>commons-logging</artifactId>-->
</exclusion> <!-- </exclusion>-->
</exclusions> <!-- </exclusions>-->
</dependency> <!-- </dependency>-->
<!-- End of CXF dependencies --> <!-- End of CXF dependencies -->
<dependency> <dependency>
@ -1290,11 +1284,11 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId> <!-- <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>-->
<artifactId>org.wso2.carbon.identity.sso.saml</artifactId> <!-- <artifactId>org.wso2.carbon.identity.sso.saml</artifactId>-->
<version>${identity.inbound.auth.saml.version}</version> <!-- <version>${identity.inbound.auth.saml.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>com.googlecode.json-simple.wso2</groupId> <groupId>com.googlecode.json-simple.wso2</groupId>
<artifactId>json-simple</artifactId> <artifactId>json-simple</artifactId>
@ -1365,6 +1359,11 @@
<artifactId>httpmime</artifactId> <artifactId>httpmime</artifactId>
<version>${apache.http.mime.version}</version> <version>${apache.http.mime.version}</version>
</dependency> </dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
</dependency>
<dependency> <dependency>
<groupId>commons-lang.wso2</groupId> <groupId>commons-lang.wso2</groupId>
<artifactId>commons-lang</artifactId> <artifactId>commons-lang</artifactId>
@ -1390,11 +1389,11 @@
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
<version>${squareup.okhttp3.version}</version> <version>${squareup.okhttp3.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.squareup.okio</groupId> <!-- <groupId>com.squareup.okio</groupId>-->
<artifactId>okio</artifactId> <!-- <artifactId>okio</artifactId>-->
<version>${okio.version}</version> <!-- <version>${okio.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>io.github.openfeign</groupId> <groupId>io.github.openfeign</groupId>
<artifactId>feign-okhttp</artifactId> <artifactId>feign-okhttp</artifactId>
@ -1432,6 +1431,11 @@
<artifactId>commons-httpclient</artifactId> <artifactId>commons-httpclient</artifactId>
<version>${commons.httpclient.version}</version> <version>${commons.httpclient.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.7</version>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.orbit.org.apache.velocity</groupId> <groupId>org.wso2.orbit.org.apache.velocity</groupId>
<artifactId>velocity</artifactId> <artifactId>velocity</artifactId>
@ -1447,12 +1451,12 @@
<artifactId>commons-collections</artifactId> <artifactId>commons-collections</artifactId>
<version>${commons-collections.version}</version> <version>${commons-collections.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>javax</groupId> <!-- <groupId>javax</groupId>-->
<artifactId>javaee-web-api</artifactId> <!-- <artifactId>javaee-web-api</artifactId>-->
<version>6.0</version> <!-- <version>6.0</version>-->
<scope>provided</scope> <!-- <scope>provided</scope>-->
</dependency> <!-- </dependency>-->
<!--Mysql Connector version--> <!--Mysql Connector version-->
<dependency> <dependency>
@ -1463,11 +1467,11 @@
</dependency> </dependency>
<!-- Carbon Analytics Commons --> <!-- Carbon Analytics Commons -->
<dependency> <!-- <dependency>-->
<groupId>org.wso2.carbon.analytics-common</groupId> <!-- <groupId>org.wso2.carbon.analytics-common</groupId>-->
<artifactId>org.wso2.carbon.databridge.core</artifactId> <!-- <artifactId>org.wso2.carbon.databridge.core</artifactId>-->
<version>${carbon.analytics.common.version}</version> <!-- <version>${carbon.analytics.common.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.wso2.carbon.analytics-common</groupId> <groupId>org.wso2.carbon.analytics-common</groupId>
<artifactId>org.wso2.carbon.event.stream.core</artifactId> <artifactId>org.wso2.carbon.event.stream.core</artifactId>
@ -1562,6 +1566,11 @@
<artifactId>httpcore</artifactId> <artifactId>httpcore</artifactId>
<version>${httpcore.version}</version> <version>${httpcore.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.httpcomponents.wso2</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.wso2.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.orbit.org.apache.httpcomponents</groupId> <groupId>org.wso2.orbit.org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
@ -1586,15 +1595,15 @@
<version>${eclipse.paho.version}</version> <version>${eclipse.paho.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>commons-configuration</groupId> <!-- <groupId>commons-configuration</groupId>-->
<artifactId>commons-configuration</artifactId> <!-- <artifactId>commons-configuration</artifactId>-->
<version>${commons-configuration.version}</version> <!-- <version>${commons-configuration.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>${swagger.annotations.version}</version> <version>${swagger.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
@ -1616,16 +1625,16 @@
<artifactId>org.wso2.carbon.event.output.adapter.core</artifactId> <artifactId>org.wso2.carbon.event.output.adapter.core</artifactId>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.wso2.carbon.analytics</groupId> <!-- <groupId>org.wso2.carbon.analytics</groupId>-->
<artifactId>org.wso2.carbon.analytics.datasource.commons</artifactId> <!-- <artifactId>org.wso2.carbon.analytics.datasource.commons</artifactId>-->
<version>${carbon.analytics.version}</version> <!-- <version>${carbon.analytics.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.wso2.carbon.analytics</groupId> <!-- <groupId>org.wso2.carbon.analytics</groupId>-->
<artifactId>org.wso2.carbon.analytics.dataservice.commons</artifactId> <!-- <artifactId>org.wso2.carbon.analytics.dataservice.commons</artifactId>-->
<version>${carbon.analytics.version}</version> <!-- <version>${carbon.analytics.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.wso2.carbon.analytics-common</groupId> <groupId>org.wso2.carbon.analytics-common</groupId>
<artifactId>org.wso2.carbon.event.publisher.stub</artifactId> <artifactId>org.wso2.carbon.event.publisher.stub</artifactId>
@ -1887,6 +1896,32 @@
<artifactId>mockito-inline</artifactId> <artifactId>mockito-inline</artifactId>
<version>${mokito.version}</version> <version>${mokito.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
<version>${pax.logging.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.wso2</groupId>
<artifactId>cxf-bundle</artifactId>
<version>${cxf-bundle.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-fileupload.wso2</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons-fileupload.version}</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>3.2.7</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>javax.cache.wso2</artifactId>
<version>4.6.3-m5</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -1922,17 +1957,17 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version> <version>3.8.1</version>
<configuration> <configuration>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<source>1.8</source> <source>17</source>
<target>1.8</target> <target>17</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.2</version> <version>3.3.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -1952,30 +1987,30 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version> <version>3.8.1</version>
<configuration> <configuration>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<source>1.8</source> <source>17</source>
<target>1.8</target> <target>17</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!-- <version>1.7.2</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-scrdescriptor</id> <!-- <id>generate-scr-scrdescriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>4.1.0</version> <version>5.1.1</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<obrRepository>NONE</obrRepository> <obrRepository>NONE</obrRepository>
@ -2016,7 +2051,13 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.18</version> <version>2.22.0</version>
<configuration>
<systemPropertyVariables>
<jacoco-agent.destfile>${basedir}/target/coverage-reports/jacoco-ut.exec
</jacoco-agent.destfile>
</systemPropertyVariables>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -2033,6 +2074,26 @@
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.maven.plugin.version}</version> <version>${jacoco.maven.plugin.version}</version>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.2</version>
</plugin>
<plugin>
<groupId>io.swagger</groupId>
<artifactId>swagger-codegen-maven-plugin</artifactId>
<version>2.2.1</version>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
@ -2040,76 +2101,76 @@
<properties> <properties>
<servelet.jsp.version>2.2.1</servelet.jsp.version> <servelet.jsp.version>2.2.1</servelet.jsp.version>
<testng.version>7.4.0</testng.version> <testng.version>7.4.0</testng.version>
<carbon.kernel.version>4.6.2</carbon.kernel.version> <carbon.kernel.version>4.8.1</carbon.kernel.version>
<carbon.kernel.version.range>[4.5.0, 5.0.0)</carbon.kernel.version.range> <carbon.kernel.version.range>[4.5.0, 5.0.0)</carbon.kernel.version.range>
<carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version> <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
<maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version> <!-- <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>-->
<carbon.feature.plugin.version>3.1.3</carbon.feature.plugin.version> <!-- <carbon.feature.plugin.version>3.1.3</carbon.feature.plugin.version>-->
<org.wso2.carbon.logging.version>4.4.9</org.wso2.carbon.logging.version> <!-- <org.wso2.carbon.logging.version>4.4.9</org.wso2.carbon.logging.version>-->
<!-- Axis2 --> <!-- Axis2 -->
<axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range> <axis2.osgi.version.range>[1.6.1, 1.7.0)</axis2.osgi.version.range>
<axis2.orbit.version>1.6.1.wso2v11</axis2.orbit.version> <axis2.orbit.version>1.6.1-wso2v85</axis2.orbit.version>
<axis2-transports.version>1.1.0-wso2v10</axis2-transports.version> <axis2-transports.version>1.1.0-wso2v10</axis2-transports.version>
<jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version> <!-- <jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version>-->
<!-- Jaggery --> <!-- Jaggery -->
<jaggery.version>0.12.8</jaggery.version> <!-- <jaggery.version>0.12.8</jaggery.version>-->
<jaggery.extensions.version>1.5.6</jaggery.extensions.version> <!-- <jaggery.extensions.version>1.5.6</jaggery.extensions.version>-->
<jaggery.extensions.sso.version>1.5.6</jaggery.extensions.sso.version> <!-- <jaggery.extensions.sso.version>1.5.6</jaggery.extensions.sso.version>-->
<jaggery.extensions.carbon.version>1.5.6</jaggery.extensions.carbon.version> <!-- <jaggery.extensions.carbon.version>1.5.6</jaggery.extensions.carbon.version>-->
<jaggery.extensions.test.version>1.5.6</jaggery.extensions.test.version> <!-- <jaggery.extensions.test.version>1.5.6</jaggery.extensions.test.version>-->
<!-- Testing --> <!-- Testing -->
<automation.test.framework.version>4.3.1</automation.test.framework.version> <!-- <automation.test.framework.version>4.3.1</automation.test.framework.version>-->
<automation.utils.version>4.4.2</automation.utils.version> <!-- <automation.utils.version>4.4.2</automation.utils.version>-->
<test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version> <!-- <test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>-->
<junit.version>4.8.2</junit.version> <junit.version>4.13.1</junit.version>
<!--Eclipse OSGi--> <!--Eclipse OSGi-->
<eclipse.equinox.common.version>3.6.200.v20130402-1505</eclipse.equinox.common.version> <eclipse.equinox.common.version>3.6.200.v20130402-1505</eclipse.equinox.common.version>
<eclipse.equinox.services.version>3.3.100.v20120522-1822</eclipse.equinox.services.version> <eclipse.equinox.services.version>3.3.100.v20120522-1822</eclipse.equinox.services.version>
<eclipse.osgi.version>3.9.1.v20140110-1610</eclipse.osgi.version> <eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
<orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine> <!-- <orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine>-->
<!-- Tomcat --> <!-- Tomcat -->
<orbit.version.tomcat>7.0.85.wso2v1</orbit.version.tomcat> <orbit.version.tomcat>7.0.93.wso2v1</orbit.version.tomcat>
<orbit.version.tomcat.servlet.api>7.0.85.wso2v1</orbit.version.tomcat.servlet.api> <orbit.version.tomcat.servlet.api>7.0.93.wso2v1</orbit.version.tomcat.servlet.api>
<tomcat.jdbc.pooling.version>7.0.34.wso2v2</tomcat.jdbc.pooling.version> <tomcat.jdbc.pooling.version>7.0.34.wso2v2</tomcat.jdbc.pooling.version>
<!-- Carbon Deployment --> <!-- Carbon Deployment -->
<carbon.deployment.version>4.7.15</carbon.deployment.version> <!-- <carbon.deployment.version>4.11.7</carbon.deployment.version>-->
<!-- Carbon Identity --> <!-- Carbon Identity -->
<carbon.identity.framework.version>5.18.187</carbon.identity.framework.version> <carbon.identity.framework.version>5.24.8</carbon.identity.framework.version>
<carbon.identity.framework.version.range>[5.2.0, 7.0.0)</carbon.identity.framework.version.range> <carbon.identity.framework.version.range>[5.14.0, 6.0.0)</carbon.identity.framework.version.range>
<identity.inbound.auth.oauth.version>6.4.111</identity.inbound.auth.oauth.version> <identity.inbound.auth.oauth.version>6.9.6</identity.inbound.auth.oauth.version>
<identity.inbound.auth.saml.version>5.5.2</identity.inbound.auth.saml.version> <!-- <identity.inbound.auth.saml.version>5.5.2</identity.inbound.auth.saml.version>-->
<carbon.identity.jwt.grant.version>1.0.31</carbon.identity.jwt.grant.version> <carbon.identity.jwt.grant.version>2.1.1</carbon.identity.jwt.grant.version>
<carbon.identity.jwt.grant.version.range>[1.0.31, 2.0.0)</carbon.identity.jwt.grant.version.range> <carbon.identity.jwt.grant.version.range>[2.1.1, 3.0.0)</carbon.identity.jwt.grant.version.range>
<!-- Carbon Identity import version ranges --> <!-- Carbon Identity import version ranges -->
<carbon.identity.imp.pkg.version>[5.14.0, 6.0.0)</carbon.identity.imp.pkg.version> <carbon.identity.imp.pkg.version>[5.14.0, 6.0.0)</carbon.identity.imp.pkg.version>
<carbon.identity-inbound-auth-oauth.imp.pkg.version>[6.0.0, 7.0.0)</carbon.identity-inbound-auth-oauth.imp.pkg.version> <carbon.identity-inbound-auth-oauth.imp.pkg.version>[6.0.0, 7.0.0)</carbon.identity-inbound-auth-oauth.imp.pkg.version>
<carbon.identity-user-ws.imp.pkg.version>[5.3.0, 6.0.0)</carbon.identity-user-ws.imp.pkg.version> <!-- <carbon.identity-user-ws.imp.pkg.version>[5.3.0, 6.0.0)</carbon.identity-user-ws.imp.pkg.version>-->
<!-- Carbon Multi-tenancy --> <!-- Carbon Multi-tenancy -->
<carbon.multitenancy.version>4.9.10</carbon.multitenancy.version> <carbon.multitenancy.version>4.9.20</carbon.multitenancy.version>
<!-- Carbon Governance --> <!-- Carbon Governance -->
<carbon.governance.version>4.8.21</carbon.governance.version> <carbon.governance.version>4.8.30</carbon.governance.version>
<!-- Axiom --> <!-- Axiom -->
<axiom.version>1.2.11-wso2v10</axiom.version> <axiom.version>1.2.11-wso2v25</axiom.version>
<axiom.osgi.version.range>[1.2.11, 1.3.0)</axiom.osgi.version.range> <axiom.osgi.version.range>[1.2.11, 1.3.0)</axiom.osgi.version.range>
<axiom.wso2.version>1.2.11.wso2v10</axiom.wso2.version> <axiom.wso2.version>1.2.11-wso2v25</axiom.wso2.version>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<io.entgra.device.mgt.core.version>5.0.26-SNAPSHOT</io.entgra.device.mgt.core.version> <io.entgra.device.mgt.core.version>5.0.26-SNAPSHOT</io.entgra.device.mgt.core.version>
<!-- Carbon Commons --> <!-- Carbon Commons -->
<carbon.commons.version>4.7.35</carbon.commons.version> <carbon.commons.version>4.9.2</carbon.commons.version>
<version.commons.codec>1.4.0.wso2v1</version.commons.codec> <version.commons.codec>1.4.0.wso2v1</version.commons.codec>
<commons-codec.wso2.osgi.version.range>[1.4.0,2.0.0)</commons-codec.wso2.osgi.version.range> <commons-codec.wso2.osgi.version.range>[1.4.0,2.0.0)</commons-codec.wso2.osgi.version.range>
<version.commons.io>2.4.0.wso2v1</version.commons.io> <version.commons.io>2.4.0.wso2v1</version.commons.io>
@ -2117,31 +2178,31 @@
<commons-lang.wso2.osgi.version.range>[2.6.0,3.0.0)</commons-lang.wso2.osgi.version.range> <commons-lang.wso2.osgi.version.range>[2.6.0,3.0.0)</commons-lang.wso2.osgi.version.range>
<!-- Carbon API Management --> <!-- Carbon API Management -->
<carbon.api.mgt.version>9.0.174</carbon.api.mgt.version> <carbon.api.mgt.version>9.28.116</carbon.api.mgt.version>
<carbon.api.mgt.version.range>[9.0.0, 10.0.0)</carbon.api.mgt.version.range> <carbon.api.mgt.version.range>[9.0.0, 10.0.0)</carbon.api.mgt.version.range>
<!-- Carbon Analytics --> <!-- Carbon Analytics -->
<carbon.analytics.common.version>5.2.34</carbon.analytics.common.version> <carbon.analytics.common.version>5.3.5</carbon.analytics.common.version>
<carbon.analytics.common.version.range>[5.2.34,6.0.0)</carbon.analytics.common.version.range> <carbon.analytics.common.version.range>[5.3.0,6.0.0)</carbon.analytics.common.version.range>
<carbon.analytics.version>1.3.25</carbon.analytics.version> <carbon.analytics.version>1.3.25</carbon.analytics.version>
<carbon.analytics.version.range>[1.3.0,2.0.0)</carbon.analytics.version.range> <!-- <carbon.analytics.version.range>[1.3.0,2.0.0)</carbon.analytics.version.range>-->
<carbon.event-processing.version>2.1.23</carbon.event-processing.version> <carbon.event-processing.version>2.3.5</carbon.event-processing.version>
<!-- Carbon Registry --> <!-- Carbon Registry -->
<carbon.registry.version>4.7.39</carbon.registry.version> <carbon.registry.version>4.8.13</carbon.registry.version>
<carbon.registry.resource.version>${carbon.registry.version}</carbon.registry.resource.version> <carbon.registry.resource.version>${carbon.registry.version}</carbon.registry.resource.version>
<carbon.registry.imp.pkg.version.range>[4.7.0, 5.0.0)</carbon.registry.imp.pkg.version.range> <carbon.registry.imp.pkg.version.range>[4.7.0, 5.0.0)</carbon.registry.imp.pkg.version.range>
<!--CXF properties--> <!--CXF properties-->
<cxf.version>3.3.6</cxf.version> <cxf.version>3.5.5</cxf.version>
<!--<cxf.bindings.version>2.5.11</cxf.bindings.version>--> <!--<cxf.bindings.version>2.5.11</cxf.bindings.version>-->
<json-simple.version>1.1.wso2v1</json-simple.version> <json-simple.version>1.1.wso2v1</json-simple.version>
<jackson.version>1.9.0</jackson.version> <jackson.version>1.9.13</jackson.version>
<!-- Subtype Management --> <!-- Subtype Management -->
<json.version>20220924</json.version> <!-- <json.version>20220924</json.version>-->
<fasterxml.jackson.version>2.4.5</fasterxml.jackson.version> <!-- <fasterxml.jackson.version>2.4.5</fasterxml.jackson.version>-->
<guava.version>27.0.1-jre</guava.version> <!-- <guava.version>27.0.1-jre</guava.version>-->
<!-- BouncyCastle --> <!-- BouncyCastle -->
<bcprov.wso2.version>1.60.0.wso2v1</bcprov.wso2.version> <bcprov.wso2.version>1.60.0.wso2v1</bcprov.wso2.version>
@ -2153,17 +2214,17 @@
<commons-json.version>3.0.0.wso2v1</commons-json.version> <commons-json.version>3.0.0.wso2v1</commons-json.version>
<json.smart.version>1.3</json.smart.version> <json.smart.version>1.3</json.smart.version>
<google.gson.version>2.8.5</google.gson.version> <google.gson.version>2.9.1</google.gson.version>
<google.guava.version>31.0.1-jre</google.guava.version> <google.guava.version>31.0.1-jre</google.guava.version>
<squareup.okhttp3.version>4.6.0</squareup.okhttp3.version> <squareup.okhttp3.version>4.6.0</squareup.okhttp3.version>
<okio.version>1.13.0</okio.version> <okio.version>1.13.0</okio.version>
<github.openfeign.version>9.3.1</github.openfeign.version> <github.openfeign.version>11.0</github.openfeign.version>
<jsr311.version>1.1.1</jsr311.version> <jsr311.version>1.1.1</jsr311.version>
<commons.logging.version>1.2</commons.logging.version> <commons.logging.version>1.2</commons.logging.version>
<apache.http.client.version>4.5.6</apache.http.client.version> <apache.http.client.version>4.5.6</apache.http.client.version>
<!-- apache http components core --> <!-- apache http components core -->
<apache.http.core.version>4.4.10</apache.http.core.version> <apache.http.core.version>4.4.13</apache.http.core.version>
<apache.http.mime.version>4.5.8</apache.http.mime.version> <apache.http.mime.version>4.5.10</apache.http.mime.version>
<jersey.version>1.9</jersey.version> <jersey.version>1.9</jersey.version>
<!-- Neethi version--> <!-- Neethi version-->
@ -2171,7 +2232,7 @@
<neethi.wso2.version>2.0.4.wso2v4</neethi.wso2.version> <neethi.wso2.version>2.0.4.wso2v4</neethi.wso2.version>
<!-- Release plugin ID for github--> <!-- Release plugin ID for github-->
<project.scm.id>github-scm</project.scm.id> <!-- <project.scm.id>github-scm</project.scm.id>-->
<!--SC Annotations Dependency --> <!--SC Annotations Dependency -->
<scannotation.version>1.0.3.wso2v1</scannotation.version> <scannotation.version>1.0.3.wso2v1</scannotation.version>
@ -2180,15 +2241,16 @@
<httpclient.version>4.3.1.wso2v2</httpclient.version> <httpclient.version>4.3.1.wso2v2</httpclient.version>
<httpclient.version.range>[4.3.1, 5.0.0)</httpclient.version.range> <httpclient.version.range>[4.3.1, 5.0.0)</httpclient.version.range>
<httpcore.version>4.3.3.wso2v1</httpcore.version> <httpcore.version>4.4.16.wso2v1</httpcore.version>
<commons.httpclient.version>3.1.0.wso2v2</commons.httpclient.version> <commons.httpclient.version>3.1.0.wso2v2</commons.httpclient.version>
<httpclient.wso2.version>4.2.5.wso2v1</httpclient.wso2.version>
<velocity.version>1.7.0.wso2v1</velocity.version> <velocity.version>1.7.0.wso2v1</velocity.version>
<commons-io.version>2.4.0.wso2v1</commons-io.version> <commons-io.version>2.4.0.wso2v1</commons-io.version>
<commons-collections.version>3.2.0.wso2v1</commons-collections.version> <commons-collections.version>3.2.0.wso2v1</commons-collections.version>
<commons-collections.version.range>(3.2.0, 3.3.0]</commons-collections.version.range> <commons-collections.version.range>(3.2.0, 3.3.0]</commons-collections.version.range>
<commons-configuration.version>1.8</commons-configuration.version> <!-- <commons-configuration.version>1.8</commons-configuration.version>-->
<!--Mysql connector version--> <!--Mysql connector version-->
<mysql.connector.version>5.1.34</mysql.connector.version> <mysql.connector.version>5.1.34</mysql.connector.version>
@ -2199,13 +2261,13 @@
<eclipse.paho.version>1.0.2</eclipse.paho.version> <eclipse.paho.version>1.0.2</eclipse.paho.version>
<!-- Nimbus Jose--> <!-- Nimbus Jose-->
<nimbus.orbit.version>7.3.0.wso2v1</nimbus.orbit.version> <nimbus.orbit.version>7.9.0.wso2v1</nimbus.orbit.version>
<nimbus.orbit.version.range>[7.3, 8)</nimbus.orbit.version.range> <nimbus.orbit.version.range>[7.3, 8)</nimbus.orbit.version.range>
<!--javax ws rs version--> <!--javax ws rs version-->
<javax.ws.rs.version>2.0.1</javax.ws.rs.version> <javax.ws.rs.version>2.0.1</javax.ws.rs.version>
<swagger.version>1.5.10</swagger.version> <swagger.version>1.6.9</swagger.version>
<swagger.annotations.version>1.6.1</swagger.annotations.version> <!-- <swagger.annotations.version>1.6.9</swagger.annotations.version>-->
<servlet-api.version>4.0.1</servlet-api.version> <servlet-api.version>4.0.1</servlet-api.version>
<!--JWT grant type extension feature--> <!--JWT grant type extension feature-->
@ -2221,8 +2283,8 @@
<!-- apache pdfbox version --> <!-- apache pdfbox version -->
<orbit.version.pdfbox>1.8.10.wso2v2</orbit.version.pdfbox> <orbit.version.pdfbox>1.8.10.wso2v2</orbit.version.pdfbox>
<carbon.throttle.module.version>4.2.1</carbon.throttle.module.version> <!-- <carbon.throttle.module.version>4.2.1</carbon.throttle.module.version>-->
<javax.xml.soap.imp.pkg.version>[1.0.0, 1.1.0)</javax.xml.soap.imp.pkg.version> <!-- <javax.xml.soap.imp.pkg.version>[1.0.0, 1.1.0)</javax.xml.soap.imp.pkg.version>-->
<!-- apache pdfbox version --> <!-- apache pdfbox version -->
<slf4j.simple.version>1.7.0</slf4j.simple.version> <slf4j.simple.version>1.7.0</slf4j.simple.version>
@ -2235,13 +2297,13 @@
<!-- api-mgt handler version properties --> <!-- api-mgt handler version properties -->
<org.apache.synapse.version>2.1.7-wso2v227</org.apache.synapse.version> <org.apache.synapse.version>2.1.7-wso2v227</org.apache.synapse.version>
<org.apache.ws.security.wso2.version>1.5.11.wso2v15</org.apache.ws.security.wso2.version> <org.apache.ws.security.wso2.version>1.5.11-wso2v18</org.apache.ws.security.wso2.version>
<!--carbon store version--> <!--carbon store version-->
<carbon.store.sso.common.version>1.5.1</carbon.store.sso.common.version> <carbon.store.sso.common.version>1.5.1</carbon.store.sso.common.version>
<!--Feign Version--> <!--Feign Version-->
<io.github.openfeign.version>9.3.1</io.github.openfeign.version> <io.github.openfeign.version>11.0</io.github.openfeign.version>
<io.github.openfeign.version.range>[9.3.1,10.0.0)</io.github.openfeign.version.range> <io.github.openfeign.version.range>[9.3.1,10.0.0)</io.github.openfeign.version.range>
<!--Oltu client Version--> <!--Oltu client Version-->
<oltu.client.version>1.0.1</oltu.client.version> <oltu.client.version>1.0.1</oltu.client.version>
@ -2268,22 +2330,28 @@
<maven.checkstyle.vesion>3.1.0</maven.checkstyle.vesion> <maven.checkstyle.vesion>3.1.0</maven.checkstyle.vesion>
<!--websocket related lib versions--> <!--websocket related lib versions-->
<tomcat.websocket.version>7.0.85</tomcat.websocket.version> <tomcat.websocket.version>9.0.24</tomcat.websocket.version>
<javax.websocket.version>1.1</javax.websocket.version> <javax.websocket.version>1.1</javax.websocket.version>
<glassfish.tyrus.version>1.13.1</glassfish.tyrus.version> <!-- <glassfish.tyrus.version>1.13.1</glassfish.tyrus.version>-->
<spring-web.version>5.1.13.RELEASE</spring-web.version> <spring-web.version>5.3.23</spring-web.version>
<cxf-bundle-package.version>2.7.18</cxf-bundle-package.version> <cxf-bundle-package.version>2.7.18</cxf-bundle-package.version>
<cxf-bundle.version>2.6.1.wso2v2</cxf-bundle.version>
<imp.package.version.osgi.framework>[1.6.0, 2.0.0)</imp.package.version.osgi.framework> <imp.package.version.osgi.framework>[1.6.0, 2.0.0)</imp.package.version.osgi.framework>
<imp.package.version.osgi.service>[1.2.0,1.3.0)</imp.package.version.osgi.service> <imp.package.version.osgi.service>[1.2.0,1.3.0)</imp.package.version.osgi.service>
<mokito.version>4.2.0</mokito.version> <mokito.version>4.2.0</mokito.version>
<jaxb.api.version>2.3.1</jaxb.api.version> <!-- <jaxb.api.version>2.3.1</jaxb.api.version>-->
<xerces.version>2.8.1.wso2v2</xerces.version> <xerces.version>2.8.1.wso2v2</xerces.version>
<org.wso2.apache.httpcomponents.httpclient.version>4.3.1.wso2v1</org.wso2.apache.httpcomponents.httpclient.version> <org.wso2.apache.httpcomponents.httpclient.version>4.3.1.wso2v1</org.wso2.apache.httpcomponents.httpclient.version>
<orbit.h2.version>1.4.199.wso2v1</orbit.h2.version> <orbit.h2.version>2.1.210.wso2v1</orbit.h2.version>
<securevault.version>1.1.3</securevault.version> <securevault.version>1.1.3</securevault.version>
<pax.logging.api.version>1.11.2</pax.logging.api.version>
<version.org.wso2.orbit.javax.xml.bind>2.3.1.wso2v1</version.org.wso2.orbit.javax.xml.bind>
<commons-lang.version>2.4</commons-lang.version>
<commons-fileupload.version>1.2.2.wso2v1</commons-fileupload.version>
</properties> </properties>
<pluginRepositories> <pluginRepositories>