From 5489aa95992117f1fb823d6a69cf856399fdc73e Mon Sep 17 00:00:00 2001 From: Vigneshan Date: Mon, 14 Nov 2022 13:56:17 +0000 Subject: [PATCH 1/5] Update key validatation and synapse conf inside deployment.toml --- distribution/emm-community/src/conf/deployment.toml | 6 +++--- iot-core/src/assembly/bin.xml | 3 ++- iot-core/src/core/conf/deployment.toml | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/distribution/emm-community/src/conf/deployment.toml b/distribution/emm-community/src/conf/deployment.toml index d72bae2..84594e5 100644 --- a/distribution/emm-community/src/conf/deployment.toml +++ b/distribution/emm-community/src/conf/deployment.toml @@ -101,7 +101,7 @@ enable = false config_endpoint = "https://localhost:8080/auth/v1" auth_token = "" -#[apim.key_manager] +[apim.key_manager] #service_url = "https://localhost:${mgt.transport.https.port}/services/" #username = "$ref{super_admin.username}" #password = "$ref{super_admin.password}" @@ -109,7 +109,7 @@ auth_token = "" #pool.max_idle = 100 #key_validation_handler_type = "default" #key_validation_handler_type = "custom" -#key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.handlers.DefaultKeyValidationHandler" +key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.extension.KeyValidationHandler" #[apim.idp] #server_url = "https://localhost:${mgt.transport.https.port}" @@ -255,7 +255,7 @@ password = "${admin.password}" 'header.X-WSO2-KEY-MANAGER' = "default" [apim.sync_runtime_artifacts.gateway.skip_list] -apis = ["_TokenAPI_.xml", "_API_Application_Registration_.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml"] +apis = ["_TokenAPI_.xml", "_API_Key_Management_.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml"] sequences = ["_api_registration_fault_.xml"] [transport.https.properties] diff --git a/iot-core/src/assembly/bin.xml b/iot-core/src/assembly/bin.xml index f26ca2b..e270048 100644 --- a/iot-core/src/assembly/bin.xml +++ b/iot-core/src/assembly/bin.xml @@ -95,10 +95,11 @@ ${entgra-iot-core}/repository/components/dropins org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.oauth.extensions + org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.keymgt.extension - \ 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 6887fed..40bd1e2 100644 --- a/iot-core/src/core/conf/deployment.toml +++ b/iot-core/src/core/conf/deployment.toml @@ -104,7 +104,7 @@ enable = false config_endpoint = "https://localhost:8080/auth/v1" auth_token = "" -#[apim.key_manager] +[apim.key_manager] #service_url = "https://localhost:${mgt.transport.https.port}/services/" #username = "$ref{super_admin.username}" #password = "$ref{super_admin.password}" @@ -112,7 +112,7 @@ auth_token = "" #pool.max_idle = 100 #key_validation_handler_type = "default" #key_validation_handler_type = "custom" -#key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.handlers.DefaultKeyValidationHandler" +key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.extension.KeyValidationHandler" #[apim.idp] #server_url = "https://localhost:${mgt.transport.https.port}" @@ -258,7 +258,7 @@ password = "${admin.password}" 'header.X-WSO2-KEY-MANAGER' = "default" [apim.sync_runtime_artifacts.gateway.skip_list] -apis = ["_TokenAPI_.xml", "_API_Application_Registration_.xml", "health-check.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml", "admin--IOS-Enrollment.xml", "admin--IOS-Enrollment-Authenticate-Agent.xml", "admin--IOS-Enrollment-Profile.xml", "admin--IOS-Enrollment-Profile-DEP.xml", "admin--IOS-Enrollment-Scep.xml", "admin--Windows_8.1_Device_Management_Service.xml", "admin--Windows_8.1_Device_Management_Service_v1.0.0.xml", "admin--Windows_8.1_Enrollment_Service.xml", "admin--Windows_8.1_Enrollment_Service_v1.0.0.xml", "admin--Windows_10_Device_management.xml", "admin--Windows_10_Device_management_v1.0.0.xml", "admin--Windows_10_Enrollment_Service.xml", "admin--Windows_10_Enrollment_Service_v1.0.0.xml", "admin--Windows_Discovery_Service.xml", "admin--Windows_Discovery_Service_v1.0.0.xml", "admin--Windows_Enrollment_policy_Service.xml", "admin--Windows_Enrollment_policy_Service_v1.0.0.xml"] +apis = ["_TokenAPI_.xml", "_API_Key_Management_.xml", "health-check.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml", "admin--IOS-Enrollment.xml", "admin--IOS-Enrollment-Authenticate-Agent.xml", "admin--IOS-Enrollment-Profile.xml", "admin--IOS-Enrollment-Profile-DEP.xml", "admin--IOS-Enrollment-Scep.xml", "admin--Windows_8.1_Device_Management_Service.xml", "admin--Windows_8.1_Device_Management_Service_v1.0.0.xml", "admin--Windows_8.1_Enrollment_Service.xml", "admin--Windows_8.1_Enrollment_Service_v1.0.0.xml", "admin--Windows_10_Device_management.xml", "admin--Windows_10_Device_management_v1.0.0.xml", "admin--Windows_10_Enrollment_Service.xml", "admin--Windows_10_Enrollment_Service_v1.0.0.xml", "admin--Windows_Discovery_Service.xml", "admin--Windows_Discovery_Service_v1.0.0.xml", "admin--Windows_Enrollment_policy_Service.xml", "admin--Windows_Enrollment_policy_Service_v1.0.0.xml"] sequences = ["_api_registration_fault_.xml"] [transport.https.properties] From 32a07e9df1d2cf479e09cb93c480875e8d39bcfb Mon Sep 17 00:00:00 2001 From: Pahansith Gunathilake Date: Tue, 15 Nov 2022 04:28:30 +0000 Subject: [PATCH 2/5] bump carbon devicemgt version Signed-off-by: Pahansith Gunathilake --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 683d949..6a62e4a 100644 --- a/pom.xml +++ b/pom.xml @@ -114,14 +114,14 @@ entgra-emm-community-${project.version} - 5.0.13-SNAPSHOT + 5.0.13 5.1.2 1.4.199.wso2v1 - 6.0.7-SNAPSHOT + 6.0.6 From f3d36e79d8c3a26e322d92031327147af82fc18b Mon Sep 17 00:00:00 2001 From: builder Date: Tue, 15 Nov 2022 10:25:21 +0530 Subject: [PATCH 3/5] [maven-release-plugin] prepare release v5.0.0-RC10 --- distribution/emm-community/pom.xml | 2 +- distribution/iot-community/pom.xml | 2 +- distribution/pom.xml | 2 +- iot-core/pom.xml | 2 +- p2-profile/emm/pom.xml | 2 +- p2-profile/iot/pom.xml | 2 +- p2-profile/pom.xml | 2 +- pom.xml | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/distribution/emm-community/pom.xml b/distribution/emm-community/pom.xml index f6f7905..67a0031 100644 --- a/distribution/emm-community/pom.xml +++ b/distribution/emm-community/pom.xml @@ -22,7 +22,7 @@ io.entgra.product.community distribution - 5.0.1-SNAPSHOT + 5.0.0 ../pom.xml diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index 2a5a0cb..6d52822 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -22,7 +22,7 @@ io.entgra.product.community distribution - 5.0.1-SNAPSHOT + 5.0.0 ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index cf94f84..966c016 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,7 +22,7 @@ io.entgra.product.community product-parent - 5.0.1-SNAPSHOT + 5.0.0 4.0.0 diff --git a/iot-core/pom.xml b/iot-core/pom.xml index eb171bf..dc2a68f 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -22,7 +22,7 @@ io.entgra.product.community product-parent - 5.0.1-SNAPSHOT + 5.0.0 4.0.0 diff --git a/p2-profile/emm/pom.xml b/p2-profile/emm/pom.xml index 4f583bc..70e7005 100644 --- a/p2-profile/emm/pom.xml +++ b/p2-profile/emm/pom.xml @@ -22,7 +22,7 @@ io.entgra.product.community p2-profile - 5.0.1-SNAPSHOT + 5.0.0 ../pom.xml diff --git a/p2-profile/iot/pom.xml b/p2-profile/iot/pom.xml index 549086f..23ac032 100644 --- a/p2-profile/iot/pom.xml +++ b/p2-profile/iot/pom.xml @@ -22,7 +22,7 @@ io.entgra.product.community p2-profile - 5.0.1-SNAPSHOT + 5.0.0 ../pom.xml diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index cc05722..b8f57ef 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -22,7 +22,7 @@ io.entgra.product.community product-parent - 5.0.1-SNAPSHOT + 5.0.0 4.0.0 diff --git a/pom.xml b/pom.xml index 6a62e4a..d0d3f71 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.product.community product-parent pom - 5.0.1-SNAPSHOT + 5.0.0 Entgra Community Product - Parent http://entgra.io Entgra Community Product @@ -130,7 +130,7 @@ https://repository.entgra.net/community/community-product.git scm:git:https://repository.entgra.net/community/community-product.git scm:git:https://repository.entgra.net/community/community-product.git - HEAD + v5.0.0-RC10 From 25ecf183015bba16671c783dbab18f278b102b92 Mon Sep 17 00:00:00 2001 From: builder Date: Tue, 15 Nov 2022 10:25:39 +0530 Subject: [PATCH 4/5] [maven-release-plugin] prepare for next development iteration --- distribution/emm-community/pom.xml | 2 +- distribution/iot-community/pom.xml | 2 +- distribution/pom.xml | 2 +- iot-core/pom.xml | 2 +- p2-profile/emm/pom.xml | 2 +- p2-profile/iot/pom.xml | 2 +- p2-profile/pom.xml | 2 +- pom.xml | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/distribution/emm-community/pom.xml b/distribution/emm-community/pom.xml index 67a0031..f6f7905 100644 --- a/distribution/emm-community/pom.xml +++ b/distribution/emm-community/pom.xml @@ -22,7 +22,7 @@ io.entgra.product.community distribution - 5.0.0 + 5.0.1-SNAPSHOT ../pom.xml diff --git a/distribution/iot-community/pom.xml b/distribution/iot-community/pom.xml index 6d52822..2a5a0cb 100644 --- a/distribution/iot-community/pom.xml +++ b/distribution/iot-community/pom.xml @@ -22,7 +22,7 @@ io.entgra.product.community distribution - 5.0.0 + 5.0.1-SNAPSHOT ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 966c016..cf94f84 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -22,7 +22,7 @@ io.entgra.product.community product-parent - 5.0.0 + 5.0.1-SNAPSHOT 4.0.0 diff --git a/iot-core/pom.xml b/iot-core/pom.xml index dc2a68f..eb171bf 100644 --- a/iot-core/pom.xml +++ b/iot-core/pom.xml @@ -22,7 +22,7 @@ io.entgra.product.community product-parent - 5.0.0 + 5.0.1-SNAPSHOT 4.0.0 diff --git a/p2-profile/emm/pom.xml b/p2-profile/emm/pom.xml index 70e7005..4f583bc 100644 --- a/p2-profile/emm/pom.xml +++ b/p2-profile/emm/pom.xml @@ -22,7 +22,7 @@ io.entgra.product.community p2-profile - 5.0.0 + 5.0.1-SNAPSHOT ../pom.xml diff --git a/p2-profile/iot/pom.xml b/p2-profile/iot/pom.xml index 23ac032..549086f 100644 --- a/p2-profile/iot/pom.xml +++ b/p2-profile/iot/pom.xml @@ -22,7 +22,7 @@ io.entgra.product.community p2-profile - 5.0.0 + 5.0.1-SNAPSHOT ../pom.xml diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index b8f57ef..cc05722 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -22,7 +22,7 @@ io.entgra.product.community product-parent - 5.0.0 + 5.0.1-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index d0d3f71..6a62e4a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.product.community product-parent pom - 5.0.0 + 5.0.1-SNAPSHOT Entgra Community Product - Parent http://entgra.io Entgra Community Product @@ -130,7 +130,7 @@ https://repository.entgra.net/community/community-product.git scm:git:https://repository.entgra.net/community/community-product.git scm:git:https://repository.entgra.net/community/community-product.git - v5.0.0-RC10 + HEAD From f1e4a776e09cbb79df5ee9b07539941291c8b522 Mon Sep 17 00:00:00 2001 From: Pahansith Gunathilake Date: Wed, 16 Nov 2022 08:05:03 +0000 Subject: [PATCH 5/5] Bump dependency versions Signed-off-by: Pahansith Gunathilake --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6a62e4a..f762fbe 100644 --- a/pom.xml +++ b/pom.xml @@ -114,14 +114,14 @@ entgra-emm-community-${project.version} - 5.0.13 + 5.0.14-SNAPSHOT 5.1.2 1.4.199.wso2v1 - 6.0.6 + 6.0.7-SNAPSHOT