From c3e8eb87c16475908ddf44dc466bf7fb2a60a749 Mon Sep 17 00:00:00 2001 From: pasindu Date: Tue, 4 Jul 2023 12:03:25 +0530 Subject: [PATCH 01/26] 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 03/26] [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 04/26] [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 05/26] 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 06/26] 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 07/26] [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 08/26] [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 09/26] 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 10/26] 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 11/26] [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 12/26] [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 13/26] 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 14/26] 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 15/26] [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 16/26] [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 17/26] 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 18/26] 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 19/26] [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 20/26] [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 21/26] 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 22/26] [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 23/26] [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 24/26] 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 25/26] 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 26/26] 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 {