Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add fixes for rest api version upgrade and component version upgrade #12326

Merged
merged 2 commits into from
Mar 22, 2024
Merged

Add fixes for rest api version upgrade and component version upgrade #12326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f8d6b5
Add fixes for rest api version upgrade
tharikaGitHub Mar 15, 2024
1531e1d
Upgrade component versions for 4.3.0 Alpha2
tharikaGitHub Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<init-param>
<param-name>jaxrs.inInterceptors</param-name>
<param-value>
org.wso2.carbon.apimgt.rest.api.util.interceptors.URLValidationInterceptor(majorVersion=v4 latestVersion=v4.0),
org.wso2.carbon.apimgt.rest.api.util.interceptors.URLValidationInterceptor(majorVersion=v4 latestVersion=v4.1),
org.wso2.carbon.apimgt.rest.api.util.interceptors.auth.TokenMergeInterceptor,
org.wso2.carbon.apimgt.rest.api.util.interceptors.PreAuthenticationInterceptor,
org.wso2.carbon.apimgt.rest.api.util.interceptors.auth.OAuthAuthenticationInterceptor,
Expand Down
2 changes: 1 addition & 1 deletion components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/src/main/resources/devops-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
################################################################################
openapi: 3.0.1
info:
version: v0.1
version: v0.2
title: WSO2 API Manager - DevOps
description: |
This document specifies a **RESTful API** for WSO2 **API Manager** - DevOps.
Expand Down
2 changes: 1 addition & 1 deletion components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<init-param>
<param-name>jaxrs.inInterceptors</param-name>
<param-value>
org.wso2.carbon.apimgt.rest.api.util.interceptors.URLValidationInterceptor(majorVersion=v2 latestVersion=v2.2),
org.wso2.carbon.apimgt.rest.api.util.interceptors.URLValidationInterceptor(majorVersion=v2 latestVersion=v2.3),
org.wso2.carbon.apimgt.rest.api.util.interceptors.auth.TokenMergeInterceptor,
org.wso2.carbon.apimgt.rest.api.util.interceptors.PreAuthenticationInterceptor,
org.wso2.carbon.apimgt.rest.api.util.interceptors.auth.OAuthAuthenticationInterceptor,
Expand Down
2 changes: 1 addition & 1 deletion ...apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6626,7 +6626,7 @@ paths:
x-code-samples:
- lang: Curl
source: 'curl -k -X POST -H "Authorization: Bearer ae4eae22-3f65-387b-a171-d37eaa366fa8"
"https://127.0.0.1:9443/api/am/publisher/v4/api-products/copy-api-products?newVersion=2.0&defaultVersion=false&apiproductId=2fd14eb8-b828-4013-b448-0739d2e76bf7"'
"https://127.0.0.1:9443/api/am/publisher/v4/api-products/copy-api-products?newVersion=2.0&defaultVersion=false&apiProductId=2fd14eb8-b828-4013-b448-0739d2e76bf7"'
operationId: createNewAPIProductVersion

/api-products/export:
Expand Down
2 changes: 1 addition & 1 deletion ...nents/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<init-param>
<param-name>jaxrs.inInterceptors</param-name>
<param-value>
org.wso2.carbon.apimgt.rest.api.util.interceptors.URLValidationInterceptor(majorVersion=v4 latestVersion=v4.0),
org.wso2.carbon.apimgt.rest.api.util.interceptors.URLValidationInterceptor(majorVersion=v4 latestVersion=v4.1),
org.wso2.carbon.apimgt.rest.api.util.interceptors.auth.TokenMergeInterceptor,
org.wso2.carbon.apimgt.rest.api.util.interceptors.PreAuthenticationInterceptor,
org.wso2.carbon.apimgt.rest.api.util.interceptors.auth.OAuthAuthenticationInterceptor,
Expand Down
2 changes: 1 addition & 1 deletion components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<init-param>
<param-name>jaxrs.inInterceptors</param-name>
<param-value>
org.wso2.carbon.apimgt.rest.api.util.interceptors.URLValidationInterceptor(majorVersion=v3 latestVersion=v3.0),
org.wso2.carbon.apimgt.rest.api.util.interceptors.URLValidationInterceptor(majorVersion=v3 latestVersion=v3.1),
org.wso2.carbon.apimgt.rest.api.util.interceptors.auth.TokenMergeInterceptor,
org.wso2.carbon.apimgt.rest.api.util.interceptors.PreAuthenticationInterceptor,
org.wso2.carbon.apimgt.rest.api.util.interceptors.auth.OAuthAuthenticationInterceptor,
Expand Down
20 changes: 10 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2022,23 +2022,23 @@
<carbon.apimgt.version>9.29.71-SNAPSHOT</carbon.apimgt.version>
<carbon.apimgt.imp.pkg.version>[9.0.0, 10.0.0)</carbon.apimgt.imp.pkg.version>

<carbon.analytics.common.version>5.3.10</carbon.analytics.common.version>
<carbon.analytics.common.version>5.3.11</carbon.analytics.common.version>
<!-- Carbon kernel version -->
<carbon.kernel.version>4.9.26-alpha2</carbon.kernel.version>
<carbon.kernel.version>4.9.26-alpha3</carbon.kernel.version>
<carbon.kernel.feature.version>${carbon.kernel.version}</carbon.kernel.feature.version>
<carbon.kernel.package.import.version.range>[4.5.0, 5.0.0)</carbon.kernel.package.import.version.range>

<carbon.commons.version>4.10.3</carbon.commons.version>

<carbon.registry.version>4.8.29</carbon.registry.version>
<carbon.mediation.version>4.7.199</carbon.mediation.version>
<carbon.registry.version>4.8.30</carbon.registry.version>
<carbon.mediation.version>4.7.200</carbon.mediation.version>

<mongodb.driver.version>4.1.0</mongodb.driver.version>

<!-- Carbon Identity versions -->
<carbon.identity.version>5.25.694</carbon.identity.version>
<carbon.identity.version>5.25.698</carbon.identity.version>
<carbon.identity.governance.version>1.8.107</carbon.identity.governance.version>
<carbon.identity-inbound-auth-oauth.version>6.13.9</carbon.identity-inbound-auth-oauth.version>
<carbon.identity-inbound-auth-oauth.version>6.13.12</carbon.identity-inbound-auth-oauth.version>
<carbon.identity-oauth2-grant-jwt.version>2.2.4</carbon.identity-oauth2-grant-jwt.version>
<carbon.identity-user-ws.version>5.7.5</carbon.identity-user-ws.version>
<carbon.identity-data-publisher-application-authentication.version>5.6.8</carbon.identity-data-publisher-application-authentication.version>
Expand All @@ -2052,7 +2052,7 @@

<carbon.governance.version>4.8.33</carbon.governance.version>
<carbon.deployment.version>4.11.13</carbon.deployment.version>
<carbon.multitenancy.version>4.9.23</carbon.multitenancy.version>
<carbon.multitenancy.version>4.9.25</carbon.multitenancy.version>
<wso2-uri-templates.version>1.6.5</wso2-uri-templates.version>
<apimserver.version>1.10.0</apimserver.version>
<siddhi.version>3.2.13</siddhi.version>
Expand Down Expand Up @@ -2087,12 +2087,12 @@
<axis2-java2wsdl-maven-plugin.version>1.6.3</axis2-java2wsdl-maven-plugin.version>

<!-- Axis2 Version -->
<axis2.wso2.version>1.6.1-wso2v85</axis2.wso2.version>
<axis2.wso2.version>1.6.1-wso2v98</axis2.wso2.version>
<axis2.osgi.version.range>[1.6.1, 1.7.0)</axis2.osgi.version.range>

<!-- Apache Axiom -->
<orbit.version.axiom>${axiom.wso2.version}</orbit.version.axiom>
<axiom.wso2.version>1.2.11-wso2v25</axiom.wso2.version>
<axiom.wso2.version>1.2.11-wso2v29</axiom.wso2.version>
<exp.pkg.version.axiom>${axiom.wso2.version}</exp.pkg.version.axiom>
<imp.pkg.version.axiom>[1.2.11, 1.3.0)</imp.pkg.version.axiom>
<axiom.osgi.version.range>[1.2.11, 1.3.0)</axiom.osgi.version.range>
Expand All @@ -2111,7 +2111,7 @@
<imp.package.version.osgi.framework>[1.6.0, 2.0.0)</imp.package.version.osgi.framework>

<!-- Misc Versions -->
<synapse.version>4.0.0-wso2v94</synapse.version>
<synapse.version>4.0.0-wso2v99</synapse.version>
<orbit.version.json>3.0.0.wso2v1</orbit.version.json>

<!-- orbit httpmime versions-->
Expand Down
Loading