From c8e94e8ef1ed2045aeb727bd88be456596a9be7e Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Wed, 17 May 2023 20:09:02 +0530 Subject: [PATCH 01/35] refatcoring test cases --- integration-test/pom.xml | 2 +- .../integration/test}/common/AssertUtil.java | 2 +- .../integration/test}/common/Constants.java | 2 +- .../test}/common/IOTHttpClient.java | 2 +- .../integration/test}/common/IOTResponse.java | 2 +- .../integration/test}/common/OAuthUtil.java | 2 +- .../test}/common/PayloadGenerator.java | 2 +- .../integration/test}/common/RestClient.java | 2 +- .../integration/test}/common/TestBase.java | 2 +- .../extensions/AnalyticsServerExtension.java | 2 +- .../extensions/BrokerServerExtension.java | 2 +- .../CarbonServerManagerExtension.java | 2 +- .../extensions/CustomTestServerManager.java | 2 +- .../common/extensions/IOTServerExtension.java | 2 +- ...roidDeviceManagementAPIJmeterTestCase.java | 2 +- .../src/test/resources/automation.xml | 6 +- .../AndroidDeviceManagementAPI.jmx | 334 +++++++++++------- .../src/test/resources/testng.xml | 2 +- iot-core/pom.xml | 4 +- iot-core/src/assembly/bin.xml | 2 +- iot-core/src/core/conf/deployment.toml | 4 +- iot-core/src/core/conf/tomcat/context.xml | 2 +- 22 files changed, 228 insertions(+), 156 deletions(-) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/AssertUtil.java (97%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/Constants.java (99%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/IOTHttpClient.java (99%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/IOTResponse.java (95%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/OAuthUtil.java (98%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/PayloadGenerator.java (97%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/RestClient.java (99%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/TestBase.java (98%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/extensions/AnalyticsServerExtension.java (97%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/extensions/BrokerServerExtension.java (98%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/extensions/CarbonServerManagerExtension.java (99%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/extensions/CustomTestServerManager.java (99%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/common/extensions/IOTServerExtension.java (98%) rename integration-test/src/test/java/{org/wso2/iot/integration => io/entgra/community/iots/integration/test}/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java (96%) diff --git a/integration-test/pom.xml b/integration-test/pom.xml index cbc9b26..eccb507 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -59,7 +59,7 @@ carbon.zip - ${basedir}/../../distribution/iot-community/target/${entgra-iot-community}.zip + ${basedir}/../distribution/iot-community/target/${entgra-iot-community}.zip diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/AssertUtil.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/AssertUtil.java similarity index 97% rename from integration-test/src/test/java/org/wso2/iot/integration/common/AssertUtil.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/AssertUtil.java index c84c619..0d949b1 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/AssertUtil.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/AssertUtil.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/Constants.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/Constants.java similarity index 99% rename from integration-test/src/test/java/org/wso2/iot/integration/common/Constants.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/Constants.java index a85777e..b2168ba 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/Constants.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/Constants.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; import java.io.File; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/IOTHttpClient.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/IOTHttpClient.java similarity index 99% rename from integration-test/src/test/java/org/wso2/iot/integration/common/IOTHttpClient.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/IOTHttpClient.java index 7f6fb99..afc7801 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/IOTHttpClient.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/IOTHttpClient.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/IOTResponse.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/IOTResponse.java similarity index 95% rename from integration-test/src/test/java/org/wso2/iot/integration/common/IOTResponse.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/IOTResponse.java index 0860b95..e7de517 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/IOTResponse.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/IOTResponse.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; /** * This class contains the functions to handle a HTTP Response diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/OAuthUtil.java similarity index 98% rename from integration-test/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/OAuthUtil.java index 2836087..cf97df2 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/OAuthUtil.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; import org.apache.commons.net.util.Base64; import org.json.JSONObject; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/PayloadGenerator.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/PayloadGenerator.java similarity index 97% rename from integration-test/src/test/java/org/wso2/iot/integration/common/PayloadGenerator.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/PayloadGenerator.java index ebdc1a1..39fa1d0 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/PayloadGenerator.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/PayloadGenerator.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/RestClient.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/RestClient.java similarity index 99% rename from integration-test/src/test/java/org/wso2/iot/integration/common/RestClient.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/RestClient.java index bf4901f..f502707 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/RestClient.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/RestClient.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; import org.wso2.carbon.automation.engine.exceptions.AutomationFrameworkException; import org.wso2.carbon.automation.test.utils.http.client.HttpRequestUtil; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/TestBase.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/TestBase.java similarity index 98% rename from integration-test/src/test/java/org/wso2/iot/integration/common/TestBase.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/TestBase.java index dd428b8..739f33e 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/TestBase.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/TestBase.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common; +package io.entgra.community.iots.integration.test.common; import org.apache.commons.net.util.Base64; import org.testng.annotations.DataProvider; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/AnalyticsServerExtension.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/AnalyticsServerExtension.java similarity index 97% rename from integration-test/src/test/java/org/wso2/iot/integration/common/extensions/AnalyticsServerExtension.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/AnalyticsServerExtension.java index a567571..490fbac 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/AnalyticsServerExtension.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/AnalyticsServerExtension.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common.extensions; +package io.entgra.community.iots.integration.test.common.extensions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/BrokerServerExtension.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/BrokerServerExtension.java similarity index 98% rename from integration-test/src/test/java/org/wso2/iot/integration/common/extensions/BrokerServerExtension.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/BrokerServerExtension.java index ad074c4..ab117a9 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/BrokerServerExtension.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/BrokerServerExtension.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.iot.integration.common.extensions; +package io.entgra.community.iots.integration.test.common.extensions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CarbonServerManagerExtension.java similarity index 99% rename from integration-test/src/test/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CarbonServerManagerExtension.java index 9f5c9fc..16c6f1e 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CarbonServerManagerExtension.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common.extensions; +package io.entgra.community.iots.integration.test.common.extensions; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.DirectoryFileFilter; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CustomTestServerManager.java similarity index 99% rename from integration-test/src/test/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CustomTestServerManager.java index 600ad94..8ba2b8b 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CustomTestServerManager.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common.extensions; +package io.entgra.community.iots.integration.test.common.extensions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/IOTServerExtension.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/IOTServerExtension.java similarity index 98% rename from integration-test/src/test/java/org/wso2/iot/integration/common/extensions/IOTServerExtension.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/IOTServerExtension.java index 6b46b65..b50454e 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/common/extensions/IOTServerExtension.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/IOTServerExtension.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.common.extensions; +package io.entgra.community.iots.integration.test.common.extensions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/integration-test/src/test/java/org/wso2/iot/integration/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java similarity index 96% rename from integration-test/src/test/java/org/wso2/iot/integration/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java rename to integration-test/src/test/java/io/entgra/community/iots/integration/test/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java index 2736f5c..c34b289 100644 --- a/integration-test/src/test/java/org/wso2/iot/integration/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/jmeter/AndroidDeviceManagementAPIJmeterTestCase.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.iot.integration.jmeter; +package io.entgra.community.iots.integration.test.jmeter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/integration-test/src/test/resources/automation.xml b/integration-test/src/test/resources/automation.xml index 369e7a7..63d1f39 100644 --- a/integration-test/src/test/resources/automation.xml +++ b/integration-test/src/test/resources/automation.xml @@ -189,9 +189,9 @@ - - org.wso2.iot.integration.common.extensions.IOTServerExtension - + + io.entgra.community.iots.integration.test.common.extensions.IOTServerExtension + diff --git a/integration-test/src/test/resources/jmeter-scripts/AndroidDeviceManagementAPI.jmx b/integration-test/src/test/resources/jmeter-scripts/AndroidDeviceManagementAPI.jmx index 331dfd2..1d87b08 100644 --- a/integration-test/src/test/resources/jmeter-scripts/AndroidDeviceManagementAPI.jmx +++ b/integration-test/src/test/resources/jmeter-scripts/AndroidDeviceManagementAPI.jmx @@ -1,5 +1,5 @@ - + @@ -133,6 +133,7 @@ false + true @@ -141,7 +142,7 @@ rfc2109 - + @@ -163,9 +164,9 @@ urn:login true false - + - + @@ -183,7 +184,7 @@ urn:getTenant true false - + undefined @@ -193,6 +194,7 @@ false true tenant_exists + -1 @@ -208,7 +210,7 @@ false - + @@ -247,10 +249,10 @@ urn:addTenant true false - + - + @@ -265,7 +267,7 @@ urn:logout true false - + @@ -274,6 +276,7 @@ Assertion.response_code false 1 + @@ -324,6 +327,7 @@ false + true @@ -332,7 +336,7 @@ rfc2109 - + @@ -354,9 +358,9 @@ urn:login true false - + - + @@ -371,7 +375,7 @@ urn:logout true false - + @@ -380,6 +384,7 @@ Assertion.response_code false 1 + @@ -397,6 +402,7 @@ false + true @@ -408,7 +414,7 @@ false - + true @@ -417,7 +423,7 @@ { "applicationName":"app_${randAppNum}", "isAllowedToAllDomains":false, - "tags":["android", "device_management"], + "tags":["device_management"], "isMappingAnExistingOAuthApp":false } = @@ -477,7 +483,7 @@ - + clientId,clientSecret false @@ -491,7 +497,7 @@ byte[] encryptedId = Base64.encodeBase64(toEncode.getBytes()); vars.put("base64encodedId",new String(encryptedId)); - + @@ -571,7 +577,64 @@ vars.put("base64encodedId",new String(encryptedId)); - + + true + + + + false + { + "name": "android", + "deviceTypeMetaDefinition": { + "description": "android device type", + "properties": [ + "property1" + ], + "features": [ + { + "code":"aaaa1111", + "name":"newfeature1", + "description":"this is the new feature 1" + } + ] + } +} + = + + + + ${host} + ${https_port} + + + https + + /api/device-mgt/v1.0/admin/device-types + POST + false + false + true + false + HttpClient4 + false + + + + + + + Authorization + Bearer ${access_token} + + + Content-Type + application/json + + + + + + true @@ -683,7 +746,7 @@ vars.put("base64encodedId",new String(encryptedId)); https - /api/device-mgt/android/v1.0/devices + /api/device-mgt/v1.0/device/agent/enroll POST false false @@ -708,7 +771,7 @@ vars.put("base64encodedId",new String(encryptedId)); - + @@ -758,7 +821,7 @@ vars.put("base64encodedId",new String(encryptedId)); - + true @@ -830,7 +893,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -880,7 +943,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -915,7 +978,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -958,7 +1021,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -993,7 +1056,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -1069,10 +1132,11 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_data false 16 + - + @@ -1111,7 +1175,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -1176,7 +1240,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1215,7 +1279,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1254,7 +1318,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -1309,7 +1373,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1348,7 +1412,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1387,7 +1451,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1426,7 +1490,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1465,7 +1529,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1512,7 +1576,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1551,7 +1615,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1590,7 +1654,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1638,7 +1702,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1677,7 +1741,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -1716,7 +1780,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -2263,6 +2327,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_data false 16 + @@ -4605,7 +4670,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", false - + tenant_user_name,domain_name,password false @@ -4619,7 +4684,7 @@ byte[] encryptedId = Base64.encodeBase64(toEncode.getBytes()); vars.put("encodedUserPassword","Basic " + new String(encryptedId)); - + true @@ -4690,7 +4755,7 @@ vars.put("encodedUserPassword","Basic " + new String(encrypt - + clientId,clientSecret false @@ -4704,7 +4769,7 @@ byte[] encryptedId = Base64.encodeBase64(toEncode.getBytes()); vars.put("base64encodedId",new String(encryptedId)); - + @@ -4784,13 +4849,13 @@ vars.put("base64encodedId",new String(encryptedId)); - + false true false - + true @@ -4927,7 +4992,7 @@ vars.put("base64encodedId",new String(encryptedId)); - + @@ -4977,7 +5042,7 @@ vars.put("base64encodedId",new String(encryptedId)); - + true @@ -5049,7 +5114,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5099,7 +5164,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5134,7 +5199,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -5210,10 +5275,11 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_data false 16 + - + @@ -5256,7 +5322,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5291,7 +5357,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5330,7 +5396,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -5395,7 +5461,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5434,7 +5500,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5473,7 +5539,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -5528,7 +5594,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5567,7 +5633,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5606,7 +5672,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5645,7 +5711,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5684,7 +5750,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5731,7 +5797,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5770,7 +5836,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5809,7 +5875,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5857,7 +5923,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5896,7 +5962,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -5941,6 +6007,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_code true 8 + @@ -5950,10 +6017,11 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_data true 16 + - + @@ -5992,7 +6060,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -6031,7 +6099,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6082,7 +6150,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -6117,7 +6185,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6254,7 +6322,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6395,7 +6463,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6455,7 +6523,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -6494,7 +6562,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6540,7 +6608,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6582,7 +6650,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6637,7 +6705,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6690,7 +6758,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6732,7 +6800,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6778,7 +6846,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6820,7 +6888,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6876,7 +6944,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6930,7 +6998,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -6972,7 +7040,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7025,7 +7093,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7067,7 +7135,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7120,7 +7188,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7162,7 +7230,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7208,7 +7276,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7250,7 +7318,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7306,7 +7374,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7348,7 +7416,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7394,7 +7462,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7436,7 +7504,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7490,7 +7558,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7532,7 +7600,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7578,7 +7646,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7620,7 +7688,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7666,7 +7734,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7708,7 +7776,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7754,7 +7822,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7796,7 +7864,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7850,7 +7918,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7892,7 +7960,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7934,7 +8002,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -7993,7 +8061,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8035,7 +8103,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8090,7 +8158,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8132,7 +8200,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8188,7 +8256,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8230,7 +8298,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8276,7 +8344,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8318,7 +8386,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8375,7 +8443,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8417,7 +8485,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8471,7 +8539,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8513,7 +8581,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8566,7 +8634,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8612,7 +8680,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8654,7 +8722,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -8693,7 +8761,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8739,7 +8807,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8781,7 +8849,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8823,7 +8891,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + @@ -8868,10 +8936,11 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_data false 16 + - + @@ -8916,10 +8985,11 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_data false 16 + - + @@ -8964,6 +9034,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_data true 16 + @@ -8973,6 +9044,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", Assertion.response_code false 8 + diff --git a/integration-test/src/test/resources/testng.xml b/integration-test/src/test/resources/testng.xml index feee9c4..c72e7c9 100644 --- a/integration-test/src/test/resources/testng.xml +++ b/integration-test/src/test/resources/testng.xml @@ -29,7 +29,7 @@ - + diff --git a/iot-core/pom.xml b/iot-core/pom.xml index e48707c..455eedf 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -185,7 +185,7 @@ - + @@ -212,7 +212,7 @@ - + diff --git a/iot-core/src/assembly/bin.xml b/iot-core/src/assembly/bin.xml index b78177f..ae67129 100644 --- a/iot-core/src/assembly/bin.xml +++ b/iot-core/src/assembly/bin.xml @@ -51,7 +51,7 @@ ${basedir}/target/${wso2am} ${entgra-iot-core} - **/repository/conf/tomcat/context.xml + **/repository/conf/deployment.toml diff --git a/iot-core/src/core/conf/deployment.toml b/iot-core/src/core/conf/deployment.toml index 738fdb0..15f4538 100644 --- a/iot-core/src/core/conf/deployment.toml +++ b/iot-core/src/core/conf/deployment.toml @@ -105,7 +105,7 @@ config_endpoint = "https://localhost:8080/auth/v1" auth_token = "" [web_app.listener] -class_name = ["org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener", "io.entgra.device.mgt.core.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"] +class_name = ["io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener", "io.entgra.device.mgt.core.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"] [apim.key_manager] #service_url = "https://localhost:${mgt.transport.https.port}/services/" @@ -115,7 +115,7 @@ class_name = ["org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener.APIPub #pool.max_idle = 100 #key_validation_handler_type = "default" #key_validation_handler_type = "custom" -key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.extension.KeyValidationHandler" +key_validation_handler_impl = "io.entgra.device.mgt.core.apimgt.keymgt.extension.KeyValidationHandler" #[apim.idp] #server_url = "https://localhost:${mgt.transport.https.port}" diff --git a/iot-core/src/core/conf/tomcat/context.xml b/iot-core/src/core/conf/tomcat/context.xml index e91129c..b0c3dcb 100644 --- a/iot-core/src/core/conf/tomcat/context.xml +++ b/iot-core/src/core/conf/tomcat/context.xml @@ -47,7 +47,7 @@ 'managed-api-isSecured' - Indicates if the 'Managed API' needs to be exposed over a secured channel. 'managed-api-transports' - Transports through which the 'Managed API' is exposed. --> - + + **/repository/conf/tomcat/context.xml **/repository/conf/deployment.toml @@ -92,10 +92,6 @@ src/core/conf/input-event-adapters.xml ${entgra-iot-core}/repository/conf/ - - src/core/conf/output-event-adapters.xml.j2 - ${entgra-iot-core}/repository/resources/conf/templates/repository/conf - src/core/keystores/wso2carbon.jks ${entgra-iot-core}/repository/resources/security/ @@ -115,7 +111,6 @@ ${entgra-iot-core}/repository/components/dropins io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.oauth.extensions - io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.keymgt.extension diff --git a/iot-core/src/core/bin/iot-server.bat b/iot-core/src/core/bin/iot-server.bat index 2bee15e..1149f02 100755 --- a/iot-core/src/core/bin/iot-server.bat +++ b/iot-core/src/core/bin/iot-server.bat @@ -172,13 +172,13 @@ set CMD=RUN %* :checkJdk17 PATH %PATH%;%JAVA_HOME%\bin\ for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "JAVA_VERSION=%%j%%k" -if %JAVA_VERSION% LSS 17 goto unknownJdk -if %JAVA_VERSION% GTR 110 goto unknownJdk +if %JAVA_VERSION% LSS 110 goto unknownJdk +if %JAVA_VERSION% GTR 170 goto unknownJdk goto jdk17 :unknownJdk echo Starting WSO2 Carbon (in unsupported JDK) -echo [ERROR] CARBON is supported only on JDK 1.7, 1.8, 9, 10 and 11 +echo [ERROR] CARBON is supported only between JDK 11 and JDK 17 goto jdk17 :jdk17 @@ -203,7 +203,7 @@ set CARBON_CLASSPATH=".\lib\*";%CARBON_CLASSPATH% if %JAVA_VERSION% GEQ 110 set CARBON_CLASSPATH=".\lib\endorsed\*";%CARBON_CLASSPATH% if %JAVA_VERSION% LEQ 18 set JAVA_VER_BASED_OPTS=-Djava.endorsed.dirs=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed" -if %JAVA_VERSION% GEQ 110 set JAVA_VER_BASED_OPTS=--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED +if %JAVA_VERSION% GEQ 110 set JAVA_VER_BASED_OPTS=--add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof" set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% %JAVA_VER_BASED_OPTS% @@ -217,6 +217,9 @@ set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dcom.atomikos.icatch.hide_init_file_path="tru set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -DworkerNode=false -Dcarbon.new.config.dir.path="%CARBON_HOME%\repository\resources\conf" set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Dhttpclient.hostnameVerifier="DefaultAndLocalhost" +set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dlog4j2.contextSelector="org.apache.logging.log4j.core.async.AsyncLoggerContextSelector" +set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.ops4j.pax.logging.logReaderEnabled="false" +set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.ops4j.pax.logging.eventAdminEnabled="false" set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Diot.core.host="localhost" -Diot.core.https.port="9443" -Diot.core.http.port="9763" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8243" -Diot.gateway.http.port="8280" -Diot.gateway.carbon.https.port="9443" -Diot.gateway.carbon.http.port="9763" -Diot.gateway.websocket.ws.port="9099" -Diot.gateway.websocket.wss.port="8099" -Diot.remotesession.server.host="localhost" -Diot.remotesession.server.https.port="9443" set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1883" diff --git a/iot-core/src/core/bin/iot-server.sh b/iot-core/src/core/bin/iot-server.sh index 238ba73..6854e2d 100755 --- a/iot-core/src/core/bin/iot-server.sh +++ b/iot-core/src/core/bin/iot-server.sh @@ -235,9 +235,9 @@ fi # ---------- Handle the SSL Issue with proper JDK version -------------------- java_version=$("$JAVACMD" -version 2>&1 | awk -F '"' '/version/ {print $2}') java_version_formatted=$(echo "$java_version" | awk -F. '{printf("%02d%02d",$1,$2);}') -if [ $java_version_formatted -lt 0107 ] || [ $java_version_formatted -gt 1100 ]; then +if [ $java_version_formatted -lt 1100 ] || [ $java_version_formatted -gt 1700 ]; then echo " Starting WSO2 Carbon (in unsupported JDK)" - echo " [ERROR] CARBON is supported only on JDK 1.7, 1.8, 9, 10 and 11" + echo " [ERROR] CARBON is supported only between JDK 11 and JDK 17" fi CARBON_XBOOTCLASSPATH="" @@ -307,11 +307,10 @@ echo "Using Java memory options: $JVM_MEM_OPTS" #To monitor a Carbon server in remote JMX mode on linux host machines, set the below system property. # -Djava.rmi.server.hostname="your.IP.goes.here" -JAVA_VER_BASED_OPTS="" +JAVA_VER_BASED_OPTS="--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED" - -if [ $java_version_formatted -ge 1100 ]; then - JAVA_VER_BASED_OPTS="--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED" +if [ $java_version_formatted -ge 1700 ]; then + JAVA_VER_BASED_OPTS="$JAVA_VER_BASED_OPTS --add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED" fi while [ "$status" = "$START_EXIT_STATUS" ] @@ -354,6 +353,9 @@ do -DenableCorrelationLogs=false \ -Dcarbon.new.config.dir.path="$CARBON_HOME/repository/resources/conf" \ -Djavax.xml.xpath.XPathFactory:http://java.sun.com/jaxp/xpath/dom=net.sf.saxon.xpath.XPathFactoryImpl \ + -Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector \ + -Dorg.ops4j.pax.logging.logReaderEnabled=false \ + -Dorg.ops4j.pax.logging.eventAdminEnabled=false \ -Diot.core.host="localhost" \ -Diot.core.https.port="9443" \ -Diot.core.http.port="9763" \ @@ -378,4 +380,4 @@ do -Diot.reporting.webapp.host="" \ org.wso2.carbon.bootstrap.Bootstrap $* status=$? -done +done \ No newline at end of file diff --git a/iot-core/src/core/conf/deployment.toml b/iot-core/src/core/conf/deployment.toml index 15f4538..141b4fe 100644 --- a/iot-core/src/core/conf/deployment.toml +++ b/iot-core/src/core/conf/deployment.toml @@ -282,4 +282,20 @@ grant_validator="io.entgra.device.mgt.core.device.mgt.oauth.extensions.validator renew_refresh_token=false [device_mgt_conf.pull_notification_conf] -enabled=false \ No newline at end of file +enabled=false + +[[output_adapter.custom_output_adapter]] +adapter.type = "oauth-mqtt" +[adapter.properties] +minThread = 8 +maxThread = 100 +keepAliveTimeInMillis = 20000 +jobQueueSize = 10000 +connectionKeepAliveInterval = 60 +dcrUrl = "https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.17/register" +tokenUrl = "https://${iot.gateway.host}:${iot.gateway.https.port}/token" +url = "tcp://${mqtt.broker.host}:${mqtt.broker.port}" +username = "${admin.username}" +password = "${admin.password}" +qos = 2 +clearSession = true diff --git a/iot-core/src/core/conf/input-event-adapters.xml b/iot-core/src/core/conf/input-event-adapters.xml index 25052b2..282f24e 100644 --- a/iot-core/src/core/conf/input-event-adapters.xml +++ b/iot-core/src/core/conf/input-event-adapters.xml @@ -18,21 +18,6 @@ - - - 8 - 100 - 20000 - 10000 - 60 - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.17/register - tcp://${mqtt.broker.host}:${mqtt.broker.port} - admin - admin - deviceid-topic-content-validator - true - - 8 100 @@ -53,4 +38,18 @@ 10000 + + + 8 + 100 + 20000 + 10000 + 60 + https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.17/register + tcp://${mqtt.broker.host}:${mqtt.broker.port} + admin + admin + deviceid-topic-content-validator + true + \ No newline at end of file diff --git a/iot-core/src/core/samples/device-plugins-deployer.xml b/iot-core/src/core/samples/device-plugins-deployer.xml index 9e4657b..85b1306 100644 --- a/iot-core/src/core/samples/device-plugins-deployer.xml +++ b/iot-core/src/core/samples/device-plugins-deployer.xml @@ -21,13 +21,13 @@ org.wso2 wso2 - 1 + 1.3 4.0.0 io.entgra.community.iots iot-devicetype-feature-installation - 5.2.1-SNAPSHOT + 5.2.2-SNAPSHOT pom Install Virtual Fire Alarm Device Types - IoT Core diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index a90c1ea..d8aedc3 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -105,7 +105,6 @@ org.wso2.maven carbon-p2-plugin - ${carbon.p2.plugin.version} 2-p2-repo-generation @@ -178,7 +177,6 @@ com.google.code.maven-replacer-plugin replacer - 1.5.3 package diff --git a/pom.xml b/pom.xml index 35eadc8..59cf197 100644 --- a/pom.xml +++ b/pom.xml @@ -85,27 +85,7 @@ org.wso2.carbon.automation org.wso2.carbon.automation.test.utils - ${test.framework.version} - - - org.slf4j - slf4j-api - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - test - - - org.wso2.carbon.automationutils - org.wso2.carbon.integration.common.utils - ${test.framework.version} + ${platform.integration.utils.version} org.slf4j @@ -270,42 +250,6 @@ - - org.wso2.carbon.automationutils - org.wso2.carbon.integration.common.admin.client - ${automation.utils.version} - test - - - org.slf4j - slf4j-api - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - org.wso2.carbon.commons - org.wso2.carbon.user.mgt.stub - - - org.wso2.carbon.commons - org.wso2.carbon.ndatasource.stub - - - org.wso2.carbon.commons - org.wso2.carbon.authenticator.stub - - - org.wso2.carbon - org.wso2.carbon.utils - - - com.google.code.gson gson @@ -316,8 +260,8 @@ - 4.0.0 - wso2am-4.0.0 + 4.2.0 + wso2am-4.2.0 io.entgra.community.iots.core-${project.version} entgra-iots-community-${project.version} @@ -325,18 +269,17 @@ 5.0.26-SNAPSHOT - 5.1.2 + 5.2.42 - 1.4.199.wso2v1 + 2.1.210.wso2v1 6.0.17-SNAPSHOT - 2.8.5 - 4.4.3 - 4.4.2 - 4.4.2 + 2.9.1 + 4.4.10 + 4.5.3 @@ -372,11 +315,11 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.1 + 3.8.1 UTF-8 - 1.8 - 1.8 + 11 + 11 @@ -394,23 +337,10 @@ - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - org.apache.felix maven-bundle-plugin - 2.3.5 + 5.1.1 true NONE @@ -457,6 +387,21 @@ true + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + org.wso2.maven + carbon-p2-plugin + ${carbon.p2.plugin.version} + From 3b0728fd20b45700a2114f2c4a28a31c87916c5c Mon Sep 17 00:00:00 2001 From: pramilaniroshan Date: Thu, 8 Jun 2023 12:43:09 +0530 Subject: [PATCH 05/35] Remove App Manager Feature --- iot-core/pom.xml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/iot-core/pom.xml b/iot-core/pom.xml index a63a8f4..b284706 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -349,15 +349,6 @@ - - - io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.api.feature:${io.entgra.device.mgt.core.version} - - - io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.server.feature:${io.entgra.device.mgt.core.version} - - - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature:${io.entgra.device.mgt.core.version} @@ -428,17 +419,6 @@ - - - io.entgra.device.mgt.core.application.mgt.api.feature.group - ${io.entgra.device.mgt.core.version} - - - io.entgra.device.mgt.core.application.mgt.server.feature.group - ${io.entgra.device.mgt.core.version} - - - io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature.group From 3f542be0a01d28914aeee97717a9b38d31669af6 Mon Sep 17 00:00:00 2001 From: pramilaniroshan Date: Thu, 8 Jun 2023 13:02:06 +0530 Subject: [PATCH 06/35] Revert "Remove App Manager Feature" This reverts commit 3b0728fd20b45700a2114f2c4a28a31c87916c5c. --- iot-core/pom.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/iot-core/pom.xml b/iot-core/pom.xml index b284706..a63a8f4 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -349,6 +349,15 @@ + + + io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.api.feature:${io.entgra.device.mgt.core.version} + + + io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.server.feature:${io.entgra.device.mgt.core.version} + + + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature:${io.entgra.device.mgt.core.version} @@ -419,6 +428,17 @@ + + + io.entgra.device.mgt.core.application.mgt.api.feature.group + ${io.entgra.device.mgt.core.version} + + + io.entgra.device.mgt.core.application.mgt.server.feature.group + ${io.entgra.device.mgt.core.version} + + + io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature.group From b89df459784c900cc52635a3f02ee74e9d2f1031 Mon Sep 17 00:00:00 2001 From: pramilaniroshan Date: Thu, 8 Jun 2023 13:07:48 +0530 Subject: [PATCH 07/35] Remove App Manager API Feature --- iot-core/pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/iot-core/pom.xml b/iot-core/pom.xml index a63a8f4..2b103ab 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -350,9 +350,6 @@ - - io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.api.feature:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.server.feature:${io.entgra.device.mgt.core.version} @@ -429,10 +426,6 @@ - - io.entgra.device.mgt.core.application.mgt.api.feature.group - ${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core.application.mgt.server.feature.group ${io.entgra.device.mgt.core.version} From 23d0ce06124f6b278132b32e087f7412cb00c720 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Mon, 12 Jun 2023 12:21:07 +0530 Subject: [PATCH 08/35] updated from master and updated conifgs --- .../core/conf/output-event-adapters.xml.j2 | 170 ------------------ 1 file changed, 170 deletions(-) delete mode 100644 iot-core/src/core/conf/output-event-adapters.xml.j2 diff --git a/iot-core/src/core/conf/output-event-adapters.xml.j2 b/iot-core/src/core/conf/output-event-adapters.xml.j2 deleted file mode 100644 index 883a6d6..0000000 --- a/iot-core/src/core/conf/output-event-adapters.xml.j2 +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - tcp://localhost:7612 - ssl://localhost:7712 - tcp://localhost:9612 - ssl://localhost:9712 - - - - VARCHAR(255) - DOUBLE - INT - BIGINT - FLOAT - BOOL - CREATE TABLE $TABLE_NAME ($COLUMN_TYPES) - INSERT INTO $TABLE_NAME ($COLUMNS) VALUES ($VALUES) - SELECT * FROM $TABLE_NAME limit 1 - UPDATE $TABLE_NAME SET $COLUMN_VALUES WHERE $CONDITION - , - ? - = - AND - SELECT COLUMN_NAME, DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '$TABLE_NAME' - SELECT $COLUMNS FROM $TABLE_NAME - varchar2(255) - CLOB - BINARY_DOUBLE - SELECT * FROM $TABLE_NAME WHERE ROWNUM = 1 - SELECT COLUMN_NAME, DATA_TYPE FROM USER_TAB_COLS WHERE TABLE_NAME = '$TABLE_NAME' - varchar2(255) - SELECT TOP 1 * FROM $TABLE_NAME - SELECT COLUMN_NAME, DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '$TABLE_NAME' - varchar2(255) - REAL - SHOW COLUMNS FROM $TABLE_NAME - - - - - 8 - 100 - 20000 - 10000 - - 50 - 1000 - - - - - {{output_adapter.jms.min_thread}} - {{output_adapter.jms.max_thread}} - {{output_adapter.jms.keep_alive_time}} - {{output_adapter.jms.job_queue_size}} - - - - - 8 - 100 - 20000 - 10000 - 60 - - - - - 8 - 100 - 20000 - 10000 - - - - - {{output_adapter.email.from_address}} - {{output_adapter.email.username}} - {{output_adapter.email.password}} - {{output_adapter.email.hostname}} - {{output_adapter.email.port}} - {{output_adapter.email.enable_start_tls}} - {{output_adapter.email.enable_authentication}} - {{output_adapter.email.signature}} - {{output_adapter.email.reply_to}} - {% if output_adapter.email.custom_properties is defined %} - - {% for property_name,property_value in output_adapter.email.custom_properties.items() %} - {{property_value}} - {% endfor %} - {% endif %} - - 8 - 100 - 20000 - 10000 - - - - 30 - - 8 - 100 - 20000 - 10000 - - - - - 8 - 100 - 20000 - 10000 - - - - - 8 - 100 - 20000 - 10000 - - - - - 8 - 100 - 20000 - 10000 - - 10000 - true - true - 50 - - - - - 8 - 100 - 20000 - 10000 - 60 - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.17/register - https://${iot.gateway.host}:${iot.gateway.https.port}/token - tcp://${mqtt.broker.host}:${mqtt.broker.port} - admin - admin - 2 - true - - - \ No newline at end of file From 897df05df37a79ee2659bed5ad7833766613f076 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Fri, 30 Jun 2023 14:46:37 +0530 Subject: [PATCH 09/35] fixed p2 plugin and bundle plugin versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 59cf197..bcf987e 100644 --- a/pom.xml +++ b/pom.xml @@ -269,7 +269,7 @@ 5.0.26-SNAPSHOT - 5.2.42 + 5.1.2 2.1.210.wso2v1 @@ -340,7 +340,7 @@ org.apache.felix maven-bundle-plugin - 5.1.1 + 3.2.0 true NONE From c3e8eb87c16475908ddf44dc466bf7fb2a60a749 Mon Sep 17 00:00:00 2001 From: pasindu Date: Tue, 4 Jul 2023 12:03:25 +0530 Subject: [PATCH 10/35] Update copyrights --- distribution/iot-community/pom.xml | 4 +-- .../iot-community/src/assembly/bin.xml | 4 +-- distribution/pom.xml | 4 +-- integration-test/pom.xml | 4 +-- .../src/test/resources/automation.xml | 4 +-- .../src/test/resources/automationSchema.xsd | 4 +-- .../src/test/resources/testng-server-mgt.xml | 4 +-- .../src/test/resources/testng.xml | 4 +-- iot-core/pom.xml | 4 +-- iot-core/src/assembly/bin.xml | 4 +-- .../src/core/conf/input-event-adapters.xml | 8 ++--- .../core/conf/output-event-adapters.xml.j2 | 21 +++++++------ .../core/resources/extensions/basicauth.jsp | 8 ++--- .../extensions/cookie-policy-content.jsp | 8 ++--- .../src/core/resources/extensions/header.jsp | 30 +++++++++---------- .../extensions/privacy-policy-content.jsp | 8 ++--- .../resources/extensions/product-title.jsp | 12 ++++---- .../src/core/resources/extensions/title.jsp | 12 ++++---- .../endpoint/i18n/Resources.properties | 6 ++-- .../endpoint/i18n/Resources_fr_FR.properties | 6 ++-- .../core/samples/device-plugins-deployer.xml | 6 ++-- p2-profile/pom.xml | 4 +-- pom.xml | 4 +-- 23 files changed, 88 insertions(+), 85 deletions(-) diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index 09b0012..f6e75fc 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -1,13 +1,13 @@ diff --git a/iot-core/src/core/conf/output-event-adapters.xml.j2 b/iot-core/src/core/conf/output-event-adapters.xml.j2 index 883a6d6..9eef009 100644 --- a/iot-core/src/core/conf/output-event-adapters.xml.j2 +++ b/iot-core/src/core/conf/output-event-adapters.xml.j2 @@ -1,16 +1,19 @@ diff --git a/iot-core/src/core/resources/extensions/basicauth.jsp b/iot-core/src/core/resources/extensions/basicauth.jsp index afd6a8f..53ca56d 100644 --- a/iot-core/src/core/resources/extensions/basicauth.jsp +++ b/iot-core/src/core/resources/extensions/basicauth.jsp @@ -1,17 +1,17 @@ <%-- - ~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. ~ - ~ WSO2 Inc. licenses this file to you under the Apache License, + ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License, ~ Version 2.0 (the "License"); you may not use this file except ~ in compliance with the License. ~ You may obtain a copy of the License at ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the + ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations ~ under the License. --%> diff --git a/iot-core/src/core/resources/extensions/cookie-policy-content.jsp b/iot-core/src/core/resources/extensions/cookie-policy-content.jsp index 8b01401..851a278 100644 --- a/iot-core/src/core/resources/extensions/cookie-policy-content.jsp +++ b/iot-core/src/core/resources/extensions/cookie-policy-content.jsp @@ -1,7 +1,7 @@ <%-- - ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. ~ - ~ WSO2 Inc. licenses this file to you under the Apache License, + ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License, ~ Version 2.0 (the "License"); you may not use this file except ~ in compliance with the License. ~ You may obtain a copy of the License at @@ -11,10 +11,10 @@ ~ Unless required by applicable law or agreed to in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the + ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations ~ under the License. ---%> + --%>
diff --git a/iot-core/src/core/resources/extensions/header.jsp b/iot-core/src/core/resources/extensions/header.jsp index 52b8ff6..a316258 100644 --- a/iot-core/src/core/resources/extensions/header.jsp +++ b/iot-core/src/core/resources/extensions/header.jsp @@ -1,20 +1,20 @@ <%-- -~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -~ -~ WSO2 Inc. licenses this file to you under the Apache License, -~ Version 2.0 (the "License"); you may not use this file except -~ in compliance with the License. -~ You may obtain a copy of the License at -~ -~ http://www.apache.org/licenses/LICENSE-2.0 -~ -~ Unless required by applicable law or agreed to in writing, -~ software distributed under the License is distributed on an -~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -~ KIND, either express or implied. See the License for the -~ specific language governing permissions and limitations -~ under the License. + ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. + ~ + ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License, + ~ Version 2.0 (the "License"); you may not use this file except + ~ in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. --%> diff --git a/iot-core/src/core/resources/extensions/privacy-policy-content.jsp b/iot-core/src/core/resources/extensions/privacy-policy-content.jsp index 76b6b09..4a4cf5c 100644 --- a/iot-core/src/core/resources/extensions/privacy-policy-content.jsp +++ b/iot-core/src/core/resources/extensions/privacy-policy-content.jsp @@ -1,7 +1,7 @@ <%-- - ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. ~ - ~ WSO2 Inc. licenses this file to you under the Apache License, + ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License, ~ Version 2.0 (the "License"); you may not use this file except ~ in compliance with the License. ~ You may obtain a copy of the License at @@ -11,10 +11,10 @@ ~ Unless required by applicable law or agreed to in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the + ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations ~ under the License. ---%> + --%>
diff --git a/iot-core/src/core/resources/extensions/product-title.jsp b/iot-core/src/core/resources/extensions/product-title.jsp index 3fa1a4b..81bb0a2 100644 --- a/iot-core/src/core/resources/extensions/product-title.jsp +++ b/iot-core/src/core/resources/extensions/product-title.jsp @@ -1,17 +1,17 @@ <%-- - ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. ~ - ~ WSO2 Inc. licenses this file to you under the Apache License, - ~ Version 2.0 (the "License"); you may not use this file except - ~ in compliance with the License. - ~ You may obtain a copy of the License at + ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License, + ~ Version 2.0 (the "License"); you may not use this file except + ~ in compliance with the License. + ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the + ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations ~ under the License. --%> diff --git a/iot-core/src/core/resources/extensions/title.jsp b/iot-core/src/core/resources/extensions/title.jsp index 574086b..eceea89 100644 --- a/iot-core/src/core/resources/extensions/title.jsp +++ b/iot-core/src/core/resources/extensions/title.jsp @@ -1,18 +1,18 @@ <%-- - ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. ~ - ~ WSO2 Inc. licenses this file to you under the Apache License, - ~ Version 2.0 (the "License"); you may not use this file except - ~ in compliance with the License. - ~ You may obtain a copy of the License at + ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License, + ~ Version 2.0 (the "License"); you may not use this file except + ~ in compliance with the License. + ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the + ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations ~ under the License. --%> diff --git a/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties b/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties index e7ed4df..fc022c5 100644 --- a/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties +++ b/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties @@ -1,12 +1,12 @@ # -# Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. +# Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. # -# WSO2 Inc. licenses this file to you under the Apache License, +# Entgra (Pvt) Ltd. licenses this file to you under the Apache License, # Version 2.0 (the "License"); you may not use this file except # in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an diff --git a/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties b/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties index 28a4dd0..671c690 100644 --- a/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties +++ b/iot-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties @@ -1,12 +1,12 @@ # -# Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. +# Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. # -# WSO2 Inc. licenses this file to you under the Apache License, +# Entgra (Pvt) Ltd. licenses this file to you under the Apache License, # Version 2.0 (the "License"); you may not use this file except # in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an diff --git a/iot-core/src/core/samples/device-plugins-deployer.xml b/iot-core/src/core/samples/device-plugins-deployer.xml index 9e4657b..c3b2455 100644 --- a/iot-core/src/core/samples/device-plugins-deployer.xml +++ b/iot-core/src/core/samples/device-plugins-deployer.xml @@ -1,12 +1,12 @@ - 5.0.26-SNAPSHOT + 5.0.31 5.1.2 1.4.199.wso2v1 - 6.0.17-SNAPSHOT + 6.0.22 2.8.5 From 66a31c8d0f4b1a05ec4797b6d9d4aebcc2030340 Mon Sep 17 00:00:00 2001 From: builder Date: Wed, 25 Oct 2023 16:46:21 +0530 Subject: [PATCH 12/35] [maven-release-plugin] prepare release v5.2.2 --- distribution/iot-community/pom.xml | 2 +- distribution/pom.xml | 2 +- integration-test/pom.xml | 2 +- iot-core/pom.xml | 2 +- p2-profile/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index f6e75fc..60aae0d 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots distribution - 5.2.2-SNAPSHOT + 5.2.2 ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 3d0ae53..62872c3 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.2-SNAPSHOT + 5.2.2 ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 2697e5a..aaef58d 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.2-SNAPSHOT + 5.2.2 ../pom.xml diff --git a/iot-core/pom.xml b/iot-core/pom.xml index 95ef222..b8183dd 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.2-SNAPSHOT + 5.2.2 4.0.0 diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index 31badec..17190fe 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.2-SNAPSHOT + 5.2.2 ../pom.xml diff --git a/pom.xml b/pom.xml index ee4ca70..6496b0c 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.community.iots io.entgra.community.iots.parent pom - 5.2.2-SNAPSHOT + 5.2.2 Entgra Community Product - Parent http://entgra.io Entgra Community Product @@ -344,7 +344,7 @@ https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git - HEAD + v5.2.2 From cd7352e6322f20ae1313b37085ae8524e084d8ac Mon Sep 17 00:00:00 2001 From: builder Date: Wed, 25 Oct 2023 16:46:24 +0530 Subject: [PATCH 13/35] [maven-release-plugin] prepare for next development iteration --- distribution/iot-community/pom.xml | 2 +- distribution/pom.xml | 2 +- integration-test/pom.xml | 2 +- iot-core/pom.xml | 2 +- p2-profile/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index 60aae0d..2bc6408 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots distribution - 5.2.2 + 5.2.3-SNAPSHOT ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 62872c3..c15f414 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.2 + 5.2.3-SNAPSHOT ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index aaef58d..39bd617 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.2 + 5.2.3-SNAPSHOT ../pom.xml diff --git a/iot-core/pom.xml b/iot-core/pom.xml index b8183dd..c6173c2 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.2 + 5.2.3-SNAPSHOT 4.0.0 diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index 17190fe..99e46e0 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.2 + 5.2.3-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 6496b0c..e006891 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.community.iots io.entgra.community.iots.parent pom - 5.2.2 + 5.2.3-SNAPSHOT Entgra Community Product - Parent http://entgra.io Entgra Community Product @@ -344,7 +344,7 @@ https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git - v5.2.2 + HEAD From 683c767e789882f671ea88c16334b116d3982928 Mon Sep 17 00:00:00 2001 From: Thameera Date: Thu, 26 Oct 2023 11:17:07 +0530 Subject: [PATCH 14/35] Bump device-mgt-core and device-mgt-plugins snapshot versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ee4ca70..41ec207 100644 --- a/pom.xml +++ b/pom.xml @@ -323,14 +323,14 @@ entgra-iots-community-${project.version} - 5.0.31 + 5.0.32-SNAPSHOT 5.1.2 1.4.199.wso2v1 - 6.0.22 + 6.0.23-SNAPSHOT 2.8.5 From 45073c2462d7b6a5076af439174fc5f6d280d858 Mon Sep 17 00:00:00 2001 From: Thameera Date: Thu, 9 Nov 2023 07:58:23 +0530 Subject: [PATCH 15/35] Update device-mgt-core and device-mgt-plugins release versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4578162..ed1f1ba 100644 --- a/pom.xml +++ b/pom.xml @@ -323,14 +323,14 @@ entgra-iots-community-${project.version} - 5.0.32-SNAPSHOT + 5.0.32 5.1.2 1.4.199.wso2v1 - 6.0.23-SNAPSHOT + 6.0.23 2.8.5 From 8efea957512ddecfa249a80756afbda38a3415b2 Mon Sep 17 00:00:00 2001 From: builder Date: Thu, 9 Nov 2023 10:36:46 +0530 Subject: [PATCH 16/35] [maven-release-plugin] prepare release v5.2.3 --- distribution/iot-community/pom.xml | 2 +- distribution/pom.xml | 2 +- integration-test/pom.xml | 2 +- iot-core/pom.xml | 2 +- p2-profile/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index 2bc6408..18c8f7f 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots distribution - 5.2.3-SNAPSHOT + 5.2.3 ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index c15f414..45442e0 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.3-SNAPSHOT + 5.2.3 ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 39bd617..009d1b7 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.3-SNAPSHOT + 5.2.3 ../pom.xml diff --git a/iot-core/pom.xml b/iot-core/pom.xml index c6173c2..1843a5f 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.3-SNAPSHOT + 5.2.3 4.0.0 diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index 99e46e0..4d87e12 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.3-SNAPSHOT + 5.2.3 ../pom.xml diff --git a/pom.xml b/pom.xml index ed1f1ba..6e7a9fc 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.community.iots io.entgra.community.iots.parent pom - 5.2.3-SNAPSHOT + 5.2.3 Entgra Community Product - Parent http://entgra.io Entgra Community Product @@ -344,7 +344,7 @@ https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git - HEAD + v5.2.3 From b25aff81c264b4455d2d2ff9d414f2ef7ce1b320 Mon Sep 17 00:00:00 2001 From: builder Date: Thu, 9 Nov 2023 10:36:51 +0530 Subject: [PATCH 17/35] [maven-release-plugin] prepare for next development iteration --- distribution/iot-community/pom.xml | 2 +- distribution/pom.xml | 2 +- integration-test/pom.xml | 2 +- iot-core/pom.xml | 2 +- p2-profile/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index 18c8f7f..60648dd 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots distribution - 5.2.3 + 5.2.4-SNAPSHOT ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 45442e0..a5b9a9c 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.3 + 5.2.4-SNAPSHOT ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 009d1b7..ec8eb2c 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.3 + 5.2.4-SNAPSHOT ../pom.xml diff --git a/iot-core/pom.xml b/iot-core/pom.xml index 1843a5f..a1d35d9 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.3 + 5.2.4-SNAPSHOT 4.0.0 diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index 4d87e12..1e47112 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.3 + 5.2.4-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 6e7a9fc..e24f8a5 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.community.iots io.entgra.community.iots.parent pom - 5.2.3 + 5.2.4-SNAPSHOT Entgra Community Product - Parent http://entgra.io Entgra Community Product @@ -344,7 +344,7 @@ https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git - v5.2.3 + HEAD From 6f3787a41c71ed17eda8f3685f948da0b7763735 Mon Sep 17 00:00:00 2001 From: Pahansith Gunathilake Date: Tue, 12 Dec 2023 03:52:22 +0000 Subject: [PATCH 18/35] Bump dependency versions Signed-off-by: Pahansith Gunathilake --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e24f8a5..e0b27b6 100644 --- a/pom.xml +++ b/pom.xml @@ -323,7 +323,7 @@ entgra-iots-community-${project.version} - 5.0.32 + 5.0.34-SNAPSHOT 5.1.2 From 7ddf7eadf20ee58b04b3cb3587200fc63c9eb7c6 Mon Sep 17 00:00:00 2001 From: Dhanush Thameera Date: Mon, 8 Jan 2024 09:12:35 +0000 Subject: [PATCH 19/35] Update device-mgt-core and device-mgt-plugins release versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e0b27b6..d52c8f5 100644 --- a/pom.xml +++ b/pom.xml @@ -323,14 +323,14 @@ entgra-iots-community-${project.version} - 5.0.34-SNAPSHOT + 5.0.35 5.1.2 1.4.199.wso2v1 - 6.0.23 + 6.0.25 2.8.5 From ae0d6bb7fe6cdd442e8c5ef87f6959cbe8a918c2 Mon Sep 17 00:00:00 2001 From: builder Date: Mon, 8 Jan 2024 15:33:23 +0530 Subject: [PATCH 20/35] [maven-release-plugin] prepare release 5.2.4v --- distribution/iot-community/pom.xml | 2 +- distribution/pom.xml | 2 +- integration-test/pom.xml | 2 +- iot-core/pom.xml | 2 +- p2-profile/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index 60648dd..90f28f8 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots distribution - 5.2.4-SNAPSHOT + 5.2.4 ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index a5b9a9c..e74d1ac 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.4-SNAPSHOT + 5.2.4 ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index ec8eb2c..e2c525c 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.4-SNAPSHOT + 5.2.4 ../pom.xml diff --git a/iot-core/pom.xml b/iot-core/pom.xml index a1d35d9..da34426 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.4-SNAPSHOT + 5.2.4 4.0.0 diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index 1e47112..d961f32 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.4-SNAPSHOT + 5.2.4 ../pom.xml diff --git a/pom.xml b/pom.xml index d52c8f5..b61a8ae 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.community.iots io.entgra.community.iots.parent pom - 5.2.4-SNAPSHOT + 5.2.4 Entgra Community Product - Parent http://entgra.io Entgra Community Product @@ -344,7 +344,7 @@ https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git - HEAD + 5.2.4v From 7446b1ab6ba3e95c1d59c6474cc303fa00a49323 Mon Sep 17 00:00:00 2001 From: builder Date: Mon, 8 Jan 2024 15:33:25 +0530 Subject: [PATCH 21/35] [maven-release-plugin] prepare for next development iteration --- distribution/iot-community/pom.xml | 2 +- distribution/pom.xml | 2 +- integration-test/pom.xml | 2 +- iot-core/pom.xml | 2 +- p2-profile/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index 90f28f8..60aae54 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots distribution - 5.2.4 + 5.2.5-SNAPSHOT ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index e74d1ac..9e50a68 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.4 + 5.2.5-SNAPSHOT ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index e2c525c..2bab6d8 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.4 + 5.2.5-SNAPSHOT ../pom.xml diff --git a/iot-core/pom.xml b/iot-core/pom.xml index da34426..118bdab 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.4 + 5.2.5-SNAPSHOT 4.0.0 diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index d961f32..2278df0 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.4 + 5.2.5-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index b61a8ae..19cbeed 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.community.iots io.entgra.community.iots.parent pom - 5.2.4 + 5.2.5-SNAPSHOT Entgra Community Product - Parent http://entgra.io Entgra Community Product @@ -344,7 +344,7 @@ https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git - 5.2.4v + HEAD From 629186c295dbf002fd190b84ccc00bf89f1aeb16 Mon Sep 17 00:00:00 2001 From: Dhanush Thameera Date: Tue, 9 Jan 2024 15:03:04 +0000 Subject: [PATCH 22/35] Bump device-mgt-core and device-mgt-plugins snapshot versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d52c8f5..6ed8997 100644 --- a/pom.xml +++ b/pom.xml @@ -323,14 +323,14 @@ entgra-iots-community-${project.version} - 5.0.35 + 5.0.36-SNAPSHOT 5.1.2 1.4.199.wso2v1 - 6.0.25 + 6.0.26-SNAPSHOT 2.8.5 From 61a179f70c2cf1e252f44c91971855c850e31440 Mon Sep 17 00:00:00 2001 From: Dhanush Thameera Date: Wed, 10 Jan 2024 09:55:40 +0000 Subject: [PATCH 23/35] Update device-mgt-core and device-mgt-plugins release versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6ed8997..ddb41a6 100644 --- a/pom.xml +++ b/pom.xml @@ -323,14 +323,14 @@ entgra-iots-community-${project.version} - 5.0.36-SNAPSHOT + 5.0.36 5.1.2 1.4.199.wso2v1 - 6.0.26-SNAPSHOT + 6.0.26 2.8.5 From 8375197f280f817a8fba783db4351bab33d38cc2 Mon Sep 17 00:00:00 2001 From: builder Date: Wed, 10 Jan 2024 15:52:20 +0530 Subject: [PATCH 24/35] [maven-release-plugin] prepare release v5.2.5 --- distribution/iot-community/pom.xml | 2 +- distribution/pom.xml | 2 +- integration-test/pom.xml | 2 +- iot-core/pom.xml | 2 +- p2-profile/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index 60aae54..0695f63 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots distribution - 5.2.5-SNAPSHOT + 5.2.5 ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 9e50a68..2feb9b3 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.5-SNAPSHOT + 5.2.5 ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 2bab6d8..1797ca9 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.5-SNAPSHOT + 5.2.5 ../pom.xml diff --git a/iot-core/pom.xml b/iot-core/pom.xml index 118bdab..20724ca 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.5-SNAPSHOT + 5.2.5 4.0.0 diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index 2278df0..a328905 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.5-SNAPSHOT + 5.2.5 ../pom.xml diff --git a/pom.xml b/pom.xml index bad77e2..4b1d15c 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.community.iots io.entgra.community.iots.parent pom - 5.2.5-SNAPSHOT + 5.2.5 Entgra Community Product - Parent http://entgra.io Entgra Community Product @@ -344,7 +344,7 @@ https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git - HEAD + v5.2.5 From 1093356427ef536641f5f5b8e462ede2feee6c2e Mon Sep 17 00:00:00 2001 From: builder Date: Wed, 10 Jan 2024 15:52:22 +0530 Subject: [PATCH 25/35] [maven-release-plugin] prepare for next development iteration --- distribution/iot-community/pom.xml | 2 +- distribution/pom.xml | 2 +- integration-test/pom.xml | 2 +- iot-core/pom.xml | 2 +- p2-profile/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index 0695f63..28ee584 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots distribution - 5.2.5 + 5.2.6-SNAPSHOT ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 2feb9b3..3cb4b18 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.5 + 5.2.6-SNAPSHOT ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 1797ca9..aa21bd1 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.5 + 5.2.6-SNAPSHOT ../pom.xml diff --git a/iot-core/pom.xml b/iot-core/pom.xml index 20724ca..2bb87f3 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.5 + 5.2.6-SNAPSHOT 4.0.0 diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index a328905..7f4c210 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.5 + 5.2.6-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 4b1d15c..2bf4a28 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.community.iots io.entgra.community.iots.parent pom - 5.2.5 + 5.2.6-SNAPSHOT Entgra Community Product - Parent http://entgra.io Entgra Community Product @@ -344,7 +344,7 @@ https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git - v5.2.5 + HEAD From 3cd2e044c81de9fb0c0e2491a1d551b228589946 Mon Sep 17 00:00:00 2001 From: Dhanush Thameera Date: Wed, 10 Jan 2024 16:07:45 +0000 Subject: [PATCH 26/35] Bump device-mgt-core and device-mgt-plugins snapshot versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ddb41a6..ea915fe 100644 --- a/pom.xml +++ b/pom.xml @@ -323,14 +323,14 @@ entgra-iots-community-${project.version} - 5.0.36 + 5.0.37-SNAPSHOT 5.1.2 1.4.199.wso2v1 - 6.0.26 + 6.0.27-SNAPSHOT 2.8.5 From 90803d34b5dc37f37c9bdb6461949c4dce0cbc77 Mon Sep 17 00:00:00 2001 From: Dhanush Thameera Date: Tue, 5 Mar 2024 07:44:01 +0000 Subject: [PATCH 27/35] Update device-mgt-core and device-mgt-plugins release versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 499da49..856d824 100644 --- a/pom.xml +++ b/pom.xml @@ -323,14 +323,14 @@ entgra-iots-community-${project.version} - 5.0.37-SNAPSHOT + 5.0.40 5.1.2 1.4.199.wso2v1 - 6.0.27-SNAPSHOT + 6.0.29 2.8.5 From 8f04d1ef5d56e4bd79f6b3aa3247d705ef61f83f Mon Sep 17 00:00:00 2001 From: builder Date: Tue, 5 Mar 2024 13:30:19 +0530 Subject: [PATCH 28/35] [maven-release-plugin] prepare release v5.2.6 --- distribution/iot-community/pom.xml | 2 +- distribution/pom.xml | 2 +- integration-test/pom.xml | 2 +- iot-core/pom.xml | 2 +- p2-profile/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index 28ee584..f3a116f 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots distribution - 5.2.6-SNAPSHOT + 5.2.6 ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 3cb4b18..c89306d 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.6-SNAPSHOT + 5.2.6 ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index aa21bd1..55df1e9 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.6-SNAPSHOT + 5.2.6 ../pom.xml diff --git a/iot-core/pom.xml b/iot-core/pom.xml index 2bb87f3..e5bbcc7 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.6-SNAPSHOT + 5.2.6 4.0.0 diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index 7f4c210..7ed4181 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.6-SNAPSHOT + 5.2.6 ../pom.xml diff --git a/pom.xml b/pom.xml index 856d824..637dfaf 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.community.iots io.entgra.community.iots.parent pom - 5.2.6-SNAPSHOT + 5.2.6 Entgra Community Product - Parent http://entgra.io Entgra Community Product @@ -344,7 +344,7 @@ https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git - HEAD + v5.2.6 From 5585699e0a8f6ba78786476a7644eead4df6b7db Mon Sep 17 00:00:00 2001 From: builder Date: Tue, 5 Mar 2024 13:30:22 +0530 Subject: [PATCH 29/35] [maven-release-plugin] prepare for next development iteration --- distribution/iot-community/pom.xml | 2 +- distribution/pom.xml | 2 +- integration-test/pom.xml | 2 +- iot-core/pom.xml | 2 +- p2-profile/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index f3a116f..417777d 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots distribution - 5.2.6 + 5.2.7-SNAPSHOT ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index c89306d..782d4a6 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.6 + 5.2.7-SNAPSHOT ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 55df1e9..3ed76b3 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.6 + 5.2.7-SNAPSHOT ../pom.xml diff --git a/iot-core/pom.xml b/iot-core/pom.xml index e5bbcc7..119b449 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.6 + 5.2.7-SNAPSHOT 4.0.0 diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index 7ed4181..f21106e 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.6 + 5.2.7-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 637dfaf..d744d3c 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.community.iots io.entgra.community.iots.parent pom - 5.2.6 + 5.2.7-SNAPSHOT Entgra Community Product - Parent http://entgra.io Entgra Community Product @@ -344,7 +344,7 @@ https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git - v5.2.6 + HEAD From af8213aae092e04ce6c260f3368ea3efb6cd4c41 Mon Sep 17 00:00:00 2001 From: Thameera Date: Thu, 4 Jul 2024 11:58:14 +0530 Subject: [PATCH 30/35] Bump device-mgt-core and device-mgt-plugins release versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d744d3c..29c0925 100644 --- a/pom.xml +++ b/pom.xml @@ -323,14 +323,14 @@ entgra-iots-community-${project.version} - 5.0.40 + 5.1.0 5.1.2 1.4.199.wso2v1 - 6.0.29 + 6.1.0 2.8.5 From 10576259db81a683af9e7b20310901fea525d8b7 Mon Sep 17 00:00:00 2001 From: builder Date: Thu, 4 Jul 2024 12:10:38 +0530 Subject: [PATCH 31/35] [maven-release-plugin] prepare release v5.3.0 --- distribution/iot-community/pom.xml | 2 +- distribution/pom.xml | 2 +- integration-test/pom.xml | 2 +- iot-core/pom.xml | 2 +- p2-profile/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index 417777d..8e683dd 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots distribution - 5.2.7-SNAPSHOT + 5.3.0 ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 782d4a6..d505d80 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.7-SNAPSHOT + 5.3.0 ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 3ed76b3..83f7a2a 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.7-SNAPSHOT + 5.3.0 ../pom.xml diff --git a/iot-core/pom.xml b/iot-core/pom.xml index 119b449..6e168de 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.7-SNAPSHOT + 5.3.0 4.0.0 diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index f21106e..fe091ca 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.2.7-SNAPSHOT + 5.3.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 29c0925..5b1ae74 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.community.iots io.entgra.community.iots.parent pom - 5.2.7-SNAPSHOT + 5.3.0 Entgra Community Product - Parent http://entgra.io Entgra Community Product @@ -344,7 +344,7 @@ https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git - HEAD + v5.3.0 From 26210b216a551c892d88c001028a21c9155644b2 Mon Sep 17 00:00:00 2001 From: builder Date: Thu, 4 Jul 2024 12:10:47 +0530 Subject: [PATCH 32/35] [maven-release-plugin] prepare for next development iteration --- distribution/iot-community/pom.xml | 2 +- distribution/pom.xml | 2 +- integration-test/pom.xml | 2 +- iot-core/pom.xml | 2 +- p2-profile/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index 8e683dd..d0a820e 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots distribution - 5.3.0 + 5.3.1-SNAPSHOT ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index d505d80..967320c 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.3.0 + 5.3.1-SNAPSHOT ../pom.xml diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 83f7a2a..4405cc0 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.3.0 + 5.3.1-SNAPSHOT ../pom.xml diff --git a/iot-core/pom.xml b/iot-core/pom.xml index 6e168de..6aa2aa7 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -21,7 +21,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.3.0 + 5.3.1-SNAPSHOT 4.0.0 diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index fe091ca..8638b38 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -22,7 +22,7 @@ io.entgra.community.iots io.entgra.community.iots.parent - 5.3.0 + 5.3.1-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 5b1ae74..58b54c6 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.community.iots io.entgra.community.iots.parent pom - 5.3.0 + 5.3.1-SNAPSHOT Entgra Community Product - Parent http://entgra.io Entgra Community Product @@ -344,7 +344,7 @@ https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git scm:git:https://repository.entgra.net/community/product-iots-community.git - v5.3.0 + HEAD From 8e9c991a1eb4b841f06a2d462ef512d00586e592 Mon Sep 17 00:00:00 2001 From: Dhanush Thameera Date: Thu, 4 Jul 2024 09:35:23 +0000 Subject: [PATCH 33/35] Bump device-mgt-core and device-mgt-plugins snapshot versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 29c0925..6c2417c 100644 --- a/pom.xml +++ b/pom.xml @@ -323,14 +323,14 @@ entgra-iots-community-${project.version} - 5.1.0 + 5.1.1-SNAPSHOT 5.1.2 1.4.199.wso2v1 - 6.1.0 + 6.1.1-SNAPSHOT 2.8.5 From 66e3f11f4875c19b0bd89757ce686c0e843e2d76 Mon Sep 17 00:00:00 2001 From: tcdlpds Date: Sat, 24 Aug 2024 08:52:46 +0530 Subject: [PATCH 34/35] Fix compilation error --- .../CarbonServerManagerExtension.java | 37 +++++++++++++++---- pom.xml | 4 +- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CarbonServerManagerExtension.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CarbonServerManagerExtension.java index 16c6f1e..e7f1017 100644 --- a/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CarbonServerManagerExtension.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CarbonServerManagerExtension.java @@ -22,8 +22,11 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.DirectoryFileFilter; import org.apache.commons.io.filefilter.RegexFileFilter; import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; import org.wso2.carbon.automation.engine.context.AutomationContext; import org.wso2.carbon.automation.engine.context.beans.User; import org.wso2.carbon.automation.engine.exceptions.AutomationFrameworkException; @@ -39,10 +42,7 @@ import org.wso2.carbon.automation.extensions.servers.utils.ServerLogReader; import javax.xml.xpath.XPathExpressionException; import java.io.File; import java.io.IOException; -import java.util.Collection; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; +import java.util.*; public class CarbonServerManagerExtension { @@ -53,6 +53,7 @@ public class CarbonServerManagerExtension { private ServerLogReader inputStreamHandler; private ServerLogReader errorStreamHandler; private boolean isCoverageEnable = false; + private Set coverageClassesDirectories = new HashSet(); private String coverageDumpFilePath; private int portOffset = 0; private static final String SERVER_SHUTDOWN_MESSAGE = "Halting JVM"; @@ -183,6 +184,7 @@ public class CarbonServerManagerExtension { try { this.isCoverageEnable = Boolean.parseBoolean(this.automationContext.getConfigurationValue("//coverage")); + this.coverageClassesDirectories = this.getCoverageClassesDirectories(this.automationContext); } catch (XPathExpressionException var8) { throw new AutomationFrameworkException("Coverage configuration not found in automation.xml", var8); } @@ -196,6 +198,28 @@ public class CarbonServerManagerExtension { } } + private Set getCoverageClassesDirectories(AutomationContext automationContext) throws XPathExpressionException { + Set coverageDirectories = new HashSet(); + Node configurationNode = automationContext.getConfigurationNode("//coverageClassesRelativeDirectories"); + if (configurationNode != null) { + NodeList childNodes = configurationNode.getChildNodes(); + if (childNodes != null) { + for(int i = 0; i <= childNodes.getLength() - 1; ++i) { + Node node = childNodes.item(i); + if (node != null && "coverageClassesRelativeDirectory".equals(node.getNodeName())) { + coverageDirectories.add(node.getTextContent()); + } + } + } + } else if (StringUtils.isNotEmpty(automationContext.getConfigurationValue("//coverageClassesRelativeDirectory"))) { + coverageDirectories.add(automationContext.getConfigurationValue("//coverageClassesRelativeDirectory")); + } else { + coverageDirectories.add("repository" + File.separator + "components" + File.separator + "plugins" + File.separator); + } + + return coverageDirectories; + } + public synchronized void serverShutdown(int portOffset) throws AutomationFrameworkException { if(this.process != null) { log.info("Shutting down server.."); @@ -235,8 +259,7 @@ public class CarbonServerManagerExtension { if(this.isCoverageEnable) { try { log.info("Generating Jacoco code coverage..."); - this.generateCoverageReport(new File(this.carbonHome + File.separator + "repository" - + File.separator + "components" + File.separator + "plugins" + File.separator)); + this.generateCoverageReport(this.coverageClassesDirectories); } catch (IOException var7) { log.error("Failed to generate code coverage ", var7); throw new AutomationFrameworkException("Failed to generate code coverage ", var7); @@ -250,7 +273,7 @@ public class CarbonServerManagerExtension { } - private void generateCoverageReport(File classesDir) throws IOException, AutomationFrameworkException { + private void generateCoverageReport(Set classesDir) throws IOException, AutomationFrameworkException { checkJacocoDataFileSizes(FrameworkPathUtil.getJacocoCoverageHome()); CodeCoverageUtils.executeMerge(FrameworkPathUtil.getJacocoCoverageHome(), FrameworkPathUtil.getCoverageMergeFilePath()); ReportGenerator reportGenerator = new ReportGenerator(new File(FrameworkPathUtil.getCoverageMergeFilePath()), classesDir, new File(CodeCoverageUtils.getJacocoReportDirectory()), (File)null); diff --git a/pom.xml b/pom.xml index bcf987e..d7b1c54 100644 --- a/pom.xml +++ b/pom.xml @@ -267,14 +267,14 @@ entgra-iots-community-${project.version} - 5.0.26-SNAPSHOT + 5.2.4-SNAPSHOT 5.1.2 2.1.210.wso2v1 - 6.0.17-SNAPSHOT + 6.1.1-SNAPSHOT 2.9.1 From 7bd1e39b0d4856bc714ff6c0ecbd23c25ff1e8ed Mon Sep 17 00:00:00 2001 From: tcdlpds Date: Sat, 24 Aug 2024 08:59:55 +0530 Subject: [PATCH 35/35] Remove wildcard imports --- .../common/extensions/CarbonServerManagerExtension.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CarbonServerManagerExtension.java b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CarbonServerManagerExtension.java index e7f1017..efd3511 100644 --- a/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CarbonServerManagerExtension.java +++ b/integration-test/src/test/java/io/entgra/community/iots/integration/test/common/extensions/CarbonServerManagerExtension.java @@ -42,7 +42,11 @@ import org.wso2.carbon.automation.extensions.servers.utils.ServerLogReader; import javax.xml.xpath.XPathExpressionException; import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; public class CarbonServerManagerExtension {