From 571b16612ce8d8acd4c3b1f7f78b788859065210 Mon Sep 17 00:00:00 2001 From: Minoli de Silva Date: Wed, 18 May 2022 16:34:10 +0530 Subject: [PATCH 1/2] Version upgrade to 6.0.0-m1-SNAPSHOT --- .gitignore | 3 +++ modules/api-resources/api-resources-full/pom.xml | 4 ++-- modules/api-resources/pom.xml | 4 ++-- modules/authenticators/pom.xml | 2 +- modules/callhome/pom.xml | 2 +- modules/connectors/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- modules/features/org.wso2.identity.styles.feature/pom.xml | 2 +- modules/features/org.wso2.identity.ui.feature/pom.xml | 2 +- modules/features/org.wso2.identity.utils.feature/pom.xml | 2 +- modules/features/pom.xml | 2 +- modules/integration/pom.xml | 2 +- modules/integration/tests-common/admin-clients/pom.xml | 2 +- modules/integration/tests-common/extensions/pom.xml | 2 +- .../integration/tests-common/integration-test-utils/pom.xml | 2 +- modules/integration/tests-common/pom.xml | 2 +- modules/integration/tests-common/ui-pages/pom.xml | 2 +- modules/integration/tests-integration/pom.xml | 2 +- modules/integration/tests-integration/tests-backend/pom.xml | 2 +- modules/local-authenticators/pom.xml | 2 +- modules/oauth2-grant-types/pom.xml | 2 +- modules/p2-profile-gen/pom.xml | 2 +- modules/provisioning-connectors/pom.xml | 2 +- modules/social-authenticators/pom.xml | 2 +- modules/styles/pom.xml | 2 +- modules/styles/product/pom.xml | 2 +- modules/tests-utils/admin-services/pom.xml | 2 +- modules/tests-utils/admin-stubs/pom.xml | 2 +- modules/tests-utils/pom.xml | 2 +- pom.xml | 2 +- 30 files changed, 34 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index f891f3c647..df24e61622 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ target *.ipr .idea .DS_Store + +# Ignore version backup files. +*pom.xml.versionsBackup \ No newline at end of file diff --git a/modules/api-resources/api-resources-full/pom.xml b/modules/api-resources/api-resources-full/pom.xml index f3898b9746..cd0dedd4bd 100644 --- a/modules/api-resources/api-resources-full/pom.xml +++ b/modules/api-resources/api-resources-full/pom.xml @@ -23,11 +23,11 @@ org.wso2.is api-resources - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT api-resources-full - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT war WSO2 Identity Server - All Rest API diff --git a/modules/api-resources/pom.xml b/modules/api-resources/pom.xml index 612f2c1e31..5c2436bbcc 100644 --- a/modules/api-resources/pom.xml +++ b/modules/api-resources/pom.xml @@ -23,13 +23,13 @@ org.wso2.is identity-server-parent - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../.. org.wso2.is api-resources - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT pom WSO2 Identity Server - Rest API diff --git a/modules/authenticators/pom.xml b/modules/authenticators/pom.xml index c58154223e..68e83dc85f 100644 --- a/modules/authenticators/pom.xml +++ b/modules/authenticators/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/callhome/pom.xml b/modules/callhome/pom.xml index 6f7b2811a9..ac1394d78d 100644 --- a/modules/callhome/pom.xml +++ b/modules/callhome/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/connectors/pom.xml b/modules/connectors/pom.xml index 973390dd7c..0f80ae493b 100644 --- a/modules/connectors/pom.xml +++ b/modules/connectors/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 9d5e9bbd52..571ba4a34a 100755 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml diff --git a/modules/features/org.wso2.identity.styles.feature/pom.xml b/modules/features/org.wso2.identity.styles.feature/pom.xml index ac0f332dfb..1f8e28922a 100644 --- a/modules/features/org.wso2.identity.styles.feature/pom.xml +++ b/modules/features/org.wso2.identity.styles.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.is identity-features - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../pom.xml diff --git a/modules/features/org.wso2.identity.ui.feature/pom.xml b/modules/features/org.wso2.identity.ui.feature/pom.xml index 62f218b551..79e3301c9e 100644 --- a/modules/features/org.wso2.identity.ui.feature/pom.xml +++ b/modules/features/org.wso2.identity.ui.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.is identity-features - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../pom.xml diff --git a/modules/features/org.wso2.identity.utils.feature/pom.xml b/modules/features/org.wso2.identity.utils.feature/pom.xml index 5ddeff3d81..9e796ba17a 100644 --- a/modules/features/org.wso2.identity.utils.feature/pom.xml +++ b/modules/features/org.wso2.identity.utils.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.is identity-features - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 3494429f0d..06c29d828d 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -17,7 +17,7 @@ org.wso2.is identity-server-parent - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 91416566ec..27a536edb6 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml index c6962e468e..b418d6a430 100644 --- a/modules/integration/tests-common/admin-clients/pom.xml +++ b/modules/integration/tests-common/admin-clients/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/extensions/pom.xml b/modules/integration/tests-common/extensions/pom.xml index 02cb108679..904cbe4db7 100644 --- a/modules/integration/tests-common/extensions/pom.xml +++ b/modules/integration/tests-common/extensions/pom.xml @@ -22,7 +22,7 @@ org.wso2.is identity-integration-tests - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml index d24c38f04c..25143ac03c 100644 --- a/modules/integration/tests-common/integration-test-utils/pom.xml +++ b/modules/integration/tests-common/integration-test-utils/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index 4b5be1e92a..c770948275 100644 --- a/modules/integration/tests-common/pom.xml +++ b/modules/integration/tests-common/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml index 2f61684354..faaac07956 100644 --- a/modules/integration/tests-common/ui-pages/pom.xml +++ b/modules/integration/tests-common/ui-pages/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 26561b29aa..8b7e50e4ea 100644 --- a/modules/integration/tests-integration/pom.xml +++ b/modules/integration/tests-integration/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-integration/tests-backend/pom.xml b/modules/integration/tests-integration/tests-backend/pom.xml index 0dcce6f42f..7e01b30381 100644 --- a/modules/integration/tests-integration/tests-backend/pom.xml +++ b/modules/integration/tests-integration/tests-backend/pom.xml @@ -18,7 +18,7 @@ org.wso2.is identity-integration-tests - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml diff --git a/modules/local-authenticators/pom.xml b/modules/local-authenticators/pom.xml index 32b47c65cd..a00c01caa9 100644 --- a/modules/local-authenticators/pom.xml +++ b/modules/local-authenticators/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/oauth2-grant-types/pom.xml b/modules/oauth2-grant-types/pom.xml index 107b25a493..a78f190020 100644 --- a/modules/oauth2-grant-types/pom.xml +++ b/modules/oauth2-grant-types/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index f77f0f2e54..7e7d28b106 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml diff --git a/modules/provisioning-connectors/pom.xml b/modules/provisioning-connectors/pom.xml index ff1684b16f..c522ea763e 100644 --- a/modules/provisioning-connectors/pom.xml +++ b/modules/provisioning-connectors/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/social-authenticators/pom.xml b/modules/social-authenticators/pom.xml index 0a4c552ec0..a23bd1d599 100644 --- a/modules/social-authenticators/pom.xml +++ b/modules/social-authenticators/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/styles/pom.xml b/modules/styles/pom.xml index 33e105dbe5..cdddd5d1d3 100644 --- a/modules/styles/pom.xml +++ b/modules/styles/pom.xml @@ -20,7 +20,7 @@ org.wso2.is identity-server-parent - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml diff --git a/modules/styles/product/pom.xml b/modules/styles/product/pom.xml index ecdd493bcd..547bf06c72 100644 --- a/modules/styles/product/pom.xml +++ b/modules/styles/product/pom.xml @@ -20,7 +20,7 @@ org.wso2.is identity-server-styles-parent - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../pom.xml diff --git a/modules/tests-utils/admin-services/pom.xml b/modules/tests-utils/admin-services/pom.xml index f0b8dad94b..bc6a5b268d 100644 --- a/modules/tests-utils/admin-services/pom.xml +++ b/modules/tests-utils/admin-services/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests-utils - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../pom.xml diff --git a/modules/tests-utils/admin-stubs/pom.xml b/modules/tests-utils/admin-stubs/pom.xml index aeac73e967..d224c4573a 100644 --- a/modules/tests-utils/admin-stubs/pom.xml +++ b/modules/tests-utils/admin-stubs/pom.xml @@ -21,7 +21,7 @@ org.wso2.is identity-integration-tests-utils - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../pom.xml diff --git a/modules/tests-utils/pom.xml b/modules/tests-utils/pom.xml index 2283dcc9ed..859b77f30a 100644 --- a/modules/tests-utils/pom.xml +++ b/modules/tests-utils/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 7cb81992e7..013653fbea 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ identity-server-parent pom WSO2 Identity Server - 5.12.0-beta4-SNAPSHOT + 6.0.0-m1-SNAPSHOT WSO2 Identity Server http://wso2.org/projects/identity From 54a8eca1003a063e3918a502cbbae5fed4ec1dd7 Mon Sep 17 00:00:00 2001 From: Minoli de Silva Date: Wed, 18 May 2022 16:36:36 +0530 Subject: [PATCH 2/2] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index df24e61622..bb5790994e 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,4 @@ target .DS_Store # Ignore version backup files. -*pom.xml.versionsBackup \ No newline at end of file +*pom.xml.versionsBackup