Skip to content

Commit

Permalink
Merge branch 'wso2:master' into Integration-test-for-API-Key-authenti…
Browse files Browse the repository at this point in the history 
…cation-for-WebSocket-API-1
  • Loading branch information
@thisaltennakoon
thisaltennakoon committed Feb 26, 2024
2 parents 3fa3f8e + 82f93ff commit b5e81c4
Show file tree
Hide file tree
Showing 40 changed files with 42 additions and 41 deletions.
2 changes: 1 addition & 1 deletion modules/callhome/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>am-parent</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>am-parent</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/distribution/product/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>am-distribution-parent</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/distribution/product/src/main/resources/conf/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"server.send_stacktrace_details_with_faults": false,
"server.drill_down_to_root_cause_for_fault_reason": false,
"identity.data_source": "jdbc/WSO2AM_DB",
"database.apim_db.url": "jdbc:h2:./repository/database/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;LOCK_TIMEOUT=60000",
"database.apim_db.url": "jdbc:h2:./repository/database/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000",
"database.apim_db.driver": "org.h2.Driver",
"database.mb.store_db.url": "jdbc:h2:./repository/database/WSO2MB_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000",
"database.mb.store_db.driver": "org.h2.Driver",
Expand Down
2 changes: 1 addition & 1 deletion modules/features/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>am-parent</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/features/product/org.wso2.am.multitenancy.dashboard.ui.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>am-features</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/features/product/org.wso2.am.security.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>am-features</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/features/product/org.wso2.am.styles.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>am-features</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/features/product/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>am-features-parent</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>am-parent</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/admin-clients/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>tests-common</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/backend-service/jaxrs-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ under the License.
<parent>
<artifactId>test-artifacts</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/backend-service/monitor-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ under the License.
<parent>
<artifactId>test-artifacts</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/backend-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ under the License.
<parent>
<artifactId>tests-common</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/clients/admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>org.wso2.am.integration.clients</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/clients/gateway/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>org.wso2.am.integration.clients</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/clients/internal-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>org.wso2.am.integration.clients</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/clients/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>tests-common</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/clients/publisher/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>org.wso2.am.integration.clients</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/clients/service-catalog/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>org.wso2.am.integration.clients</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/clients/store/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>org.wso2.am.integration.clients</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/extenstions/org.wso2.am.thirdparty.km/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>extenstions</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/extenstions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>tests-common</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/framework-extensions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>tests-common</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions modules/integration/tests-common/integration-test-extensions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ under the License.
<parent>
<artifactId>tests-common</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -35,7 +35,7 @@ under the License.
<dependency>
<groupId>org.wso2.am</groupId>
<artifactId>org.wso2.am.framework.extensions</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.wso2.am</groupId>
Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/integration-test-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ under the License.
<parent>
<artifactId>tests-common</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ under the License.
<parent>
<artifactId>integration</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/ui-pages/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ under the License.
<parent>
<artifactId>tests-common</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ under the License.
<parent>
<artifactId>integration</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-integration/tests-backend/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ under the License.
<parent>
<artifactId>org.wso2.carbon.am.integration.test</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
1 change: 1 addition & 0 deletions ...src/test/java/org/wso2/am/integration/tests/other/MandatoryPropertiesTestWithRestart.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,6 @@ public void testCreateAnAPIThroughThePublisherRestWithMandatoryProperties() thro
public void destroy() throws Exception {
serverConfigurationManager.restoreToLastConfiguration();
restAPIPublisher.deleteAPI(apiId);
super.cleanUp();
}
}
2 changes: 1 addition & 1 deletion modules/local-authenticators/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>am-parent</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/oauth2-grant-types/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>am-parent</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/org.wso2.am.multitenancy.dashboard.ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>am-parent</artifactId>
<groupId>org.wso2.am</groupId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/p2-profile/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>am-parent</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/p2-profile/product/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>am-p2-profile-gen-parent</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/styles/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>am-parent</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/styles/product/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>am-styles-parent</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/styles/service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.am</groupId>
<artifactId>am-styles-parent</artifactId>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<groupId>org.wso2.am</groupId>
<artifactId>am-parent</artifactId>
<packaging>pom</packaging>
<version>4.3.1-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
<name>WSO2 API Manager - Aggregator Module</name>
<url>https://wso2.com/products/api-manager</url>
<description>WSO2 API Manager</description>
Expand Down Expand Up @@ -1309,7 +1309,7 @@

<!--carbon versions-->
<carbon.kernel.version>4.9.26-alpha1</carbon.kernel.version>
<apimserver.version>4.3.1-SNAPSHOT</apimserver.version>
<apimserver.version>4.3.0-SNAPSHOT</apimserver.version>

<cipher.tool.version>1.1.20</cipher.tool.version>

Expand Down

0 comments on commit b5e81c4

Please sign in to comment.