From 0fdc2626d99c9926547a53f94308551591646d55 Mon Sep 17 00:00:00 2001 From: Naduni Pamudika Date: Wed, 31 Jan 2024 14:50:23 +0530 Subject: [PATCH 1/4] Upgrade synapse version --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 1a95abc150..a1eba06b03 100644 --- a/pom.xml +++ b/pom.xml @@ -1360,7 +1360,9 @@ 1.8 3.0-FINAL 1.0.0.M8-wso2v1 + 4.0.0-wso2v87 + 1.0.2 1.6.1-wso2v85 1.2.11-wso2v25 From 26013ecfd9f4833687da5e0919b65452d5f20d83 Mon Sep 17 00:00:00 2001 From: Naduni Pamudika Date: Wed, 31 Jan 2024 15:12:22 +0530 Subject: [PATCH 2/4] Add the restart and backend test modules back --- modules/integration/tests-integration/pom.xml | 4 ++-- .../tests/other/MandatoryPropertiesTestWithRestart.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 5fa1c11982..6bdd93fe5f 100644 --- a/modules/integration/tests-integration/pom.xml +++ b/modules/integration/tests-integration/pom.xml @@ -31,9 +31,9 @@ under the License. pom - + tests-benchmark tests-backend - + tests-restart diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/MandatoryPropertiesTestWithRestart.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/MandatoryPropertiesTestWithRestart.java index 2019c75e6c..8eba2050d6 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/MandatoryPropertiesTestWithRestart.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/MandatoryPropertiesTestWithRestart.java @@ -141,5 +141,6 @@ public void testCreateAnAPIThroughThePublisherRestWithMandatoryProperties() thro public void destroy() throws Exception { serverConfigurationManager.restoreToLastConfiguration(); restAPIPublisher.deleteAPI(apiId); + super.cleanUp(); } } \ No newline at end of file From e9e88e74e8ea10e620f90100b0a88bfc516096ed Mon Sep 17 00:00:00 2001 From: Naduni Pamudika Date: Thu, 1 Feb 2024 12:42:32 +0530 Subject: [PATCH 3/4] Revert synapse bump --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1eba06b03..fed2b23a65 100644 --- a/pom.xml +++ b/pom.xml @@ -1362,7 +1362,6 @@ 1.0.0.M8-wso2v1 4.0.0-wso2v87 - 1.0.2 1.6.1-wso2v85 1.2.11-wso2v25 From 8b71bbf9548f03a6ff71cc258e290f0c9ff3b06b Mon Sep 17 00:00:00 2001 From: Naduni Pamudika Date: Tue, 20 Feb 2024 15:29:39 +0530 Subject: [PATCH 4/4] Change the SNAPSHOT version in pom files --- modules/callhome/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- modules/distribution/product/pom.xml | 2 +- modules/features/pom.xml | 2 +- .../org.wso2.am.multitenancy.dashboard.ui.feature/pom.xml | 2 +- .../features/product/org.wso2.am.security.feature/pom.xml | 2 +- modules/features/product/org.wso2.am.styles.feature/pom.xml | 2 +- modules/features/product/pom.xml | 2 +- modules/integration/pom.xml | 2 +- modules/integration/tests-common/admin-clients/pom.xml | 2 +- .../tests-common/backend-service/jaxrs-app/pom.xml | 2 +- .../tests-common/backend-service/monitor-app/pom.xml | 2 +- modules/integration/tests-common/backend-service/pom.xml | 2 +- modules/integration/tests-common/clients/admin/pom.xml | 2 +- modules/integration/tests-common/clients/gateway/pom.xml | 2 +- .../integration/tests-common/clients/internal-api/pom.xml | 2 +- modules/integration/tests-common/clients/pom.xml | 2 +- modules/integration/tests-common/clients/publisher/pom.xml | 2 +- .../tests-common/clients/service-catalog/pom.xml | 2 +- modules/integration/tests-common/clients/store/pom.xml | 2 +- .../extenstions/org.wso2.am.thirdparty.km/pom.xml | 2 +- modules/integration/tests-common/extenstions/pom.xml | 2 +- .../integration/tests-common/framework-extensions/pom.xml | 2 +- .../tests-common/integration-test-extensions/pom.xml | 4 ++-- .../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 | 6 +++--- modules/integration/tests-integration/tests-backend/pom.xml | 2 +- modules/local-authenticators/pom.xml | 2 +- modules/oauth2-grant-types/pom.xml | 2 +- modules/org.wso2.am.multitenancy.dashboard.ui/pom.xml | 2 +- modules/p2-profile/pom.xml | 2 +- modules/p2-profile/product/pom.xml | 2 +- modules/styles/pom.xml | 2 +- modules/styles/product/pom.xml | 2 +- modules/styles/service/pom.xml | 2 +- pom.xml | 5 ++--- 38 files changed, 42 insertions(+), 43 deletions(-) diff --git a/modules/callhome/pom.xml b/modules/callhome/pom.xml index 89955aa48e..0694f86489 100644 --- a/modules/callhome/pom.xml +++ b/modules/callhome/pom.xml @@ -19,7 +19,7 @@ org.wso2.am am-parent - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index dd801d4ff5..8ea857a77a 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.wso2.am am-parent - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/product/pom.xml b/modules/distribution/product/pom.xml index 91bb7839e3..3a29b1f6e4 100644 --- a/modules/distribution/product/pom.xml +++ b/modules/distribution/product/pom.xml @@ -22,7 +22,7 @@ org.wso2.am am-distribution-parent - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 5ba6ac58a5..c97467c710 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.wso2.am am-parent - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/modules/features/product/org.wso2.am.multitenancy.dashboard.ui.feature/pom.xml b/modules/features/product/org.wso2.am.multitenancy.dashboard.ui.feature/pom.xml index db67b5dc75..8d59879e51 100644 --- a/modules/features/product/org.wso2.am.multitenancy.dashboard.ui.feature/pom.xml +++ b/modules/features/product/org.wso2.am.multitenancy.dashboard.ui.feature/pom.xml @@ -3,7 +3,7 @@ am-features org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/modules/features/product/org.wso2.am.security.feature/pom.xml b/modules/features/product/org.wso2.am.security.feature/pom.xml index 96460ad6d5..51df559bf5 100644 --- a/modules/features/product/org.wso2.am.security.feature/pom.xml +++ b/modules/features/product/org.wso2.am.security.feature/pom.xml @@ -20,7 +20,7 @@ am-features org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/modules/features/product/org.wso2.am.styles.feature/pom.xml b/modules/features/product/org.wso2.am.styles.feature/pom.xml index b3c3ce7633..96a19f2d2f 100644 --- a/modules/features/product/org.wso2.am.styles.feature/pom.xml +++ b/modules/features/product/org.wso2.am.styles.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.am am-features - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/modules/features/product/pom.xml b/modules/features/product/pom.xml index abaf0eb12e..e13b9a9cb9 100644 --- a/modules/features/product/pom.xml +++ b/modules/features/product/pom.xml @@ -22,7 +22,7 @@ org.wso2.am am-features-parent - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 752b677c77..d0fdd3167b 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -4,7 +4,7 @@ org.wso2.am am-parent - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml index 5330fe592a..a0949f7141 100644 --- a/modules/integration/tests-common/admin-clients/pom.xml +++ b/modules/integration/tests-common/admin-clients/pom.xml @@ -21,7 +21,7 @@ under the License. tests-common org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/backend-service/jaxrs-app/pom.xml b/modules/integration/tests-common/backend-service/jaxrs-app/pom.xml index 071f7c9e7c..478bc82a9f 100644 --- a/modules/integration/tests-common/backend-service/jaxrs-app/pom.xml +++ b/modules/integration/tests-common/backend-service/jaxrs-app/pom.xml @@ -18,7 +18,7 @@ under the License. test-artifacts org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/backend-service/monitor-app/pom.xml b/modules/integration/tests-common/backend-service/monitor-app/pom.xml index 5f05c5d24d..6826fd5988 100644 --- a/modules/integration/tests-common/backend-service/monitor-app/pom.xml +++ b/modules/integration/tests-common/backend-service/monitor-app/pom.xml @@ -18,7 +18,7 @@ under the License. test-artifacts org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/backend-service/pom.xml b/modules/integration/tests-common/backend-service/pom.xml index 7fa4e381f1..9851625711 100644 --- a/modules/integration/tests-common/backend-service/pom.xml +++ b/modules/integration/tests-common/backend-service/pom.xml @@ -18,7 +18,7 @@ under the License. tests-common org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/clients/admin/pom.xml b/modules/integration/tests-common/clients/admin/pom.xml index 26065d45f3..9005d08929 100644 --- a/modules/integration/tests-common/clients/admin/pom.xml +++ b/modules/integration/tests-common/clients/admin/pom.xml @@ -18,7 +18,7 @@ org.wso2.am org.wso2.am.integration.clients - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT 4.0.0 diff --git a/modules/integration/tests-common/clients/gateway/pom.xml b/modules/integration/tests-common/clients/gateway/pom.xml index 95e998bc3d..4356e8d1ee 100644 --- a/modules/integration/tests-common/clients/gateway/pom.xml +++ b/modules/integration/tests-common/clients/gateway/pom.xml @@ -18,7 +18,7 @@ org.wso2.am org.wso2.am.integration.clients - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT 4.0.0 diff --git a/modules/integration/tests-common/clients/internal-api/pom.xml b/modules/integration/tests-common/clients/internal-api/pom.xml index f3d168540b..a2d2f88630 100644 --- a/modules/integration/tests-common/clients/internal-api/pom.xml +++ b/modules/integration/tests-common/clients/internal-api/pom.xml @@ -18,7 +18,7 @@ org.wso2.am org.wso2.am.integration.clients - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT 4.0.0 diff --git a/modules/integration/tests-common/clients/pom.xml b/modules/integration/tests-common/clients/pom.xml index 119a16478d..a4e569eb1b 100644 --- a/modules/integration/tests-common/clients/pom.xml +++ b/modules/integration/tests-common/clients/pom.xml @@ -16,7 +16,7 @@ tests-common org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/clients/publisher/pom.xml b/modules/integration/tests-common/clients/publisher/pom.xml index 6c45651ad8..d696641847 100644 --- a/modules/integration/tests-common/clients/publisher/pom.xml +++ b/modules/integration/tests-common/clients/publisher/pom.xml @@ -18,7 +18,7 @@ org.wso2.am org.wso2.am.integration.clients - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT 4.0.0 diff --git a/modules/integration/tests-common/clients/service-catalog/pom.xml b/modules/integration/tests-common/clients/service-catalog/pom.xml index 5a1976f3f6..1f503b0778 100644 --- a/modules/integration/tests-common/clients/service-catalog/pom.xml +++ b/modules/integration/tests-common/clients/service-catalog/pom.xml @@ -18,7 +18,7 @@ org.wso2.am org.wso2.am.integration.clients - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT 4.0.0 diff --git a/modules/integration/tests-common/clients/store/pom.xml b/modules/integration/tests-common/clients/store/pom.xml index 2c54debae8..9177a6c7cb 100644 --- a/modules/integration/tests-common/clients/store/pom.xml +++ b/modules/integration/tests-common/clients/store/pom.xml @@ -18,7 +18,7 @@ org.wso2.am org.wso2.am.integration.clients - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT 4.0.0 diff --git a/modules/integration/tests-common/extenstions/org.wso2.am.thirdparty.km/pom.xml b/modules/integration/tests-common/extenstions/org.wso2.am.thirdparty.km/pom.xml index 8b1c240c64..62ac49ae79 100644 --- a/modules/integration/tests-common/extenstions/org.wso2.am.thirdparty.km/pom.xml +++ b/modules/integration/tests-common/extenstions/org.wso2.am.thirdparty.km/pom.xml @@ -3,7 +3,7 @@ org.wso2.am extenstions - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/modules/integration/tests-common/extenstions/pom.xml b/modules/integration/tests-common/extenstions/pom.xml index b228f8c02f..a560d37511 100644 --- a/modules/integration/tests-common/extenstions/pom.xml +++ b/modules/integration/tests-common/extenstions/pom.xml @@ -3,7 +3,7 @@ tests-common org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/modules/integration/tests-common/framework-extensions/pom.xml b/modules/integration/tests-common/framework-extensions/pom.xml index eeba2948e4..4eeb970fbb 100644 --- a/modules/integration/tests-common/framework-extensions/pom.xml +++ b/modules/integration/tests-common/framework-extensions/pom.xml @@ -23,7 +23,7 @@ tests-common org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/integration-test-extensions/pom.xml b/modules/integration/tests-common/integration-test-extensions/pom.xml index b761286638..2fd7ed0bce 100644 --- a/modules/integration/tests-common/integration-test-extensions/pom.xml +++ b/modules/integration/tests-common/integration-test-extensions/pom.xml @@ -18,7 +18,7 @@ under the License. tests-common org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml @@ -35,7 +35,7 @@ under the License. org.wso2.am org.wso2.am.framework.extensions - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT org.wso2.am diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml index 2adbb838ab..8d73f55015 100644 --- a/modules/integration/tests-common/integration-test-utils/pom.xml +++ b/modules/integration/tests-common/integration-test-utils/pom.xml @@ -20,7 +20,7 @@ under the License. tests-common org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index c1b6bdb04c..255dd47d1f 100644 --- a/modules/integration/tests-common/pom.xml +++ b/modules/integration/tests-common/pom.xml @@ -20,7 +20,7 @@ under the License. integration org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml index 203f7242c5..d36705ceab 100644 --- a/modules/integration/tests-common/ui-pages/pom.xml +++ b/modules/integration/tests-common/ui-pages/pom.xml @@ -20,7 +20,7 @@ under the License. tests-common org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 6bdd93fe5f..f4c17a4ee9 100644 --- a/modules/integration/tests-integration/pom.xml +++ b/modules/integration/tests-integration/pom.xml @@ -21,7 +21,7 @@ under the License. integration org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml @@ -31,9 +31,9 @@ under the License. pom - tests-benchmark + tests-backend - tests-restart + diff --git a/modules/integration/tests-integration/tests-backend/pom.xml b/modules/integration/tests-integration/tests-backend/pom.xml index a3d6f9ddb4..d4f452eaa4 100644 --- a/modules/integration/tests-integration/tests-backend/pom.xml +++ b/modules/integration/tests-integration/tests-backend/pom.xml @@ -20,7 +20,7 @@ under the License. org.wso2.carbon.am.integration.test org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/modules/local-authenticators/pom.xml b/modules/local-authenticators/pom.xml index fdd97109e0..27c50eeba8 100644 --- a/modules/local-authenticators/pom.xml +++ b/modules/local-authenticators/pom.xml @@ -19,7 +19,7 @@ org.wso2.am am-parent - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/oauth2-grant-types/pom.xml b/modules/oauth2-grant-types/pom.xml index c66da064af..33f36be380 100644 --- a/modules/oauth2-grant-types/pom.xml +++ b/modules/oauth2-grant-types/pom.xml @@ -19,7 +19,7 @@ org.wso2.am am-parent - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/modules/org.wso2.am.multitenancy.dashboard.ui/pom.xml b/modules/org.wso2.am.multitenancy.dashboard.ui/pom.xml index fc9cd9f725..a520f46764 100644 --- a/modules/org.wso2.am.multitenancy.dashboard.ui/pom.xml +++ b/modules/org.wso2.am.multitenancy.dashboard.ui/pom.xml @@ -3,7 +3,7 @@ am-parent org.wso2.am - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index 5e93d3116e..1705966f3f 100644 --- a/modules/p2-profile/pom.xml +++ b/modules/p2-profile/pom.xml @@ -22,7 +22,7 @@ org.wso2.am am-parent - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/modules/p2-profile/product/pom.xml b/modules/p2-profile/product/pom.xml index 0c104a9c11..2b35f28d36 100644 --- a/modules/p2-profile/product/pom.xml +++ b/modules/p2-profile/product/pom.xml @@ -20,7 +20,7 @@ org.wso2.am am-p2-profile-gen-parent - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/modules/styles/pom.xml b/modules/styles/pom.xml index 0bf92b68ec..8bc075433b 100644 --- a/modules/styles/pom.xml +++ b/modules/styles/pom.xml @@ -22,7 +22,7 @@ org.wso2.am am-parent - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/modules/styles/product/pom.xml b/modules/styles/product/pom.xml index 413ca5d52e..82c39a4cbf 100644 --- a/modules/styles/product/pom.xml +++ b/modules/styles/product/pom.xml @@ -23,7 +23,7 @@ org.wso2.am am-styles-parent - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/modules/styles/service/pom.xml b/modules/styles/service/pom.xml index f1fb11c085..13b34654d1 100644 --- a/modules/styles/service/pom.xml +++ b/modules/styles/service/pom.xml @@ -20,7 +20,7 @@ org.wso2.am am-styles-parent - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index fed2b23a65..15282eebaf 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.wso2.am am-parent pom - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT WSO2 API Manager - Aggregator Module https://wso2.com/products/api-manager WSO2 API Manager @@ -1309,7 +1309,7 @@ 4.9.26-alpha1 - 4.3.1-SNAPSHOT + 4.3.0-SNAPSHOT 1.1.20 @@ -1360,7 +1360,6 @@ 1.8 3.0-FINAL 1.0.0.M8-wso2v1 - 4.0.0-wso2v87 1.0.2 1.6.1-wso2v85