From c97e43f90a5deed66df4cca8b5eb0ff39220054d Mon Sep 17 00:00:00 2001
From: sandushi <sandushidileka2@gmail.com>
Date: Fri, 1 Nov 2024 00:26:26 +0530
Subject: [PATCH 01/45] Fix missing claims for federated users for jwt token
issuers
---
.../oauth/cache/AuthorizationGrantCache.java | 20 ++-
.../cache/AuthorizationGrantCacheTest.java | 145 ++++++++++++++++++
.../src/test/resources/testng.xml | 2 +
3 files changed, 162 insertions(+), 5 deletions(-)
create mode 100644 components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCache.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCache.java
index 89164caa086..7c82850969d 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCache.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCache.java
@@ -18,6 +18,8 @@
package org.wso2.carbon.identity.oauth.cache;
+import com.nimbusds.jwt.JWT;
+import com.nimbusds.jwt.JWTParser;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
@@ -29,10 +31,10 @@
import org.wso2.carbon.identity.oauth.config.OAuthServerConfiguration;
import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
import org.wso2.carbon.identity.oauth2.dao.OAuthTokenPersistenceFactory;
-import org.wso2.carbon.identity.oauth2.model.AccessTokenDO;
import org.wso2.carbon.identity.oauth2.util.OAuth2Util;
import org.wso2.carbon.utils.CarbonUtils;
+import java.text.ParseException;
import java.util.concurrent.TimeUnit;
/**
@@ -237,11 +239,19 @@ private String replaceFromCodeId(String authzCode) {
* @return TOKEN_ID from the database
*/
private String replaceFromTokenId(String keyValue) {
- try {
- AccessTokenDO accessTokenDO = OAuth2Util.findAccessToken(keyValue, true);
- if (accessTokenDO != null) {
- return accessTokenDO.getTokenId();
+ if (OAuth2Util.isJWT(keyValue)) {
+ try {
+ JWT parsedJwtToken = JWTParser.parse(keyValue);
+ keyValue = parsedJwtToken.getJWTClaimsSet().getJWTID();
+ } catch (ParseException e) {
+ if (log.isDebugEnabled() && IdentityUtil.isTokenLoggable(
+ IdentityConstants.IdentityTokens.ACCESS_TOKEN)) {
+ log.debug("Error while getting JWTID from token: " + keyValue, e);
+ }
}
+ }
+ try {
+ return OAuthTokenPersistenceFactory.getInstance().getAccessTokenDAO().getTokenIdByAccessToken(keyValue);
} catch (IdentityOAuth2Exception e) {
log.error("Failed to retrieve token id by token from store for - ." + keyValue, e);
}
diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
new file mode 100644
index 00000000000..bdfed3f5986
--- /dev/null
+++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
@@ -0,0 +1,145 @@
+package org.wso2.carbon.identity.oauth.cache;
+
+import com.nimbusds.jwt.JWT;
+import com.nimbusds.jwt.JWTClaimsSet;
+import com.nimbusds.jwt.JWTParser;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import org.wso2.carbon.identity.application.authentication.framework.store.SessionDataStore;
+import org.wso2.carbon.identity.base.IdentityConstants;
+import org.wso2.carbon.identity.core.util.IdentityUtil;
+import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
+import org.wso2.carbon.identity.oauth2.dao.AccessTokenDAO;
+import org.wso2.carbon.identity.oauth2.dao.AuthorizationCodeDAO;
+import org.wso2.carbon.identity.oauth2.dao.OAuthTokenPersistenceFactory;
+
+import java.text.ParseException;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class AuthorizationGrantCacheTest {
+
+ @Mock
+ private AccessTokenDAO accessTokenDAO;
+
+ private AuthorizationGrantCache cache;
+
+ @Mock
+ private OAuthTokenPersistenceFactory mockedOAuthTokenPersistenceFactory;
+
+ @Mock
+ private AuthorizationCodeDAO authorizationCodeDAO;
+
+ @Mock
+ private SessionDataStore sessionDataStore;
+
+ private static final String AUTHORIZATION_GRANT_CACHE_NAME = "AuthorizationGrantCache";
+
+ @BeforeMethod
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ cache = AuthorizationGrantCache.getInstance();
+ }
+
+ @Test(dataProvider = "replaceFromTokenIdDataProvider")
+ public void testReplaceFromTokenId(String accessToken, String jwtId, String tokenId, boolean isJwtToken,
+ boolean isInvalidJWTToken, boolean isFailedTokenRetrieval) throws Exception {
+
+ try (MockedStatic<OAuthTokenPersistenceFactory> mockedFactory = mockStatic(OAuthTokenPersistenceFactory.class);
+ MockedStatic<JWTParser> mockedJwtParser = mockStatic(JWTParser.class);
+ MockedStatic<SessionDataStore> mockedSessionDataStore = mockStatic(SessionDataStore.class);
+ MockedStatic<IdentityUtil> mockedIdentityUtil = mockStatic(IdentityUtil.class)) {
+
+ mockedFactory.when(OAuthTokenPersistenceFactory::getInstance).thenReturn(
+ mockedOAuthTokenPersistenceFactory);
+
+ when(mockedOAuthTokenPersistenceFactory.getAccessTokenDAO()).thenReturn(accessTokenDAO);
+
+ if (isJwtToken) {
+ JWT jwtMock = mock(JWT.class);
+ JWTClaimsSet claimsSetMock = mock(JWTClaimsSet.class);
+
+ if (isInvalidJWTToken) {
+ when(JWTParser.parse(accessToken)).thenThrow(new ParseException("Invalid JWT", 0));
+ } else {
+ mockedJwtParser.when(() -> JWTParser.parse(accessToken)).thenReturn(jwtMock);
+ when(jwtMock.getJWTClaimsSet()).thenReturn(claimsSetMock);
+ when(claimsSetMock.getJWTID()).thenReturn(jwtId);
+ }
+ }
+
+ if (isFailedTokenRetrieval) {
+ when(accessTokenDAO.getTokenIdByAccessToken(jwtId)).thenThrow(
+ new IdentityOAuth2Exception("Failed to retrieve token id by token from store"));
+ } else {
+ when(accessTokenDAO.getTokenIdByAccessToken(jwtId != null ? jwtId : accessToken)).thenReturn(tokenId);
+ }
+
+ // Mock SessionDataStore static instance and return a mock session data store
+ mockedSessionDataStore.when(SessionDataStore::getInstance).thenReturn(sessionDataStore);
+
+ // Mock SessionDataStore return for session data (from getFromSessionStore)
+ AuthorizationGrantCacheEntry mockCacheEntry = new AuthorizationGrantCacheEntry();
+ mockCacheEntry.setTokenId(tokenId);
+
+ when(sessionDataStore.getSessionData(tokenId, AUTHORIZATION_GRANT_CACHE_NAME)).thenReturn(mockCacheEntry);
+
+ AuthorizationGrantCacheKey key = new AuthorizationGrantCacheKey(accessToken);
+ AuthorizationGrantCacheEntry result = cache.getValueFromCacheByToken(key);
+
+ // Verify the token ID returned from the DAO is as expected
+ assertEquals(tokenId, result.getTokenId());
+
+ // Verify that the JWT token was parsed and the correct claim was retrieved if it was a JWT
+ if (isJwtToken && !isInvalidJWTToken) {
+ verify(accessTokenDAO).getTokenIdByAccessToken(jwtId);
+ } else {
+ verify(accessTokenDAO).getTokenIdByAccessToken(accessToken);
+ }
+ }
+ }
+
+ @DataProvider(name = "replaceFromTokenIdDataProvider")
+ public Object[][] getReplaceFromTokenIdData() {
+ return new Object[][]{
+ {"jwt.Access.Token", "jwtId", "jwtTokenId", true, false, false},
+ {"nonJWTAccessToken", null, "nonJWTTokenId", false, false, false},
+ {"invalid.JWT.Token", null, "invalid.JWT.Token", true, true, false},
+ {"fail.Store.TokenId", "jwtId", "jwtId", true, false, true}
+ };
+ }
+
+ @Test
+ public void testGetValueFromCacheByCode() throws IdentityOAuth2Exception {
+ String authCode = "authCode";
+ String codeId = "codeId";
+ AuthorizationGrantCacheKey key = new AuthorizationGrantCacheKey(authCode);
+ AuthorizationGrantCacheEntry expectedEntry = new AuthorizationGrantCacheEntry();
+ expectedEntry.setCodeId(codeId);
+
+ try (MockedStatic<OAuthTokenPersistenceFactory> mockedFactory = mockStatic(OAuthTokenPersistenceFactory.class);
+ MockedStatic<SessionDataStore> mockedSessionDataStore = mockStatic(SessionDataStore.class);
+ MockedStatic<IdentityUtil> mockedIdentityUtil = mockStatic(IdentityUtil.class)) {
+
+ mockedSessionDataStore.when(SessionDataStore::getInstance).thenReturn(sessionDataStore);
+ when(sessionDataStore.getSessionData(codeId, "AuthorizationGrantCache")).thenReturn(expectedEntry);
+
+ mockedFactory.when(OAuthTokenPersistenceFactory::getInstance).
+ thenReturn(mockedOAuthTokenPersistenceFactory);
+ when(mockedOAuthTokenPersistenceFactory.getAuthorizationCodeDAO()).thenReturn(authorizationCodeDAO);
+ when(authorizationCodeDAO.getCodeIdByAuthorizationCode(authCode)).thenReturn(codeId);
+
+ AuthorizationGrantCacheEntry result = cache.getValueFromCacheByCode(key);
+
+ assertEquals(expectedEntry, result);
+ }
+ }
+}
diff --git a/components/org.wso2.carbon.identity.oauth/src/test/resources/testng.xml b/components/org.wso2.carbon.identity.oauth/src/test/resources/testng.xml
index 91398cee77b..bc02f33be9e 100755
--- a/components/org.wso2.carbon.identity.oauth/src/test/resources/testng.xml
+++ b/components/org.wso2.carbon.identity.oauth/src/test/resources/testng.xml
@@ -123,6 +123,7 @@
<class name="org.wso2.carbon.identity.oauth2.device.codegenerator.GenerateKeysTest"/>
<class name="org.wso2.carbon.identity.oauth2.responsemode.provider.ResponseModeProviderTest"/>
<class name="org.wso2.carbon.identity.oauth2.token.handlers.claims.ImpersonatedAccessTokenClaimProviderTest"/>
+ <class name="org.wso2.carbon.identity.oauth.cache.AuthorizationGrantCacheTest"/>
</classes>
</test>
@@ -198,6 +199,7 @@
<class name="org.wso2.carbon.identity.openidconnect.OpenIDConnectSystemClaimImplTest"/>
<class name="org.wso2.carbon.identity.openidconnect.OpenIDConnectClaimFilterImplTest"/>
<class name="org.wso2.carbon.identity.openidconnect.util.ClaimHandlerUtilTest"/>
+ <class name="org.wso2.carbon.identity.oauth.cache.AuthorizationGrantCacheTest"/>
</classes>
</test>
</suite>
From 7620e9968a60a286c181aaa0bd22edd47ad92cf3 Mon Sep 17 00:00:00 2001
From: sandushi <sandushidileka2@gmail.com>
Date: Fri, 1 Nov 2024 00:31:40 +0530
Subject: [PATCH 02/45] Remove unused imports
---
.../carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
index bdfed3f5986..d9b3eeebe35 100644
--- a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
+++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
@@ -10,7 +10,6 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.wso2.carbon.identity.application.authentication.framework.store.SessionDataStore;
-import org.wso2.carbon.identity.base.IdentityConstants;
import org.wso2.carbon.identity.core.util.IdentityUtil;
import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
import org.wso2.carbon.identity.oauth2.dao.AccessTokenDAO;
From 70a2459b45973367d6f4e2db20d08dfadd25a394 Mon Sep 17 00:00:00 2001
From: sandushi <sandushidileka2@gmail.com>
Date: Fri, 1 Nov 2024 10:35:14 +0530
Subject: [PATCH 03/45] Address PR comments
---
components/org.wso2.carbon.identity.oauth/pom.xml | 1 +
.../identity/oauth/cache/AuthorizationGrantCache.java | 9 ++++++---
.../oauth/cache/AuthorizationGrantCacheTest.java | 9 +++++----
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index c33a9ba487d..d7d661ad896 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -25,6 +25,7 @@
<relativePath>../../pom.xml</relativePath>
<version>7.0.178-SNAPSHOT</version>
</parent>
+ <version>7.0.177</version>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.identity.oauth</artifactId>
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCache.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCache.java
index 7c82850969d..019ac1d81f3 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCache.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCache.java
@@ -244,9 +244,12 @@ private String replaceFromTokenId(String keyValue) {
JWT parsedJwtToken = JWTParser.parse(keyValue);
keyValue = parsedJwtToken.getJWTClaimsSet().getJWTID();
} catch (ParseException e) {
- if (log.isDebugEnabled() && IdentityUtil.isTokenLoggable(
- IdentityConstants.IdentityTokens.ACCESS_TOKEN)) {
- log.debug("Error while getting JWTID from token: " + keyValue, e);
+ if (log.isDebugEnabled()) {
+ if (IdentityUtil.isTokenLoggable(IdentityConstants.IdentityTokens.ACCESS_TOKEN)) {
+ log.debug("Error while getting JWTID from token: " + keyValue, e);
+ } else {
+ log.debug("Error while getting JWTID from token");
+ }
}
}
}
diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
index d9b3eeebe35..e58638d19f3 100644
--- a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
+++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
@@ -82,10 +82,9 @@ public void testReplaceFromTokenId(String accessToken, String jwtId, String toke
when(accessTokenDAO.getTokenIdByAccessToken(jwtId != null ? jwtId : accessToken)).thenReturn(tokenId);
}
- // Mock SessionDataStore static instance and return a mock session data store
+ // Mock SessionDataStore static instance and return a mock session data store.
mockedSessionDataStore.when(SessionDataStore::getInstance).thenReturn(sessionDataStore);
- // Mock SessionDataStore return for session data (from getFromSessionStore)
AuthorizationGrantCacheEntry mockCacheEntry = new AuthorizationGrantCacheEntry();
mockCacheEntry.setTokenId(tokenId);
@@ -94,10 +93,10 @@ public void testReplaceFromTokenId(String accessToken, String jwtId, String toke
AuthorizationGrantCacheKey key = new AuthorizationGrantCacheKey(accessToken);
AuthorizationGrantCacheEntry result = cache.getValueFromCacheByToken(key);
- // Verify the token ID returned from the DAO is as expected
+ // Verify the token ID returned from the DAO is as expected.
assertEquals(tokenId, result.getTokenId());
- // Verify that the JWT token was parsed and the correct claim was retrieved if it was a JWT
+ // Verify that the JWT token was parsed and the correct claim was retrieved if it was a JWT.
if (isJwtToken && !isInvalidJWTToken) {
verify(accessTokenDAO).getTokenIdByAccessToken(jwtId);
} else {
@@ -108,6 +107,7 @@ public void testReplaceFromTokenId(String accessToken, String jwtId, String toke
@DataProvider(name = "replaceFromTokenIdDataProvider")
public Object[][] getReplaceFromTokenIdData() {
+
return new Object[][]{
{"jwt.Access.Token", "jwtId", "jwtTokenId", true, false, false},
{"nonJWTAccessToken", null, "nonJWTTokenId", false, false, false},
@@ -118,6 +118,7 @@ public Object[][] getReplaceFromTokenIdData() {
@Test
public void testGetValueFromCacheByCode() throws IdentityOAuth2Exception {
+
String authCode = "authCode";
String codeId = "codeId";
AuthorizationGrantCacheKey key = new AuthorizationGrantCacheKey(authCode);
From 4810b2da4d37f150dc41ff0decf6747213142f2f Mon Sep 17 00:00:00 2001
From: shanggeeth <shanggeethk@gmail.com>
Date: Tue, 19 Nov 2024 11:03:19 +0530
Subject: [PATCH 04/45] support showAuthFailureReason config in password grant
---
.../handlers/grant/PasswordGrantHandler.java | 24 ++++++++++++-
.../grant/PasswordGrantHandlerTest.java | 34 +++++++++++++++++--
2 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/handlers/grant/PasswordGrantHandler.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/handlers/grant/PasswordGrantHandler.java
index 0bf8bb7c047..bba40461009 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/handlers/grant/PasswordGrantHandler.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/handlers/grant/PasswordGrantHandler.java
@@ -29,6 +29,7 @@
import org.wso2.carbon.identity.application.authentication.framework.AuthenticatorFlowStatus;
import org.wso2.carbon.identity.application.authentication.framework.cache.AuthenticationRequestCacheEntry;
import org.wso2.carbon.identity.application.authentication.framework.cache.AuthenticationResultCacheEntry;
+import org.wso2.carbon.identity.application.authentication.framework.config.builder.FileBasedConfigurationBuilder;
import org.wso2.carbon.identity.application.authentication.framework.config.model.ApplicationConfig;
import org.wso2.carbon.identity.application.authentication.framework.config.model.AuthenticatorConfig;
import org.wso2.carbon.identity.application.authentication.framework.config.model.SequenceConfig;
@@ -89,7 +90,8 @@
import javax.servlet.http.HttpServletResponse;
import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.ALLOW_SESSION_CREATION;
-
+import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.BASIC_AUTHENTICATOR_CLASS;
+import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.SHOW_AUTHFAILURE_RESON_CONFIG;
/**
* Handles the Password Grant Type of the OAuth 2.0 specification. Resource owner sends his
@@ -334,6 +336,9 @@ private AuthenticatedUser validateUserCredentials(OAuth2AccessTokenReqDTO tokenR
boolean isPublishPasswordGrantLoginEnabled = Boolean.parseBoolean(
IdentityUtil.getProperty(PUBLISH_PASSWORD_GRANT_LOGIN));
+ boolean isShowAuthFailureReason = Boolean.parseBoolean(
+ getBasicAuthenticatorConfigs().getParameterMap().get(SHOW_AUTHFAILURE_RESON_CONFIG));
+ String genericErrorUserName = tokenReq.getResourceOwnerUsername();
try {
// Get the user store preference order supplier.
UserStorePreferenceOrderSupplier<List<String>> userStorePreferenceOrderSupplier =
@@ -365,6 +370,11 @@ private AuthenticatedUser validateUserCredentials(OAuth2AccessTokenReqDTO tokenR
tokenReq.setResourceOwnerUsername(tenantAwareUserName + "@" + userTenantDomain);
}
+ if (MultitenantConstants.SUPER_TENANT_DOMAIN_NAME.equalsIgnoreCase(MultitenantUtils.getTenantDomain
+ (tokenReq.getResourceOwnerUsername())) || IdentityTenantUtil.isTenantQualifiedUrlsEnabled()) {
+ genericErrorUserName = tenantAwareUserName;
+ }
+
AbstractUserStoreManager userStoreManager = getUserStoreManager(userTenantDomain);
Optional<AuthenticatedUser> authenticatedUser;
ServiceProviderProperty[] spProps = serviceProvider.getSpProperties();
@@ -406,6 +416,7 @@ private AuthenticatedUser validateUserCredentials(OAuth2AccessTokenReqDTO tokenR
if (StringUtils.isNotBlank(e.getErrorCode())) {
message = e.getErrorCode() + " " + e.getMessage();
}
+ message = isShowAuthFailureReason ? message : "Authentication failed for " + genericErrorUserName;
throw new IdentityOAuth2Exception(message, e);
} catch (UserStoreException e) {
if (isPublishPasswordGrantLoginEnabled) {
@@ -429,6 +440,7 @@ private AuthenticatedUser validateUserCredentials(OAuth2AccessTokenReqDTO tokenR
message = identityException.getErrorCode() + " " + e.getMessage();
}
}
+ message = isShowAuthFailureReason ? message : "Authentication failed for " + genericErrorUserName;
throw new IdentityOAuth2Exception(message, e);
} catch (AuthenticationFailedException e) {
String message = "Authentication failed for the user: " + tokenReq.getResourceOwnerUsername();
@@ -492,6 +504,16 @@ protected void publishAuthenticationData(OAuth2AccessTokenReqDTO tokenReq, boole
}
}
+ /**
+ * This method will return the basic authenticator configurations.
+ *
+ * @return AuthenticatorConfig - Basic authenticator configurations.
+ */
+ private AuthenticatorConfig getBasicAuthenticatorConfigs() {
+
+ return FileBasedConfigurationBuilder.getInstance().getAuthenticatorBean(BASIC_AUTHENTICATOR_CLASS);
+ }
+
/**
* This method will create an AuthenticationContext object which needs to be passed to the publish methods.
*
diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth2/token/handlers/grant/PasswordGrantHandlerTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth2/token/handlers/grant/PasswordGrantHandlerTest.java
index 8ce32831868..b33606f2d2d 100644
--- a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth2/token/handlers/grant/PasswordGrantHandlerTest.java
+++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth2/token/handlers/grant/PasswordGrantHandlerTest.java
@@ -22,6 +22,8 @@
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import org.wso2.carbon.identity.application.authentication.framework.config.builder.FileBasedConfigurationBuilder;
+import org.wso2.carbon.identity.application.authentication.framework.config.model.AuthenticatorConfig;
import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkUtils;
import org.wso2.carbon.identity.application.common.IdentityApplicationManagementException;
import org.wso2.carbon.identity.application.common.model.LocalAndOutboundAuthenticationConfig;
@@ -48,6 +50,9 @@
import org.wso2.carbon.user.core.util.UserCoreUtil;
import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
+import java.util.HashMap;
+import java.util.Map;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
@@ -57,6 +62,7 @@
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
+import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.SHOW_AUTHFAILURE_RESON_CONFIG;
import static org.wso2.carbon.user.core.UserCoreConstants.PRIMARY_DEFAULT_DOMAIN_NAME;
public class PasswordGrantHandlerTest {
@@ -64,6 +70,7 @@ public class PasswordGrantHandlerTest {
private OAuthTokenReqMessageContext tokReqMsgCtx;
private OAuth2AccessTokenReqDTO oAuth2AccessTokenReqDTO;
private ApplicationManagementService applicationManagementService;
+ private FileBasedConfigurationBuilder fileBasedConfigurationBuilder;
private ServiceProvider serviceProvider;
private OAuthComponentServiceHolder oAuthComponentServiceHolder;
private RealmService realmService;
@@ -81,6 +88,7 @@ public void init() {
tokReqMsgCtx = mock(OAuthTokenReqMessageContext.class);
oAuth2AccessTokenReqDTO = mock(OAuth2AccessTokenReqDTO.class);
applicationManagementService = mock(ApplicationManagementService.class);
+ fileBasedConfigurationBuilder = mock(FileBasedConfigurationBuilder.class);
serviceProvider = mock(ServiceProvider.class);
oAuthComponentServiceHolder = mock(OAuthComponentServiceHolder.class);
realmService = mock(RealmService.class);
@@ -108,7 +116,18 @@ public void testValidateGrant(String username, boolean isSaas) throws Exception
MockedStatic<MultitenantUtils> multitenantUtils = mockStatic(MultitenantUtils.class);
MockedStatic<UserCoreUtil> userCoreUtil = mockStatic(UserCoreUtil.class);
MockedStatic<FrameworkUtils> frameworkUtils = mockStatic(FrameworkUtils.class);
- MockedStatic<IdentityTenantUtil> identityTenantUtil = mockStatic(IdentityTenantUtil.class)) {
+ MockedStatic<IdentityTenantUtil> identityTenantUtil = mockStatic(IdentityTenantUtil.class);
+ MockedStatic<FileBasedConfigurationBuilder> fileBasedConfigBuilder = mockStatic(
+ FileBasedConfigurationBuilder.class)) {
+
+ fileBasedConfigBuilder.when(FileBasedConfigurationBuilder::getInstance)
+ .thenReturn(fileBasedConfigurationBuilder);
+ AuthenticatorConfig basicAuthenticatorConfig = new AuthenticatorConfig();
+ Map<String, String> parameterMap = new HashMap<>();
+ parameterMap.put(SHOW_AUTHFAILURE_RESON_CONFIG, "false");
+ basicAuthenticatorConfig.setParameterMap(parameterMap);
+ when(fileBasedConfigurationBuilder.getAuthenticatorBean(anyString())).thenReturn(
+ basicAuthenticatorConfig);
when(tokReqMsgCtx.getOauth2AccessTokenReqDTO()).thenReturn(oAuth2AccessTokenReqDTO);
when(oAuth2AccessTokenReqDTO.getResourceOwnerUsername()).thenReturn(username + "wso2.com");
@@ -191,7 +210,18 @@ public void testValidateGrantForException(String tenantDomain, boolean authentic
MockedStatic<MultitenantUtils> multitenantUtils = mockStatic(MultitenantUtils.class);
MockedStatic<IdentityUtil> identityUtil = mockStatic(IdentityUtil.class);
MockedStatic<FrameworkUtils> frameworkUtils = mockStatic(FrameworkUtils.class);
- MockedStatic<IdentityTenantUtil> identityTenantUtil = mockStatic(IdentityTenantUtil.class)) {
+ MockedStatic<IdentityTenantUtil> identityTenantUtil = mockStatic(IdentityTenantUtil.class);
+ MockedStatic<FileBasedConfigurationBuilder> fileBasedConfigBuilder = mockStatic(
+ FileBasedConfigurationBuilder.class)) {
+
+ fileBasedConfigBuilder.when(FileBasedConfigurationBuilder::getInstance)
+ .thenReturn(fileBasedConfigurationBuilder);
+ AuthenticatorConfig basicAuthenticatorConfig = new AuthenticatorConfig();
+ Map<String, String> parameterMap = new HashMap<>();
+ parameterMap.put(SHOW_AUTHFAILURE_RESON_CONFIG, "false");
+ basicAuthenticatorConfig.setParameterMap(parameterMap);
+ when(fileBasedConfigurationBuilder.getAuthenticatorBean(anyString())).thenReturn(
+ basicAuthenticatorConfig);
oAuthServerConfiguration.when(OAuthServerConfiguration::getInstance).thenReturn(serverConfiguration);
when(serverConfiguration.getIdentityOauthTokenIssuer()).thenReturn(oauthIssuer);
From ed69463a2bde0353358c6d0c86c6b3497945dc0e Mon Sep 17 00:00:00 2001
From: SujanSanjula96 <sanjulasujan@gmail.com>
Date: Wed, 20 Nov 2024 13:52:10 +0530
Subject: [PATCH 05/45] Add configuration to disable multi value support for
userinfo response
---
.../impl/UserInfoUserStoreClaimRetriever.java | 6 +++++-
.../oauth/endpoint/util/ClaimUtil.java | 5 ++++-
.../config/OAuthServerConfiguration.java | 19 +++++++++++++++++++
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/user/impl/UserInfoUserStoreClaimRetriever.java b/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/user/impl/UserInfoUserStoreClaimRetriever.java
index da07eb1999a..054e80c9980 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/user/impl/UserInfoUserStoreClaimRetriever.java
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/user/impl/UserInfoUserStoreClaimRetriever.java
@@ -20,6 +20,7 @@
import org.apache.commons.collections.MapUtils;
import org.wso2.carbon.identity.application.common.model.ClaimMapping;
import org.wso2.carbon.identity.core.util.IdentityCoreConstants;
+import org.wso2.carbon.identity.oauth.config.OAuthServerConfiguration;
import org.wso2.carbon.identity.oauth.endpoint.util.ClaimUtil;
import org.wso2.carbon.identity.oauth.user.UserInfoClaimRetriever;
@@ -43,7 +44,10 @@ public Map<String, Object> getClaimsMap(Map<ClaimMapping, String> userAttributes
}
String claimValue = entry.getValue();
String claimUri = entry.getKey().getRemoteClaim().getClaimUri();
- if (ClaimUtil.isMultiValuedAttribute(claimUri, claimValue)) {
+ boolean isMultiValueSupportEnabledForUserinfoResponse = OAuthServerConfiguration.getInstance()
+ .getUserInfoMultiValueSupportEnabled();
+ if (isMultiValueSupportEnabledForUserinfoResponse &&
+ ClaimUtil.isMultiValuedAttribute(claimUri, claimValue)) {
String[] attributeValues = ClaimUtil.processMultiValuedAttribute(claimValue);
claims.put(entry.getKey().getRemoteClaim().getClaimUri(), attributeValues);
} else {
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/util/ClaimUtil.java b/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/util/ClaimUtil.java
index 2d5f52d215b..ab7bdd3dd6f 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/util/ClaimUtil.java
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/util/ClaimUtil.java
@@ -190,7 +190,10 @@ public static Map<String, Object> getClaimsFromUserStore(OAuth2TokenValidationRe
continue;
}
}
- if (isMultiValuedAttribute(oidcClaimUri, claimValue)) {
+ boolean isMultiValueSupportEnabledForUserinfoResponse = OAuthServerConfiguration
+ .getInstance().getUserInfoMultiValueSupportEnabled();
+ if (isMultiValueSupportEnabledForUserinfoResponse &&
+ isMultiValuedAttribute(oidcClaimUri, claimValue)) {
String[] attributeValues = processMultiValuedAttribute(claimValue);
mappedAppClaims.put(oidcClaimUri, attributeValues);
} else {
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/config/OAuthServerConfiguration.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/config/OAuthServerConfiguration.java
index 0cd470c03c2..6ccffbb41ee 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/config/OAuthServerConfiguration.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/config/OAuthServerConfiguration.java
@@ -232,6 +232,7 @@ public class OAuthServerConfiguration {
private String defaultIdTokenEncryptionMethod = "A128GCM";
private List<String> supportedIdTokenEncryptionMethods = new ArrayList<>();
private String userInfoJWTSignatureAlgorithm = "SHA256withRSA";
+ private boolean userInfoMultiValueSupportEnabled = true;
private String authContextTTL = "15L";
// property added to fix IDENTITY-4551 in backward compatible manner
private boolean useMultiValueSeparatorForAuthContextToken = true;
@@ -1564,6 +1565,16 @@ public String getUserInfoJWTSignatureAlgorithm() {
return userInfoJWTSignatureAlgorithm;
}
+ /**
+ * Returns whether multi value support is enabled for userinfo response.
+ *
+ * @return True if multi value support is enabled for userinfo response.
+ */
+ public boolean getUserInfoMultiValueSupportEnabled() {
+
+ return userInfoMultiValueSupportEnabled;
+ }
+
public String getConsumerDialectURI() {
return consumerDialectURI;
}
@@ -3486,6 +3497,12 @@ private void parseOpenIDConnectConfig(OMElement oauthConfigElem) {
getQNameWithIdentityNS(ConfigElements.OPENID_CONNECT_USERINFO_JWT_SIGNATURE_ALGORITHM))
.getText().trim();
}
+ OMElement userInfoMultiValueSupportEnabledElem = openIDConnectConfigElem.getFirstChildWithName(
+ getQNameWithIdentityNS(ConfigElements.OPENID_CONNECT_USERINFO_MULTI_VALUE_SUPPORT_ENABLED));
+ if (userInfoMultiValueSupportEnabledElem != null) {
+ userInfoMultiValueSupportEnabled = Boolean.parseBoolean(
+ userInfoMultiValueSupportEnabledElem.getText().trim());
+ }
if (openIDConnectConfigElem.getFirstChildWithName(
getQNameWithIdentityNS(ConfigElements.OPENID_CONNECT_SIGN_JWT_WITH_SP_KEY)) != null) {
isJWTSignedWithSPKey = Boolean.parseBoolean(openIDConnectConfigElem.getFirstChildWithName(
@@ -4113,6 +4130,8 @@ private class ConfigElements {
public static final String OPENID_CONNECT_USERINFO_ENDPOINT_RESPONSE_BUILDER =
"UserInfoEndpointResponseBuilder";
public static final String OPENID_CONNECT_USERINFO_JWT_SIGNATURE_ALGORITHM = "UserInfoJWTSignatureAlgorithm";
+ public static final String OPENID_CONNECT_USERINFO_MULTI_VALUE_SUPPORT_ENABLED =
+ "UserInfoMultiValueSupportEnabled";
public static final String OPENID_CONNECT_SIGN_JWT_WITH_SP_KEY = "SignJWTWithSPKey";
public static final String OPENID_CONNECT_IDTOKEN_CUSTOM_CLAIM_CALLBACK_HANDLER =
"IDTokenCustomClaimsCallBackHandler";
From 9b1c5ecb3e7becc2140af278006854ede1ecc222 Mon Sep 17 00:00:00 2001
From: sandushi <sandushidileka2@gmail.com>
Date: Wed, 20 Nov 2024 21:20:06 +0530
Subject: [PATCH 06/45] Remove unwanted line
---
components/org.wso2.carbon.identity.oauth/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index d7d661ad896..c33a9ba487d 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -25,7 +25,6 @@
<relativePath>../../pom.xml</relativePath>
<version>7.0.178-SNAPSHOT</version>
</parent>
- <version>7.0.177</version>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.identity.oauth</artifactId>
From 2f91b22af98152123866d63d7915acff108c1e51 Mon Sep 17 00:00:00 2001
From: Asha Sulaiman <165079T@uom.lk>
Date: Mon, 2 Dec 2024 15:12:26 +0530
Subject: [PATCH 07/45] Upgrade opensaml version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1aa233a864b..4b875c248bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1010,7 +1010,7 @@
<json.wso2.version.range>[3.0.0.wso2v1, 4.0.0)</json.wso2.version.range>
<opensaml.version>3.3.1</opensaml.version>
- <opensaml3.wso2.version>3.3.1.wso2v11</opensaml3.wso2.version>
+ <opensaml3.wso2.version>3.3.1.wso2v12</opensaml3.wso2.version>
<opensaml3.wso2.osgi.version.range>[3.3.1,3.4.0)</opensaml3.wso2.osgi.version.range>
<joda.version>2.9.4</joda.version>
From 9f2bfd7dd0de97767394a0bce28d275efadf90d0 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 4 Dec 2024 05:38:15 +0000
Subject: [PATCH 08/45] [WSO2 Release] [Jenkins #5121] [Release 7.0.193]
prepare release v7.0.193
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 5e064a014e3..4ec93cb1381 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 67546140097..d498903d67c 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 9214278c8c8..4ca667a544d 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index 25e900dc76a..1fd45e12378 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index fe58cb7ce6d..b1a4f50e50c 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index bc2e2199510..45f5e286d5c 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index 613d955e580..4ff7d83cf90 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 7d89a031e77..d42e9a1c182 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index e0439c94cb7..eba4d54f2ad 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index cdb890e9576..cf9672238f8 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index c7f2b894dac..dc9e470d912 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index 8217e072cb6..9907d74f3ab 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index d2884b7f156..ffd4e08f547 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index c8d233f932b..57b254484ed 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 554a23da1d2..eb6a2fceab1 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index 0a20050e14e..1a2f3b4bbaa 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index 93d0445193f..a5edd8587ca 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 5e5d8a56ea0..3188910ccd8 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index 6384e5ed978..433cb83fb48 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index 385da243efa..456420a4787 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index 7e829bb578e..ac7ea60df5d 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 421b2b75291..db86a4c0254 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 33228eefb63..8318449eff5 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index be91e88955a..86a6d9a9352 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 4b875c248bf..4c8a10baf3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>HEAD</tag>
+ <tag>v7.0.193</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index 22a1258eea5..a1e0382aa6e 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 177bfb5ef9e..805f6522b6b 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193-SNAPSHOT</version>
+ <version>7.0.193</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From b91c38da017e913404641c8832fffbb8ab8d142a Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 4 Dec 2024 05:38:17 +0000
Subject: [PATCH 09/45] [WSO2 Release] [Jenkins #5121] [Release 7.0.193]
prepare for next development iteration
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 4ec93cb1381..1576faa2dba 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index d498903d67c..5c923171f99 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 4ca667a544d..c3816e263f9 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index 1fd45e12378..2230aed0671 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index b1a4f50e50c..0d44acccfa0 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index 45f5e286d5c..6e7c79dee58 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index 4ff7d83cf90..fc1007d4921 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index d42e9a1c182..a8aaf281b95 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index eba4d54f2ad..a4adc3f56db 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index cf9672238f8..11b3ee76770 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index dc9e470d912..672c7f35947 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index 9907d74f3ab..2bad7bbe5fd 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index ffd4e08f547..a901d545755 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index 57b254484ed..2d9bab3a2d4 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index eb6a2fceab1..75bb47f8e46 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index 1a2f3b4bbaa..d168387b18d 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index a5edd8587ca..a8871e90cd3 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 3188910ccd8..2eddb214f9b 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index 433cb83fb48..cf6dab3e98f 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index 456420a4787..5572e404f17 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index ac7ea60df5d..87107af214c 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index db86a4c0254..5afa04485e2 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 8318449eff5..b000cc9439c 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index 86a6d9a9352..2f882676189 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 4c8a10baf3c..89ec3c9da5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>v7.0.193</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index a1e0382aa6e..a67a84b73ac 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 805f6522b6b..ac8adf87f39 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.193</version>
+ <version>7.0.194-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From f4d26b2f2b48475f36363ec1dccfa48e853b1ade Mon Sep 17 00:00:00 2001
From: Indeewai Wijesiri <indeewari@wso2.com>
Date: Wed, 4 Dec 2024 15:00:20 +0530
Subject: [PATCH 10/45] implementing the user attribute handlig for implicit
flow
---
.../JWTAccessTokenOIDCClaimsHandler.java | 33 ++++++++-
.../JWTAccessTokenOIDCClaimsHandlerTest.java | 68 ++++++++++++++++++-
2 files changed, 98 insertions(+), 3 deletions(-)
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java
index ede19a67f64..9c91b7c8a6d 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java
@@ -87,8 +87,20 @@ public JWTClaimsSet handleCustomClaims(JWTClaimsSet.Builder builder, OAuthTokenR
public JWTClaimsSet handleCustomClaims(JWTClaimsSet.Builder builder, OAuthAuthzReqMessageContext request)
throws IdentityOAuth2Exception {
- // TODO : Implement this method for implicit flow and hybrid flow.
- return builder.build();
+ /*
+ Handling the user attributes for the access token. There is no requirement of the consent
+ to manage user attributes for the access token.
+ */
+ String clientId = request.getAuthorizationReqDTO().getConsumerKey();
+ String spTenantDomain = getServiceProviderTenantDomain(request);
+ AuthenticatedUser authenticatedUser = request.getAuthorizationReqDTO().getUser();
+
+ Map<String, Object> claims = getAccessTokenUserClaims(authenticatedUser, clientId, spTenantDomain);
+ if (claims == null || claims.isEmpty()) {
+ return builder.build();
+ }
+ Map<String, Object> filteredClaims = handleClaimsFormat(claims, clientId, spTenantDomain);
+ return setClaimsToJwtClaimSet(builder, filteredClaims);
}
private Map<String, Object> getAccessTokenUserClaims(AuthenticatedUser authenticatedUser, String clientId,
@@ -298,4 +310,21 @@ private String getServiceProviderTenantDomain(OAuthTokenReqMessageContext reques
}
return spTenantDomain;
}
+
+ /**
+ * Retrieves the service provider tenant domain from the OAuthAuthzReqMessageContext.
+ *
+ * @param requestMsgCtx OAuthAuthzReqMessageContext containing the tenant domain.
+ * @return The tenant domain.
+ */
+ private String getServiceProviderTenantDomain(OAuthAuthzReqMessageContext requestMsgCtx) {
+
+ String spTenantDomain = (String) requestMsgCtx.getProperty(MultitenantConstants.TENANT_DOMAIN);
+ // There are certain flows where tenant domain is not added as a message context property.
+ if (spTenantDomain == null) {
+ spTenantDomain = requestMsgCtx.getAuthorizationReqDTO().getTenantDomain();
+ }
+ return spTenantDomain;
+ }
+
}
diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java
index e1ad12bad81..a86baca2a37 100644
--- a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java
+++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java
@@ -54,8 +54,10 @@
import org.wso2.carbon.identity.oauth.config.OAuthServerConfiguration;
import org.wso2.carbon.identity.oauth.dao.OAuthAppDO;
import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
+import org.wso2.carbon.identity.oauth2.authz.OAuthAuthzReqMessageContext;
import org.wso2.carbon.identity.oauth2.dao.OAuthTokenPersistenceFactory;
import org.wso2.carbon.identity.oauth2.dto.OAuth2AccessTokenReqDTO;
+import org.wso2.carbon.identity.oauth2.dto.OAuth2AuthorizeReqDTO;
import org.wso2.carbon.identity.oauth2.internal.OAuth2ServiceComponentHolder;
import org.wso2.carbon.identity.oauth2.token.OAuthTokenReqMessageContext;
import org.wso2.carbon.identity.oauth2.util.AuthzUtil;
@@ -364,6 +366,41 @@ public void testHandleCustomClaimsWithAddressClaimForOAuthTokenReqMsgContext() t
}
}
+ @Test
+ public void testHandleCustomClaimsForOAuthAuthzReqMsgContext() throws Exception {
+
+ try (MockedStatic<JDBCPersistenceManager> jdbcPersistenceManager = mockStatic(JDBCPersistenceManager.class);
+ MockedStatic<OAuthServerConfiguration> oAuthServerConfiguration = mockStatic(
+ OAuthServerConfiguration.class);
+ MockedStatic<ClaimMetadataHandler> claimMetadataHandler = mockStatic(ClaimMetadataHandler.class)) {
+ OAuthServerConfiguration oauthServerConfigurationMock = mock(OAuthServerConfiguration.class);
+ oAuthServerConfiguration.when(OAuthServerConfiguration::getInstance)
+ .thenReturn(oauthServerConfigurationMock);
+ try (MockedStatic<OAuth2Util> oAuth2Util = mockStatic(OAuth2Util.class);
+ MockedStatic<AuthzUtil> authzUtil = mockStatic(AuthzUtil.class);
+ MockedStatic<IdentityTenantUtil> identityTenantUtil = mockStatic(IdentityTenantUtil.class);
+ MockedStatic<IdentityUtil> identityUtil = mockStatic(IdentityUtil.class, Mockito.CALLS_REAL_METHODS)) {
+ identityUtil.when(IdentityUtil::isGroupsVsRolesSeparationImprovementsEnabled).thenReturn(true);
+ oAuth2Util.when(() -> OAuth2Util.getAppInformationByClientId(any(), any())).thenReturn(
+ getoAuthAppDO(jwtAccessTokenClaims));
+ Map<String, String> mappings = getOIDCtoLocalClaimsMapping();
+ claimMetadataHandler.when(ClaimMetadataHandler::getInstance).thenReturn(mockClaimMetadataHandler);
+ lenient().when(mockClaimMetadataHandler.getMappingsMapFromOtherDialectToCarbon(
+ anyString(), isNull(), anyString(), anyBoolean())).thenReturn(mappings);
+ OAuthAuthzReqMessageContext requestMsgCtx = getOAuthAuthzReqMessageContextForLocalUser();
+ mockApplicationManagementService();
+ authzUtil.when(() -> AuthzUtil.getUserRoles(any(), anyString())).thenReturn(new ArrayList<>());
+ UserRealm userRealm = getUserRealmWithUserClaims(USER_CLAIMS_MAP);
+ mockUserRealm(requestMsgCtx.getAuthorizationReqDTO().getUser().toString(), userRealm, identityTenantUtil);
+ JWTClaimsSet.Builder jwtClaimsSetBuilder = new JWTClaimsSet.Builder();
+ JWTClaimsSet jwtClaimsSet = getJwtClaimSet(jwtClaimsSetBuilder, requestMsgCtx, jdbcPersistenceManager,
+ oAuthServerConfiguration);
+ assertNotNull(jwtClaimsSet);
+ assertFalse(jwtClaimsSet.getClaims().isEmpty());
+ }
+ }
+ }
+
private static Map<String, String> getOIDCtoLocalClaimsMapping() {
Map<String, String> mappings = new HashMap<>();
@@ -405,6 +442,26 @@ private JWTClaimsSet getJwtClaimSet(JWTClaimsSet.Builder jwtClaimsSetBuilder,
MockedStatic<OAuthServerConfiguration> oAuthServerConfiguration)
throws IdentityOAuth2Exception {
+ JWTAccessTokenOIDCClaimsHandler jWTAccessTokenOIDCClaimsHandler =
+ getJwtAccessTokenOIDCClaimsHandler(jdbcPersistenceManager, oAuthServerConfiguration);
+ return jWTAccessTokenOIDCClaimsHandler.handleCustomClaims(jwtClaimsSetBuilder, requestMsgCtx);
+ }
+
+ private JWTClaimsSet getJwtClaimSet(JWTClaimsSet.Builder jwtClaimsSetBuilder,
+ OAuthAuthzReqMessageContext requestMsgCtx,
+ MockedStatic<JDBCPersistenceManager> jdbcPersistenceManager,
+ MockedStatic<OAuthServerConfiguration> oAuthServerConfiguration)
+ throws IdentityOAuth2Exception {
+
+ JWTAccessTokenOIDCClaimsHandler jWTAccessTokenOIDCClaimsHandler =
+ getJwtAccessTokenOIDCClaimsHandler(jdbcPersistenceManager, oAuthServerConfiguration);
+ return jWTAccessTokenOIDCClaimsHandler.handleCustomClaims(jwtClaimsSetBuilder, requestMsgCtx);
+ }
+
+ private JWTAccessTokenOIDCClaimsHandler getJwtAccessTokenOIDCClaimsHandler(
+ MockedStatic<JDBCPersistenceManager> jdbcPersistenceManager,
+ MockedStatic<OAuthServerConfiguration> oAuthServerConfiguration) {
+
OAuthServerConfiguration mockOAuthServerConfiguration = mock(OAuthServerConfiguration.class);
oAuthServerConfiguration.when(OAuthServerConfiguration::getInstance).thenReturn(mockOAuthServerConfiguration);
DataSource dataSource = mock(DataSource.class);
@@ -434,7 +491,7 @@ private JWTClaimsSet getJwtClaimSet(JWTClaimsSet.Builder jwtClaimsSetBuilder,
JWTAccessTokenOIDCClaimsHandler jWTAccessTokenOIDCClaimsHandler =
new JWTAccessTokenOIDCClaimsHandler();
- return jWTAccessTokenOIDCClaimsHandler.handleCustomClaims(jwtClaimsSetBuilder, requestMsgCtx);
+ return jWTAccessTokenOIDCClaimsHandler;
}
private OAuthTokenReqMessageContext getTokenReqMessageContextForLocalUser() {
@@ -515,4 +572,13 @@ private void setPrivateField(Object object, String fieldName, Object value) thro
field.set(object, value);
}
+ private OAuthAuthzReqMessageContext getOAuthAuthzReqMessageContextForLocalUser() {
+
+ OAuth2AuthorizeReqDTO oAuth2AuthorizeReqDTO = new OAuth2AuthorizeReqDTO();
+ oAuth2AuthorizeReqDTO.setTenantDomain(TENANT_DOMAIN);
+ oAuth2AuthorizeReqDTO.setConsumerKey(DUMMY_CLIENT_ID);
+ oAuth2AuthorizeReqDTO.setUser(getDefaultAuthenticatedLocalUser());
+
+ return new OAuthAuthzReqMessageContext(oAuth2AuthorizeReqDTO);
+ }
}
From 8f4ba1d8e73b6a0afdbdc8a5f7484b15c12d890f Mon Sep 17 00:00:00 2001
From: Indeewai Wijesiri <indeewari@wso2.com>
Date: Wed, 4 Dec 2024 16:01:24 +0530
Subject: [PATCH 11/45] Fixing styling
---
.../openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java
index a86baca2a37..408459fdc01 100644
--- a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java
+++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java
@@ -391,7 +391,8 @@ public void testHandleCustomClaimsForOAuthAuthzReqMsgContext() throws Exception
mockApplicationManagementService();
authzUtil.when(() -> AuthzUtil.getUserRoles(any(), anyString())).thenReturn(new ArrayList<>());
UserRealm userRealm = getUserRealmWithUserClaims(USER_CLAIMS_MAP);
- mockUserRealm(requestMsgCtx.getAuthorizationReqDTO().getUser().toString(), userRealm, identityTenantUtil);
+ mockUserRealm(requestMsgCtx.getAuthorizationReqDTO().getUser().toString(), userRealm,
+ identityTenantUtil);
JWTClaimsSet.Builder jwtClaimsSetBuilder = new JWTClaimsSet.Builder();
JWTClaimsSet jwtClaimsSet = getJwtClaimSet(jwtClaimsSetBuilder, requestMsgCtx, jdbcPersistenceManager,
oAuthServerConfiguration);
@@ -489,9 +490,7 @@ private JWTAccessTokenOIDCClaimsHandler getJwtAccessTokenOIDCClaimsHandler(
jdbcPersistenceManager.when(JDBCPersistenceManager::getInstance).thenReturn(mockJdbcPersistenceManager);
lenient().when(mockJdbcPersistenceManager.getDataSource()).thenReturn(dataSource);
- JWTAccessTokenOIDCClaimsHandler jWTAccessTokenOIDCClaimsHandler =
- new JWTAccessTokenOIDCClaimsHandler();
- return jWTAccessTokenOIDCClaimsHandler;
+ return new JWTAccessTokenOIDCClaimsHandler();
}
private OAuthTokenReqMessageContext getTokenReqMessageContextForLocalUser() {
From 84c11d6a56b61e20faef038cc841a8aab487c8e9 Mon Sep 17 00:00:00 2001
From: sadilchamishka <sandilchamishka@gmail.com>
Date: Thu, 5 Dec 2024 06:20:02 +0530
Subject: [PATCH 12/45] Fix app-id not set in the cache
---
.../java/org/wso2/carbon/identity/oauth/dao/OAuthAppDAO.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDAO.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDAO.java
index 0044ac7cecc..30a2b40d2d0 100755
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDAO.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDAO.java
@@ -212,6 +212,7 @@ public void addOAuthApplication(OAuthAppDO consumerAppDO) throws IdentityOAuthAd
}
appId = getAppIdByClientId(connection, consumerAppDO.getOauthConsumerKey());
}
+ consumerAppDO.setId(appId);
addScopeValidators(connection, appId, consumerAppDO.getScopeValidators());
addAccessTokenClaims(connection, appId, consumerAppDO.getAccessTokenClaims());
// Handle OIDC Related Properties. These are persisted in IDN_OIDC_PROPERTY table.
From 0a9904ade420856bde0f697367eb6fc396c7da5c Mon Sep 17 00:00:00 2001
From: Indeewai Wijesiri <indeewari@wso2.com>
Date: Thu, 5 Dec 2024 07:09:53 +0530
Subject: [PATCH 13/45] Adding the test class to testng file
---
.../org.wso2.carbon.identity.oauth/src/test/resources/testng.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/components/org.wso2.carbon.identity.oauth/src/test/resources/testng.xml b/components/org.wso2.carbon.identity.oauth/src/test/resources/testng.xml
index 0f4c1fe1ed3..a537de49122 100755
--- a/components/org.wso2.carbon.identity.oauth/src/test/resources/testng.xml
+++ b/components/org.wso2.carbon.identity.oauth/src/test/resources/testng.xml
@@ -199,6 +199,7 @@
<class name="org.wso2.carbon.identity.openidconnect.OpenIDConnectSystemClaimImplTest"/>
<class name="org.wso2.carbon.identity.openidconnect.OpenIDConnectClaimFilterImplTest"/>
<class name="org.wso2.carbon.identity.openidconnect.util.ClaimHandlerUtilTest"/>
+ <class name="org.wso2.carbon.identity.openidconnect.JWTAccessTokenOIDCClaimsHandlerTest"/>
</classes>
</test>
</suite>
From a6f1921780528d37812083664dea9dcc5a342f26 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 5 Dec 2024 01:41:14 +0000
Subject: [PATCH 14/45] [WSO2 Release] [Jenkins #5123] [Release 7.0.194]
prepare release v7.0.194
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 1576faa2dba..1b2348258f6 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 5c923171f99..6606192a89b 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index c3816e263f9..37fe4a61182 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index 2230aed0671..6a3db836edf 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 0d44acccfa0..1df571bb146 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index 6e7c79dee58..207dc3adee9 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index fc1007d4921..d48315eafcb 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index a8aaf281b95..79210bcb39c 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index a4adc3f56db..9cef542d577 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index 11b3ee76770..1da6073f9f2 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 672c7f35947..1d6f7990368 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index 2bad7bbe5fd..8e1eda80bb7 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index a901d545755..0b27eb227d9 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index 2d9bab3a2d4..72eb45efddb 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 75bb47f8e46..588621c8937 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index d168387b18d..25229a7cad1 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index a8871e90cd3..d7a3ccd7bdb 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 2eddb214f9b..aa5d2f65175 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index cf6dab3e98f..629d70e8f53 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index 5572e404f17..1214831a100 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index 87107af214c..f674c6a1c12 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 5afa04485e2..1519040cce0 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index b000cc9439c..db402b4fa74 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index 2f882676189..ca21b76c582 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 89ec3c9da5e..c6d245534bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>HEAD</tag>
+ <tag>v7.0.194</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index a67a84b73ac..ee82fd607b2 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index ac8adf87f39..f461c181d8d 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194-SNAPSHOT</version>
+ <version>7.0.194</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From 9c3267211b7f56688a5007ca8e70ed96c5b5b3e8 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 5 Dec 2024 01:41:16 +0000
Subject: [PATCH 15/45] [WSO2 Release] [Jenkins #5123] [Release 7.0.194]
prepare for next development iteration
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 1b2348258f6..3171a5fa13f 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 6606192a89b..14b1e3b562e 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 37fe4a61182..0af2a788740 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index 6a3db836edf..8f2c0f85936 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 1df571bb146..c5ae132f6f8 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index 207dc3adee9..5324693ec8f 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index d48315eafcb..e7adc31c470 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 79210bcb39c..2e71b4ae897 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index 9cef542d577..0041de78fb5 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index 1da6073f9f2..175b6aa1095 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 1d6f7990368..95c8ae98561 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index 8e1eda80bb7..176845b8f0d 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index 0b27eb227d9..35e77e53187 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index 72eb45efddb..34aa388aac7 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 588621c8937..4b33e3c0d5a 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index 25229a7cad1..51ad3838c6f 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index d7a3ccd7bdb..4b0419718c4 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index aa5d2f65175..af516e224b3 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index 629d70e8f53..ae638621803 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index 1214831a100..4f9aba69f26 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index f674c6a1c12..a745050883e 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 1519040cce0..4bb1a03cf42 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index db402b4fa74..31253430e84 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index ca21b76c582..dcdd8c49db7 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index c6d245534bb..2723266a690 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>v7.0.194</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index ee82fd607b2..5d404d3359c 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index f461c181d8d..70105290b97 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.194</version>
+ <version>7.0.195-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From 092b94b75df29269d5dd1900beade17f2f6a4b61 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 5 Dec 2024 02:07:02 +0000
Subject: [PATCH 16/45] [WSO2 Release] [Jenkins #5125] [Release 7.0.195]
prepare release v7.0.195
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 3171a5fa13f..54be7644baf 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 14b1e3b562e..d5e84a3ddcd 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 0af2a788740..5e5503ee5e4 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index 8f2c0f85936..b6488296ee4 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index c5ae132f6f8..04f39d43876 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index 5324693ec8f..d9218cf0f8c 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index e7adc31c470..6c6250e20f6 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 2e71b4ae897..a4f6784a537 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index 0041de78fb5..59b5f1dd398 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index 175b6aa1095..c486c33a461 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 95c8ae98561..0883ff0b489 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index 176845b8f0d..708470f5df0 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index 35e77e53187..8ba3a4d7f7d 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index 34aa388aac7..cf78497df07 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 4b33e3c0d5a..394874b6af5 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index 51ad3838c6f..025a2c563ac 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index 4b0419718c4..7a7ae7592fb 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index af516e224b3..52e7f227613 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index ae638621803..f0614aaffc8 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index 4f9aba69f26..c0878198abe 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index a745050883e..a5a7393a860 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 4bb1a03cf42..93f2b6b75e4 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 31253430e84..2339c542224 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index dcdd8c49db7..92b3c22afc4 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 2723266a690..752489d1d4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>HEAD</tag>
+ <tag>v7.0.195</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index 5d404d3359c..e1ff7cac58b 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 70105290b97..d81f8467edd 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195-SNAPSHOT</version>
+ <version>7.0.195</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From 6d8ab54bd328323d05129180b6c4456172a1512d Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 5 Dec 2024 02:07:04 +0000
Subject: [PATCH 17/45] [WSO2 Release] [Jenkins #5125] [Release 7.0.195]
prepare for next development iteration
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 54be7644baf..1ef6f34dadb 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index d5e84a3ddcd..ff110c4f101 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 5e5503ee5e4..7f7a0eac260 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index b6488296ee4..d93a2989a6a 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 04f39d43876..af75aee79b2 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index d9218cf0f8c..bccac2e5057 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index 6c6250e20f6..2641752b46c 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index a4f6784a537..78cdfcf8dd8 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index 59b5f1dd398..53f321dc926 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index c486c33a461..5ff01989de4 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 0883ff0b489..5e744d74e0e 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index 708470f5df0..b88299e84fa 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index 8ba3a4d7f7d..ac593a5d77b 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index cf78497df07..66c6c366326 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 394874b6af5..1b565a4b289 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index 025a2c563ac..888be1f7046 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index 7a7ae7592fb..e36203a919f 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 52e7f227613..765237939e6 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index f0614aaffc8..63ae30c0df3 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index c0878198abe..5c8177d47ee 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index a5a7393a860..807301f39af 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 93f2b6b75e4..57dfa634bea 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 2339c542224..890e506c9c5 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index 92b3c22afc4..0e28c65ac70 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 752489d1d4c..7ea57d89b2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>v7.0.195</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index e1ff7cac58b..04533435059 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index d81f8467edd..dea7b2f0a6d 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.195</version>
+ <version>7.0.196-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From 305c1c59eba8861e2eedb4eda9ea75165b24f92d Mon Sep 17 00:00:00 2001
From: Lashini Jayasekara <30428591+lashinijay@users.noreply.github.com>
Date: Thu, 12 Dec 2024 15:31:06 +0530
Subject: [PATCH 18/45] [Spring Cleanup] Remove spring dependency in client
authn filter (#2635)
---
.../pom.xml | 5 ---
.../filter/OAuthClientAuthenticatorProxy.java | 16 +-------
.../OAuthClientAuthnServiceFactory.java | 38 ++++++++-----------
3 files changed, 17 insertions(+), 42 deletions(-)
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index bccac2e5057..cf16236c95a 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -45,11 +45,6 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>org.wso2.carbon.identity.oauth</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthenticatorProxy.java b/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthenticatorProxy.java
index cad84aadd7f..d1229ed2296 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthenticatorProxy.java
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthenticatorProxy.java
@@ -30,7 +30,6 @@
import org.wso2.carbon.identity.oauth.common.OAuth2ErrorCodes;
import org.wso2.carbon.identity.oauth.common.OAuthConstants;
import org.wso2.carbon.identity.oauth2.bean.OAuthClientAuthnContext;
-import org.wso2.carbon.identity.oauth2.client.authentication.OAuthClientAuthnService;
import java.util.Arrays;
import java.util.HashMap;
@@ -51,7 +50,6 @@ public class OAuthClientAuthenticatorProxy extends AbstractPhaseInterceptor<Mess
private static final String HTTP_REQUEST = "HTTP.REQUEST";
private static final List<String> PROXY_ENDPOINT_LIST = Arrays.asList("/oauth2/token", "/oauth2/revoke",
"/oauth2/device_authorize", "/oauth2/ciba", "/oauth2/par", "/oauth2/authorize");
- private OAuthClientAuthnService oAuthClientAuthnService;
private static final String SLASH = "/";
public OAuthClientAuthenticatorProxy() {
@@ -60,16 +58,6 @@ public OAuthClientAuthenticatorProxy() {
super(Phase.PRE_INVOKE);
}
- public OAuthClientAuthnService getOAuthClientAuthnService() {
-
- return oAuthClientAuthnService;
- }
-
- public void setOAuthClientAuthnService(OAuthClientAuthnService oAuthClientAuthnService) {
-
- this.oAuthClientAuthnService = oAuthClientAuthnService;
- }
-
/**
* Handles the incoming JAX-RS message for the purpose of OAuth2 client authentication.
*
@@ -82,8 +70,8 @@ public void handleMessage(Message message) {
HttpServletRequest request = ((HttpServletRequest) message.get(HTTP_REQUEST));
if (canHandle(message)) {
try {
- OAuthClientAuthnContext oAuthClientAuthnContext = oAuthClientAuthnService
- .authenticateClient(request, bodyContentParams);
+ OAuthClientAuthnContext oAuthClientAuthnContext = OAuthClientAuthnServiceFactory
+ .getOAuthClientAuthnService().authenticateClient(request, bodyContentParams);
if (!oAuthClientAuthnContext.isPreviousAuthenticatorEngaged()) {
/* If the previous authenticator is not engaged it means that either client authentication
flow failed or no supported authenticaiton mechanism was found.If the error details are already
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthnServiceFactory.java b/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthnServiceFactory.java
index 8cf4955e76d..8bb57472b36 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthnServiceFactory.java
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthnServiceFactory.java
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
*
- * WSO2 Inc. licenses this file to you under the Apache License,
+ * WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
@@ -18,37 +18,29 @@
package org.wso2.carbon.identity.oauth.client.authn.filter;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.identity.oauth2.client.authentication.OAuthClientAuthnService;
/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the OAuthClientAuthnService type of object inside the container.
+ * Factory class to get OAuthClientAuthnService OSGI service.
*/
-public class OAuthClientAuthnServiceFactory extends AbstractFactoryBean<OAuthClientAuthnService> {
+public class OAuthClientAuthnServiceFactory {
- public OAuthClientAuthnService oAuthClientAuthnService;
+ private static final OAuthClientAuthnService SERVICE;
+ static {
+ OAuthClientAuthnService oAuthClientAuthnService = (OAuthClientAuthnService) PrivilegedCarbonContext
+ .getThreadLocalCarbonContext().getOSGiService(OAuthClientAuthnService.class, null);
- @Override
- public Class<OAuthClientAuthnService> getObjectType() {
+ if (oAuthClientAuthnService == null) {
+ throw new IllegalStateException("OAuthClientAuthnService is not available from OSGI context.");
+ }
- return OAuthClientAuthnService.class;
+ SERVICE = oAuthClientAuthnService;
}
- @Override
- protected OAuthClientAuthnService createInstance() throws Exception {
-
- if (this.oAuthClientAuthnService != null) {
- return this.oAuthClientAuthnService;
- } else {
- OAuthClientAuthnService oAuthClientAuthnService = (OAuthClientAuthnService) PrivilegedCarbonContext
- .getThreadLocalCarbonContext().getOSGiService(OAuthClientAuthnService.class, null);
- if (oAuthClientAuthnService != null) {
- this.oAuthClientAuthnService = oAuthClientAuthnService;
- }
- return oAuthClientAuthnService;
- }
+ public static OAuthClientAuthnService getOAuthClientAuthnService() {
+
+ return SERVICE;
}
}
From 46771328a946eecc3069600fea426987360c948f Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 12 Dec 2024 10:09:19 +0000
Subject: [PATCH 19/45] [WSO2 Release] [Jenkins #5127] [Release 7.0.196]
prepare release v7.0.196
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 1ef6f34dadb..5557a3ecc10 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index ff110c4f101..97583f2c930 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 7f7a0eac260..a47bfbbc527 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index d93a2989a6a..bf228803965 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index af75aee79b2..dd882650ba2 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index cf16236c95a..c0e3a205963 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index 2641752b46c..890a2af5f63 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 78cdfcf8dd8..223712aa2e0 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index 53f321dc926..1b4db9e5972 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index 5ff01989de4..f865483b6be 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 5e744d74e0e..cb72843ca9e 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index b88299e84fa..c3093f19cba 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index ac593a5d77b..34f9fec4002 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index 66c6c366326..2eda083aea8 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 1b565a4b289..40053d13813 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index 888be1f7046..f255191ffd3 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index e36203a919f..1077c03439a 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 765237939e6..2439124f574 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index 63ae30c0df3..3acac31b4ea 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index 5c8177d47ee..5352145ebcd 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index 807301f39af..8618b5a6195 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 57dfa634bea..30b37d9bb22 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 890e506c9c5..92c8c735a25 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index 0e28c65ac70..06c6650b8f2 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 7ea57d89b2d..910366a9350 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>HEAD</tag>
+ <tag>v7.0.196</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index 04533435059..54dea37decb 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index dea7b2f0a6d..5e333795920 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196-SNAPSHOT</version>
+ <version>7.0.196</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From 49537947784f222fb69ac19737d939533c1e8bb8 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 12 Dec 2024 10:09:21 +0000
Subject: [PATCH 20/45] [WSO2 Release] [Jenkins #5127] [Release 7.0.196]
prepare for next development iteration
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 5557a3ecc10..cf56e36574e 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 97583f2c930..eb6c1f71b7c 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index a47bfbbc527..7b2aba58394 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index bf228803965..12bd0ce11db 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index dd882650ba2..7bd92664dbe 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index c0e3a205963..74e9b3a2c97 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index 890a2af5f63..e15670a2b83 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 223712aa2e0..2d9601b4992 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index 1b4db9e5972..fcb706c1286 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index f865483b6be..43943e8fd19 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index cb72843ca9e..a028452e9ca 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index c3093f19cba..bb873e32aeb 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index 34f9fec4002..df041161669 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index 2eda083aea8..954c60ea22f 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 40053d13813..a90cb0deeb8 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index f255191ffd3..c94c070a0d9 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index 1077c03439a..9de7df4aa06 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 2439124f574..778513e3cf8 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index 3acac31b4ea..dbd36cfcbfd 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index 5352145ebcd..ff5b38a9b25 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index 8618b5a6195..cfdc06fed63 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 30b37d9bb22..c9a67aeda1d 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 92c8c735a25..7ec0b911e38 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index 06c6650b8f2..170ab490650 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 910366a9350..6648d7a1717 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>v7.0.196</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index 54dea37decb..2268ba8360c 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 5e333795920..7922889c7fa 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.196</version>
+ <version>7.0.197-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From b48dacf509e9ea7f25871001c2819627dc0bcf2a Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Mon, 16 Dec 2024 10:19:07 +0000
Subject: [PATCH 21/45] [WSO2 Release] [Jenkins #5129] [Release 7.0.197]
prepare release v7.0.197
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index cf56e36574e..2695a2df0a8 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index eb6c1f71b7c..9efcb2939b2 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 7b2aba58394..fd97f314399 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index 12bd0ce11db..acf9038eb07 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 7bd92664dbe..3cb6566bd9f 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index 74e9b3a2c97..bd4f9dfd135 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index e15670a2b83..e234e8cc881 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 2d9601b4992..9cf18c836a0 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index fcb706c1286..c3dd20507c6 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index 43943e8fd19..65e8063eef2 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index a028452e9ca..a4f3f131e72 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index bb873e32aeb..2d3c253d3be 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index df041161669..cb610eb756d 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index 954c60ea22f..d33e10adfb4 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index a90cb0deeb8..b71c9775957 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index c94c070a0d9..bea26534fe5 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index 9de7df4aa06..b38bd893bfd 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 778513e3cf8..c9c36fe5721 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index dbd36cfcbfd..8f1f4cbdc87 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index ff5b38a9b25..7266dd45d56 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index cfdc06fed63..00b8a34ddd5 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index c9a67aeda1d..ebf3574e5d6 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 7ec0b911e38..110972b1a44 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index 170ab490650..cd56f9ec853 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 6648d7a1717..95d1365c0f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>HEAD</tag>
+ <tag>v7.0.197</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index 2268ba8360c..c9409b40c1b 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 7922889c7fa..5154afd67f3 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197-SNAPSHOT</version>
+ <version>7.0.197</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From 2f31dda20c43864086118db6fdce2b70c18919ec Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Mon, 16 Dec 2024 10:19:10 +0000
Subject: [PATCH 22/45] [WSO2 Release] [Jenkins #5129] [Release 7.0.197]
prepare for next development iteration
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 2695a2df0a8..9b02e6d94e1 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 9efcb2939b2..85321ca07bd 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index fd97f314399..8991a5d7072 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index acf9038eb07..b33f51ff650 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 3cb6566bd9f..c707bc16070 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index bd4f9dfd135..450389e631d 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index e234e8cc881..ec106520bdb 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 9cf18c836a0..ffb99119125 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index c3dd20507c6..6435abb9348 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index 65e8063eef2..739b016905d 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index a4f3f131e72..cdfa3e4d69e 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index 2d3c253d3be..23ade1ef126 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index cb610eb756d..350164d6d02 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index d33e10adfb4..b7bd34913e5 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index b71c9775957..52977c52d3a 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index bea26534fe5..e6aea6f7cc7 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index b38bd893bfd..37cf2a28d12 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index c9c36fe5721..6a057ae9610 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index 8f1f4cbdc87..ff4700c6fe7 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index 7266dd45d56..69c1a67e089 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index 00b8a34ddd5..8d6eecf696e 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index ebf3574e5d6..2ab4096d508 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 110972b1a44..c6b4493d4b5 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index cd56f9ec853..23f8ba60234 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 95d1365c0f2..e0ef233657e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>v7.0.197</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index c9409b40c1b..4180304a9b1 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 5154afd67f3..36872f7a31b 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.197</version>
+ <version>7.0.198-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From b221f6ae4132825f671a1bbb62c1353c891694c8 Mon Sep 17 00:00:00 2001
From: sandushi <sandushidileka2@gmail.com>
Date: Tue, 17 Dec 2024 08:24:40 +0530
Subject: [PATCH 23/45] Add license header
---
.../cache/AuthorizationGrantCacheTest.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
index e58638d19f3..21d66239abf 100644
--- a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
+++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.wso2.carbon.identity.oauth.cache;
import com.nimbusds.jwt.JWT;
From f085dc997fe14f65b6ea019ae1a3c9d028160b5c Mon Sep 17 00:00:00 2001
From: Lashini Jayasekara <30428591+lashinijay@users.noreply.github.com>
Date: Tue, 17 Dec 2024 09:54:58 +0530
Subject: [PATCH 24/45] Revert "[Spring Cleanup] Remove spring dependency in
client authn filter (#2635)" (#2651)
This reverts commit 305c1c59eba8861e2eedb4eda9ea75165b24f92d.
---
.../pom.xml | 5 +++
.../filter/OAuthClientAuthenticatorProxy.java | 16 +++++++-
.../OAuthClientAuthnServiceFactory.java | 38 +++++++++++--------
3 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index 450389e631d..45bf9342841 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -45,6 +45,11 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>org.wso2.carbon.identity.oauth</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthenticatorProxy.java b/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthenticatorProxy.java
index d1229ed2296..cad84aadd7f 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthenticatorProxy.java
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthenticatorProxy.java
@@ -30,6 +30,7 @@
import org.wso2.carbon.identity.oauth.common.OAuth2ErrorCodes;
import org.wso2.carbon.identity.oauth.common.OAuthConstants;
import org.wso2.carbon.identity.oauth2.bean.OAuthClientAuthnContext;
+import org.wso2.carbon.identity.oauth2.client.authentication.OAuthClientAuthnService;
import java.util.Arrays;
import java.util.HashMap;
@@ -50,6 +51,7 @@ public class OAuthClientAuthenticatorProxy extends AbstractPhaseInterceptor<Mess
private static final String HTTP_REQUEST = "HTTP.REQUEST";
private static final List<String> PROXY_ENDPOINT_LIST = Arrays.asList("/oauth2/token", "/oauth2/revoke",
"/oauth2/device_authorize", "/oauth2/ciba", "/oauth2/par", "/oauth2/authorize");
+ private OAuthClientAuthnService oAuthClientAuthnService;
private static final String SLASH = "/";
public OAuthClientAuthenticatorProxy() {
@@ -58,6 +60,16 @@ public OAuthClientAuthenticatorProxy() {
super(Phase.PRE_INVOKE);
}
+ public OAuthClientAuthnService getOAuthClientAuthnService() {
+
+ return oAuthClientAuthnService;
+ }
+
+ public void setOAuthClientAuthnService(OAuthClientAuthnService oAuthClientAuthnService) {
+
+ this.oAuthClientAuthnService = oAuthClientAuthnService;
+ }
+
/**
* Handles the incoming JAX-RS message for the purpose of OAuth2 client authentication.
*
@@ -70,8 +82,8 @@ public void handleMessage(Message message) {
HttpServletRequest request = ((HttpServletRequest) message.get(HTTP_REQUEST));
if (canHandle(message)) {
try {
- OAuthClientAuthnContext oAuthClientAuthnContext = OAuthClientAuthnServiceFactory
- .getOAuthClientAuthnService().authenticateClient(request, bodyContentParams);
+ OAuthClientAuthnContext oAuthClientAuthnContext = oAuthClientAuthnService
+ .authenticateClient(request, bodyContentParams);
if (!oAuthClientAuthnContext.isPreviousAuthenticatorEngaged()) {
/* If the previous authenticator is not engaged it means that either client authentication
flow failed or no supported authenticaiton mechanism was found.If the error details are already
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthnServiceFactory.java b/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthnServiceFactory.java
index 8bb57472b36..8cf4955e76d 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthnServiceFactory.java
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/src/main/java/org/wso2/carbon/identity/oauth/client/authn/filter/OAuthClientAuthnServiceFactory.java
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
- * WSO2 LLC. licenses this file to you under the Apache License,
+ * WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
@@ -18,29 +18,37 @@
package org.wso2.carbon.identity.oauth.client.authn.filter;
+import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.identity.oauth2.client.authentication.OAuthClientAuthnService;
/**
- * Factory class to get OAuthClientAuthnService OSGI service.
+ * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
+ * instantiate the OAuthClientAuthnService type of object inside the container.
*/
-public class OAuthClientAuthnServiceFactory {
+public class OAuthClientAuthnServiceFactory extends AbstractFactoryBean<OAuthClientAuthnService> {
- private static final OAuthClientAuthnService SERVICE;
+ public OAuthClientAuthnService oAuthClientAuthnService;
- static {
- OAuthClientAuthnService oAuthClientAuthnService = (OAuthClientAuthnService) PrivilegedCarbonContext
- .getThreadLocalCarbonContext().getOSGiService(OAuthClientAuthnService.class, null);
- if (oAuthClientAuthnService == null) {
- throw new IllegalStateException("OAuthClientAuthnService is not available from OSGI context.");
- }
+ @Override
+ public Class<OAuthClientAuthnService> getObjectType() {
- SERVICE = oAuthClientAuthnService;
+ return OAuthClientAuthnService.class;
}
- public static OAuthClientAuthnService getOAuthClientAuthnService() {
-
- return SERVICE;
+ @Override
+ protected OAuthClientAuthnService createInstance() throws Exception {
+
+ if (this.oAuthClientAuthnService != null) {
+ return this.oAuthClientAuthnService;
+ } else {
+ OAuthClientAuthnService oAuthClientAuthnService = (OAuthClientAuthnService) PrivilegedCarbonContext
+ .getThreadLocalCarbonContext().getOSGiService(OAuthClientAuthnService.class, null);
+ if (oAuthClientAuthnService != null) {
+ this.oAuthClientAuthnService = oAuthClientAuthnService;
+ }
+ return oAuthClientAuthnService;
+ }
}
}
From 72327882214ee507098588869308ba17a9c5bfc8 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Tue, 17 Dec 2024 04:34:21 +0000
Subject: [PATCH 25/45] [WSO2 Release] [Jenkins #5131] [Release 7.0.198]
prepare release v7.0.198
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 9b02e6d94e1..a731f62f0a6 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 85321ca07bd..bdf4d590afd 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 8991a5d7072..1bd16fb8291 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index b33f51ff650..1500c15e2b9 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index c707bc16070..3df991997e7 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index 45bf9342841..5ab220e8b9f 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index ec106520bdb..ad4d2749059 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index ffb99119125..c179106df01 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index 6435abb9348..598e492575b 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index 739b016905d..e75d69738b1 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index cdfa3e4d69e..b07e657633b 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index 23ade1ef126..78e5d485722 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index 350164d6d02..e7f5bae9fa3 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index b7bd34913e5..5338d0b1891 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 52977c52d3a..288020daeab 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index e6aea6f7cc7..a43569a2fad 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index 37cf2a28d12..a6d9f7405fc 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 6a057ae9610..785d694f778 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index ff4700c6fe7..5f952f8f226 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index 69c1a67e089..c54c4a601fc 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index 8d6eecf696e..c5ce1597c95 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 2ab4096d508..14ac1229c04 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index c6b4493d4b5..500cccef95e 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index 23f8ba60234..f31e3f72b28 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index e0ef233657e..2d936f50aef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>HEAD</tag>
+ <tag>v7.0.198</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index 4180304a9b1..cd0b83fe71b 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 36872f7a31b..cc9ca4370b9 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198-SNAPSHOT</version>
+ <version>7.0.198</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From e9a9049c058019ee6fadc5dab3ce1cb3144d7a8e Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Tue, 17 Dec 2024 04:34:24 +0000
Subject: [PATCH 26/45] [WSO2 Release] [Jenkins #5131] [Release 7.0.198]
prepare for next development iteration
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index a731f62f0a6..4546934ff65 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index bdf4d590afd..b79c2a01d13 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 1bd16fb8291..1f552c1bde2 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index 1500c15e2b9..0b60324c73f 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 3df991997e7..0dc9cfa5bb0 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index 5ab220e8b9f..c8a1b22ec95 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index ad4d2749059..720d6d2dc13 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index c179106df01..cc65e8ab30d 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index 598e492575b..7ed9dc98e5e 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index e75d69738b1..d24fda45761 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index b07e657633b..96442e3a168 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index 78e5d485722..cf1e437a472 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index e7f5bae9fa3..0e241178afb 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index 5338d0b1891..f6a83bdffed 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 288020daeab..b52e217614d 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index a43569a2fad..b48e5771bf3 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index a6d9f7405fc..578763924d2 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 785d694f778..a730bfc8096 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index 5f952f8f226..489a3ecad91 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index c54c4a601fc..a38647e0ac0 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index c5ce1597c95..533846efcce 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 14ac1229c04..f6d4645dc82 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 500cccef95e..78e85706cb5 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index f31e3f72b28..9cb75a24573 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 2d936f50aef..17f8d3825e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>v7.0.198</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index cd0b83fe71b..7d7a70693a7 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index cc9ca4370b9..3d4eb36be05 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.198</version>
+ <version>7.0.199-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From 83bfbbb7a588a292c31133e63bcd7477348fce8d Mon Sep 17 00:00:00 2001
From: sandushi <sandushidileka2@gmail.com>
Date: Tue, 17 Dec 2024 10:14:53 +0530
Subject: [PATCH 27/45] Add a new test case
---
.../cache/AuthorizationGrantCacheTest.java | 26 +++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
index 21d66239abf..7392f7fd244 100644
--- a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
+++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
@@ -160,4 +160,30 @@ public void testGetValueFromCacheByCode() throws IdentityOAuth2Exception {
assertEquals(expectedEntry, result);
}
}
+
+ @Test
+ public void testGetValueFromCacheByToken() throws IdentityOAuth2Exception {
+ String accessToken = "accessToken";
+ String tokenId = "tokenId";
+ AuthorizationGrantCacheKey key = new AuthorizationGrantCacheKey(accessToken);
+ AuthorizationGrantCacheEntry expectedEntry = new AuthorizationGrantCacheEntry();
+ expectedEntry.setTokenId(tokenId);
+
+ try (MockedStatic<OAuthTokenPersistenceFactory> mockedFactory = mockStatic(OAuthTokenPersistenceFactory.class);
+ MockedStatic<SessionDataStore> mockedSessionDataStore = mockStatic(SessionDataStore.class);
+ MockedStatic<IdentityUtil> mockedIdentityUtil = mockStatic(IdentityUtil.class)) {
+
+ mockedSessionDataStore.when(SessionDataStore::getInstance).thenReturn(sessionDataStore);
+ when(sessionDataStore.getSessionData(tokenId, "AuthorizationGrantCache")).thenReturn(expectedEntry);
+
+ mockedFactory.when(OAuthTokenPersistenceFactory::getInstance).
+ thenReturn(mockedOAuthTokenPersistenceFactory);
+ when(mockedOAuthTokenPersistenceFactory.getAccessTokenDAO()).thenReturn(accessTokenDAO);
+ when(accessTokenDAO.getTokenIdByAccessToken(accessToken)).thenReturn(tokenId);
+
+ AuthorizationGrantCacheEntry result = cache.getValueFromCacheByToken(key);
+
+ assertEquals(expectedEntry, result);
+ }
+ }
}
From df80a3100b03e9f4b03349383b0e9b56b1b9041f Mon Sep 17 00:00:00 2001
From: sandushi <sandushidileka2@gmail.com>
Date: Tue, 17 Dec 2024 23:56:03 +0530
Subject: [PATCH 28/45] Improve unit tests
---
.../cache/AuthorizationGrantCacheTest.java | 85 +++++++++++--------
1 file changed, 51 insertions(+), 34 deletions(-)
diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
index 7392f7fd244..aba364e61bc 100644
--- a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
+++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
@@ -21,6 +21,7 @@
import com.nimbusds.jwt.JWT;
import com.nimbusds.jwt.JWTClaimsSet;
import com.nimbusds.jwt.JWTParser;
+import org.apache.commons.logging.Log;
import org.mockito.Mock;
import org.mockito.MockedStatic;
import org.mockito.MockitoAnnotations;
@@ -28,20 +29,26 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.wso2.carbon.identity.application.authentication.framework.store.SessionDataStore;
+import org.wso2.carbon.identity.base.IdentityConstants;
import org.wso2.carbon.identity.core.util.IdentityUtil;
import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
import org.wso2.carbon.identity.oauth2.dao.AccessTokenDAO;
import org.wso2.carbon.identity.oauth2.dao.AuthorizationCodeDAO;
import org.wso2.carbon.identity.oauth2.dao.OAuthTokenPersistenceFactory;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
import java.text.ParseException;
import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+
public class AuthorizationGrantCacheTest {
@Mock
@@ -58,28 +65,53 @@ public class AuthorizationGrantCacheTest {
@Mock
private SessionDataStore sessionDataStore;
+ private Log mockLog;
+
private static final String AUTHORIZATION_GRANT_CACHE_NAME = "AuthorizationGrantCache";
@BeforeMethod
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
cache = AuthorizationGrantCache.getInstance();
+
+ mockLog = mock(Log.class);
+
+ Field logField =
+ AuthorizationGrantCache.class.getDeclaredField("log");
+ logField.setAccessible(true);
+
+ // Remove the 'final' modifier using reflection
+ Field modifiersField = Field.class.getDeclaredField("modifiers");
+ modifiersField.setAccessible(true);
+ modifiersField.setInt(logField, logField.getModifiers() & ~Modifier.FINAL);
+
+ // Set the static field to the mock object
+ logField.set(null, mockLog);
}
@Test(dataProvider = "replaceFromTokenIdDataProvider")
public void testReplaceFromTokenId(String accessToken, String jwtId, String tokenId, boolean isJwtToken,
- boolean isInvalidJWTToken, boolean isFailedTokenRetrieval) throws Exception {
+ boolean isInvalidJWTToken, boolean isFailedTokenRetrieval,
+ boolean isTokenLoggable) throws Exception {
- try (MockedStatic<OAuthTokenPersistenceFactory> mockedFactory = mockStatic(OAuthTokenPersistenceFactory.class);
+ try (MockedStatic<OAuthTokenPersistenceFactory> mockedFactory =
+ mockStatic(OAuthTokenPersistenceFactory.class);
MockedStatic<JWTParser> mockedJwtParser = mockStatic(JWTParser.class);
MockedStatic<SessionDataStore> mockedSessionDataStore = mockStatic(SessionDataStore.class);
MockedStatic<IdentityUtil> mockedIdentityUtil = mockStatic(IdentityUtil.class)) {
+ when(mockLog.isDebugEnabled()).thenReturn(true);
mockedFactory.when(OAuthTokenPersistenceFactory::getInstance).thenReturn(
mockedOAuthTokenPersistenceFactory);
when(mockedOAuthTokenPersistenceFactory.getAccessTokenDAO()).thenReturn(accessTokenDAO);
-
+ if (isTokenLoggable) {
+ mockedIdentityUtil.when(() -> IdentityUtil.isTokenLoggable(IdentityConstants
+ .IdentityTokens.ACCESS_TOKEN)).thenReturn(true);
+ } else {
+ mockedIdentityUtil.when(() -> IdentityUtil.isTokenLoggable(IdentityConstants
+ .IdentityTokens.ACCESS_TOKEN)).thenReturn(false);
+ }
if (isJwtToken) {
JWT jwtMock = mock(JWT.class);
JWTClaimsSet claimsSetMock = mock(JWTClaimsSet.class);
@@ -120,6 +152,15 @@ public void testReplaceFromTokenId(String accessToken, String jwtId, String toke
} else {
verify(accessTokenDAO).getTokenIdByAccessToken(accessToken);
}
+
+ if (isInvalidJWTToken) {
+ if (isTokenLoggable) {
+ verify(mockLog).debug(eq("Error while getting JWTID from token: " + accessToken),
+ any(ParseException.class));
+ } else {
+ verify(mockLog).debug(eq("Error while getting JWTID from token"));
+ }
+ }
}
}
@@ -127,10 +168,11 @@ public void testReplaceFromTokenId(String accessToken, String jwtId, String toke
public Object[][] getReplaceFromTokenIdData() {
return new Object[][]{
- {"jwt.Access.Token", "jwtId", "jwtTokenId", true, false, false},
- {"nonJWTAccessToken", null, "nonJWTTokenId", false, false, false},
- {"invalid.JWT.Token", null, "invalid.JWT.Token", true, true, false},
- {"fail.Store.TokenId", "jwtId", "jwtId", true, false, true}
+ {"jwt.Access.Token", "jwtId", "jwtTokenId", true, false, false, false},
+ {"nonJWTAccessToken", null, "nonJWTTokenId", false, false, false, false},
+ {"invalid.JWT.Token", null, "invalid.JWT.Token", true, true, false, true},
+ {"invalid.JWT.Token", null, "invalid.JWT.Token", true, true, false, false},
+ {"fail.Store.TokenId", "jwtId", "jwtId", true, false, true, false}
};
}
@@ -143,7 +185,8 @@ public void testGetValueFromCacheByCode() throws IdentityOAuth2Exception {
AuthorizationGrantCacheEntry expectedEntry = new AuthorizationGrantCacheEntry();
expectedEntry.setCodeId(codeId);
- try (MockedStatic<OAuthTokenPersistenceFactory> mockedFactory = mockStatic(OAuthTokenPersistenceFactory.class);
+ try (MockedStatic<OAuthTokenPersistenceFactory> mockedFactory =
+ mockStatic(OAuthTokenPersistenceFactory.class);
MockedStatic<SessionDataStore> mockedSessionDataStore = mockStatic(SessionDataStore.class);
MockedStatic<IdentityUtil> mockedIdentityUtil = mockStatic(IdentityUtil.class)) {
@@ -160,30 +203,4 @@ public void testGetValueFromCacheByCode() throws IdentityOAuth2Exception {
assertEquals(expectedEntry, result);
}
}
-
- @Test
- public void testGetValueFromCacheByToken() throws IdentityOAuth2Exception {
- String accessToken = "accessToken";
- String tokenId = "tokenId";
- AuthorizationGrantCacheKey key = new AuthorizationGrantCacheKey(accessToken);
- AuthorizationGrantCacheEntry expectedEntry = new AuthorizationGrantCacheEntry();
- expectedEntry.setTokenId(tokenId);
-
- try (MockedStatic<OAuthTokenPersistenceFactory> mockedFactory = mockStatic(OAuthTokenPersistenceFactory.class);
- MockedStatic<SessionDataStore> mockedSessionDataStore = mockStatic(SessionDataStore.class);
- MockedStatic<IdentityUtil> mockedIdentityUtil = mockStatic(IdentityUtil.class)) {
-
- mockedSessionDataStore.when(SessionDataStore::getInstance).thenReturn(sessionDataStore);
- when(sessionDataStore.getSessionData(tokenId, "AuthorizationGrantCache")).thenReturn(expectedEntry);
-
- mockedFactory.when(OAuthTokenPersistenceFactory::getInstance).
- thenReturn(mockedOAuthTokenPersistenceFactory);
- when(mockedOAuthTokenPersistenceFactory.getAccessTokenDAO()).thenReturn(accessTokenDAO);
- when(accessTokenDAO.getTokenIdByAccessToken(accessToken)).thenReturn(tokenId);
-
- AuthorizationGrantCacheEntry result = cache.getValueFromCacheByToken(key);
-
- assertEquals(expectedEntry, result);
- }
- }
}
From bdc9bcaa8d4c88ba1cb495e9fa77e37aaca51a25 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 18 Dec 2024 03:58:35 +0000
Subject: [PATCH 29/45] [WSO2 Release] [Jenkins #5133] [Release 7.0.199]
prepare release v7.0.199
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 4546934ff65..c1d7bc87fb3 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index b79c2a01d13..10b4f2a3066 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 1f552c1bde2..aa3a5a0307a 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index 0b60324c73f..98582009323 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 0dc9cfa5bb0..454ecfd553d 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index c8a1b22ec95..a8d37955187 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index 720d6d2dc13..ea2bca90822 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index cc65e8ab30d..4b5684c33da 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index 7ed9dc98e5e..e6c3ec3409c 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index d24fda45761..b8b60477bd7 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 96442e3a168..06f01fc5cdc 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index cf1e437a472..d00a97d966b 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index 0e241178afb..ec03c46c84b 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index f6a83bdffed..afd74d442eb 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index b52e217614d..987ecf90186 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index b48e5771bf3..d07ea599f13 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index 578763924d2..ef840edeee8 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index a730bfc8096..1c7730069c7 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index 489a3ecad91..e44124e2fef 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index a38647e0ac0..f886578b292 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index 533846efcce..e5f475d8bf0 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index f6d4645dc82..1019fc06ba6 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 78e85706cb5..3f21c6ac049 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index 9cb75a24573..2964494f088 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 17f8d3825e5..b34882739f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>HEAD</tag>
+ <tag>v7.0.199</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index 7d7a70693a7..3e5ebd69b92 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 3d4eb36be05..559f534a809 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199-SNAPSHOT</version>
+ <version>7.0.199</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From 64f0341fa27fd142948b23ffa32bedc86905f64f Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 18 Dec 2024 03:58:37 +0000
Subject: [PATCH 30/45] [WSO2 Release] [Jenkins #5133] [Release 7.0.199]
prepare for next development iteration
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index c1d7bc87fb3..f2080fe162b 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 10b4f2a3066..59a88aeb961 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index aa3a5a0307a..71e68db7b30 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index 98582009323..f8cf6287189 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 454ecfd553d..c41b4e93423 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index a8d37955187..53fd8b354c9 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index ea2bca90822..8347cc1eb56 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 4b5684c33da..6353dd4987d 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index e6c3ec3409c..00c997d2019 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index b8b60477bd7..8673227d81e 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 06f01fc5cdc..802fe29de71 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index d00a97d966b..5c60812a281 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index ec03c46c84b..dcaf6ddfbcd 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index afd74d442eb..b28b6e2115f 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 987ecf90186..adc246a5a8d 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index d07ea599f13..c9430d9ba3b 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index ef840edeee8..9e5b22e7aa7 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 1c7730069c7..0cea46ae837 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index e44124e2fef..330acc19556 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index f886578b292..6c9695b6d65 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index e5f475d8bf0..7a913376675 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 1019fc06ba6..dd27bd41481 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 3f21c6ac049..d94b640d5d2 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index 2964494f088..7d4d60f7728 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index b34882739f2..56de2496a68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>v7.0.199</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index 3e5ebd69b92..9fa15fc3922 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 559f534a809..2c9851f73bc 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.199</version>
+ <version>7.0.200-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From b267c63a2b5de78a9c85fb5883f77f133a570d4a Mon Sep 17 00:00:00 2001
From: Madhavi Gayathri <47152272+mpmadhavig@users.noreply.github.com>
Date: Wed, 18 Dec 2024 15:28:04 +0530
Subject: [PATCH 31/45] Remove Entitlements dependency (#2650)
Remove Entitlements dependency.
---
.../pom.xml | 8 +++++++
.../org.wso2.carbon.identity.oauth/pom.xml | 7 ++-----
pom.xml | 21 +++++++++++++------
3 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index 8673227d81e..2ecacbfb3f3 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -146,6 +146,14 @@
<artifactId>org.wso2.carbon.identity.oidc.session</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents.wso2</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.orbit.org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index c9430d9ba3b..84fc40df889 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -176,10 +176,6 @@
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.application.common</artifactId>
</dependency>
- <dependency>
- <groupId>org.wso2.carbon.identity.framework</groupId>
- <artifactId>org.wso2.carbon.identity.entitlement</artifactId>
- </dependency>
<!--SAML Common Util dependency-->
<dependency>
@@ -421,7 +417,8 @@
org.osgi.framework; version="${osgi.framework.imp.pkg.version.range}",
org.osgi.service.component; version="${osgi.service.component.imp.pkg.version.range}",
- org.wso2.carbon.identity.entitlement; version="${carbon.identity.framework.imp.pkg.version.range}"; resolution:=optional,
+ org.wso2.carbon.identity.entitlement;
+ version="${identity.oauth.xacml.version.range}"; resolution:=optional,
org.wso2.carbon.idp.mgt; version="${carbon.identity.framework.imp.pkg.version.range}",
org.wso2.carbon.identity.base; version="${carbon.identity.framework.imp.pkg.version.range}",
org.wso2.carbon.identity.core.*; version="${carbon.identity.framework.imp.pkg.version.range}",
diff --git a/pom.xml b/pom.xml
index 56de2496a68..3cefb32884c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,11 +209,6 @@
<artifactId>org.wso2.carbon.identity.application.common</artifactId>
<version>${carbon.identity.framework.version}</version>
</dependency>
- <dependency>
- <groupId>org.wso2.carbon.identity.framework</groupId>
- <artifactId>org.wso2.carbon.identity.entitlement</artifactId>
- <version>${carbon.identity.framework.version}</version>
- </dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
@@ -670,6 +665,16 @@
<artifactId>tomcat-coyote</artifactId>
<version>${tomcat.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents.wso2</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.orbit.org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpcomponents-httpclient.wso2.version}</version>
+ </dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
@@ -939,9 +944,10 @@
<carbon.kernel.registry.imp.pkg.version.range>[1.0.1, 2.0.0)</carbon.kernel.registry.imp.pkg.version.range>
<!-- Carbon Identity Framework version -->
- <carbon.identity.framework.version>7.6.0</carbon.identity.framework.version>
+ <carbon.identity.framework.version>7.7.39</carbon.identity.framework.version>
<carbon.identity.framework.imp.pkg.version.range>[5.25.234, 8.0.0)
</carbon.identity.framework.imp.pkg.version.range>
+ <identity.oauth.xacml.version.range>[2.0.0, 3.0.0)</identity.oauth.xacml.version.range>
<carbon.identity.organization.management.version>1.4.7
</carbon.identity.organization.management.version>
@@ -1020,6 +1026,9 @@
<tomcat.version>9.0.96</tomcat.version>
<tomcat.wso2.imp.pkg.version.range>[9.0.0, 9.5.0)</tomcat.wso2.imp.pkg.version.range>
+ <httpcore.version>4.3.3.wso2v1</httpcore.version>
+ <httpcore.version.osgi.import.range>[4.3.0, 5.0.0)</httpcore.version.osgi.import.range>
+ <httpcomponents-httpclient.wso2.version>4.3.6.wso2v2</httpcomponents-httpclient.wso2.version>
<org.apache.cxf.version>3.5.9</org.apache.cxf.version>
<encoder.wso2.version>1.2.0.wso2v1</encoder.wso2.version>
<json-simple.version>1.1.wso2v1</json-simple.version>
From 51a77e2c37223ba7029aa2b8dbd9deb6391457c1 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 18 Dec 2024 10:06:03 +0000
Subject: [PATCH 32/45] [WSO2 Release] [Jenkins #5135] [Release 7.0.200]
prepare release v7.0.200
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index f2080fe162b..00b87bf2a16 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 59a88aeb961..461793ab320 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 71e68db7b30..ddef6d6f857 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index f8cf6287189..ab376033f06 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index c41b4e93423..2d90139252d 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index 53fd8b354c9..d215fae9c05 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index 8347cc1eb56..e38baddfce6 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 6353dd4987d..32bae1d7c7c 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index 00c997d2019..c91fb7a0b04 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index 2ecacbfb3f3..e5562298b2d 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 802fe29de71..3e3141886d3 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index 5c60812a281..2df8f0a9ef1 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index dcaf6ddfbcd..ac7466d32c1 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index b28b6e2115f..fa01f64c658 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index adc246a5a8d..3eb57caa1d3 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index 84fc40df889..5ef13aaa502 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index 9e5b22e7aa7..9f4fa99f1d0 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 0cea46ae837..5581d331604 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index 330acc19556..69a37e9cf7e 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index 6c9695b6d65..7601dd05808 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index 7a913376675..0e4a578d440 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index dd27bd41481..ea1c60aad56 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index d94b640d5d2..3d36ccf7bf2 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index 7d4d60f7728..068d51a418a 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 3cefb32884c..dbaca75f477 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>HEAD</tag>
+ <tag>v7.0.200</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index 9fa15fc3922..50c10d2a4cd 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 2c9851f73bc..a4adb23d081 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200-SNAPSHOT</version>
+ <version>7.0.200</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From 337ae4e3920391bef91b641303d41233d9746706 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 18 Dec 2024 10:06:09 +0000
Subject: [PATCH 33/45] [WSO2 Release] [Jenkins #5135] [Release 7.0.200]
prepare for next development iteration
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 00b87bf2a16..2f6fe4703c3 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 461793ab320..4afbef4d37b 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index ddef6d6f857..b0cb9571e5f 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index ab376033f06..b6c69259816 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 2d90139252d..38b905ae5d2 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index d215fae9c05..68cf210d2a8 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index e38baddfce6..eb380a1dfd3 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 32bae1d7c7c..0d3056a1329 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index c91fb7a0b04..5c051cb59e8 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index e5562298b2d..8a1036edfae 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 3e3141886d3..3bf7fb45c8d 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index 2df8f0a9ef1..b81f93360e8 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index ac7466d32c1..039be77056d 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index fa01f64c658..994d43e49dc 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 3eb57caa1d3..99fbc3a4bc0 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index 5ef13aaa502..f9d7e352bfc 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index 9f4fa99f1d0..f8b1466fc51 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 5581d331604..71e5ed37faa 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index 69a37e9cf7e..1d6dae0d1c3 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index 7601dd05808..6345f5897ae 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index 0e4a578d440..86f1ab1953b 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index ea1c60aad56..3bca5362cd4 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 3d36ccf7bf2..a680efd86a4 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index 068d51a418a..acc7dd50941 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index dbaca75f477..7b1b91c863f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>v7.0.200</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index 50c10d2a4cd..5d11ce3da21 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index a4adb23d081..b634cf1df9c 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.200</version>
+ <version>7.0.201-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From e607ea0a463ec605347fc32b78857d357bd32cf5 Mon Sep 17 00:00:00 2001
From: sandushi <sandushidileka2@gmail.com>
Date: Wed, 18 Dec 2024 16:02:29 +0530
Subject: [PATCH 34/45] Added a comment for test class
---
.../identity/oauth/cache/AuthorizationGrantCacheTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
index aba364e61bc..49e845d0184 100644
--- a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
+++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheTest.java
@@ -48,7 +48,9 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-
+/**
+ * Unit tests for AuthorizationGrantCacheTest class.
+ */
public class AuthorizationGrantCacheTest {
@Mock
From b6a98851f6ef1d95ac712577ebe7b303899bf4d0 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 18 Dec 2024 11:20:10 +0000
Subject: [PATCH 35/45] [WSO2 Release] [Jenkins #5137] [Release 7.0.201]
prepare release v7.0.201
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 2f6fe4703c3..653b03110b3 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 4afbef4d37b..3fc225b1c69 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index b0cb9571e5f..88e86473100 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index b6c69259816..1e187b4ecea 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 38b905ae5d2..27f81b930a7 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index 68cf210d2a8..a353ee4244f 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index eb380a1dfd3..02615b29028 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 0d3056a1329..71d1baab888 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index 5c051cb59e8..086fcc16283 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index 8a1036edfae..034a8bd5a81 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 3bf7fb45c8d..7ded533c960 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index b81f93360e8..f30adee2a4a 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index 039be77056d..b6d3c55086a 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index 994d43e49dc..22685f5c4fd 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 99fbc3a4bc0..1dce3c02e85 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index f9d7e352bfc..4a48eae849a 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index f8b1466fc51..e795239869d 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 71e5ed37faa..84c1b4f97f6 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index 1d6dae0d1c3..1a1b0a5ca45 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index 6345f5897ae..c197a115780 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index 86f1ab1953b..133359a3a7f 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 3bca5362cd4..1ed37e4940c 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index a680efd86a4..540aaca1084 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index acc7dd50941..6dda4a1fcea 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 7b1b91c863f..32fb5258d3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>HEAD</tag>
+ <tag>v7.0.201</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index 5d11ce3da21..c3c8b5c17ad 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index b634cf1df9c..59dcc210b26 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201-SNAPSHOT</version>
+ <version>7.0.201</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From f40ff1a0111f44fb0ab0c9f370010f33c76d56aa Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 18 Dec 2024 11:20:12 +0000
Subject: [PATCH 36/45] [WSO2 Release] [Jenkins #5137] [Release 7.0.201]
prepare for next development iteration
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 653b03110b3..abe30b44579 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 3fc225b1c69..6d408b72a82 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 88e86473100..1c5ee5e8408 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index 1e187b4ecea..de970cc1549 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 27f81b930a7..2ea444f9a30 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index a353ee4244f..0420e10d452 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index 02615b29028..20569877af7 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 71d1baab888..029f9dc6a51 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index 086fcc16283..2dd6a3445b7 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index 034a8bd5a81..f2322e7de5c 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 7ded533c960..79f5295dab7 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index f30adee2a4a..a1e596d6575 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index b6d3c55086a..f8e460085bb 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index 22685f5c4fd..5d9f427309c 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 1dce3c02e85..a93ab254aed 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index 4a48eae849a..473c9d831bf 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index e795239869d..6ae4904465a 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 84c1b4f97f6..87dd4e915e6 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index 1a1b0a5ca45..1beded74274 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index c197a115780..b5117d6c32e 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index 133359a3a7f..560d0793ff0 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 1ed37e4940c..363c5025895 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 540aaca1084..0b71d57b76f 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index 6dda4a1fcea..116f12e71b7 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 32fb5258d3f..129a098f04b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>v7.0.201</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index c3c8b5c17ad..6a03a5463da 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 59dcc210b26..2f230275c49 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.201</version>
+ <version>7.0.202-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From 178bdcc4b3bf5d2d52513a83125396d038247c10 Mon Sep 17 00:00:00 2001
From: Thilina Shashimal Senarath
<43197743+shashimalcse@users.noreply.github.com>
Date: Wed, 18 Dec 2024 20:13:06 +0530
Subject: [PATCH 37/45] Fix access token attributes for federated user (#2653)
fix access token attributes for federated user
---
.../endpoint/authz/OAuth2AuthzEndpoint.java | 42 +
.../cache/AuthorizationGrantCacheEntry.java | 13 +
.../oauth/cache/SessionDataCacheEntry.java | 12 +
.../handlers/TokenResponseTypeHandler.java | 5 +
.../util/ResponseTypeHandlerUtil.java | 5 +
.../DeviceAuthorizationGrantCacheEntry.java | 12 +
.../oauth2/dto/OAuth2AuthorizeReqDTO.java | 14 +
.../oauth2/token/AccessTokenIssuer.java | 8 +-
.../JWTAccessTokenOIDCClaimsHandler.java | 774 +++++++++++++++++-
.../JWTAccessTokenOIDCClaimsHandlerTest.java | 116 ++-
pom.xml | 2 +-
11 files changed, 958 insertions(+), 45 deletions(-)
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/authz/OAuth2AuthzEndpoint.java b/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/authz/OAuth2AuthzEndpoint.java
index 58f004c7fd9..c6724c68cdb 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/authz/OAuth2AuthzEndpoint.java
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/authz/OAuth2AuthzEndpoint.java
@@ -421,6 +421,36 @@ private void addFederatedTokensToSessionCache(OAuthMessage oAuthMessage,
}
}
+ /**
+ * Add mapped remote claims to session cache.
+ *
+ * @param oAuthMessage The OAuthMessage with the session data cache entry.
+ * @param authenticationResult The authentication result of authorization call.
+ */
+ private void addMappedRemoteClaimsToSessionCache(OAuthMessage oAuthMessage,
+ AuthenticationResult authenticationResult) {
+
+ Optional<Map<String, String>> mappedRemoteClaims = authenticationResult.getMappedRemoteClaims();
+ if (!mappedRemoteClaims.isPresent()) {
+ return;
+ }
+
+ SessionDataCacheEntry sessionDataCacheEntry = oAuthMessage.getSessionDataCacheEntry();
+ if (sessionDataCacheEntry == null || mappedRemoteClaims.get().isEmpty()) {
+ return;
+ }
+ Map<ClaimMapping, String> mappedRemoteClaimsMap = new HashMap<>();
+ mappedRemoteClaims.get().forEach(
+ (key, value) -> mappedRemoteClaimsMap.put(ClaimMapping.build(key, key, null,
+ false), value));
+ sessionDataCacheEntry.setMappedRemoteClaims(mappedRemoteClaimsMap);
+ if (log.isDebugEnabled() && authenticationResult.getSubject() != null) {
+ log.debug("Added the mapped remote claims to the session data cache. " +
+ "Session context identifier: " + sessionDataCacheEntry.getSessionContextIdentifier()
+ + " for the user: " + authenticationResult.getSubject().getLoggableMaskedUserId());
+ }
+ }
+
/**
* This method creates a list of FederatedTokenDO objects from the list of FederatedToken objects.
*
@@ -1389,6 +1419,9 @@ private void addToAuthenticationResultDetailsToOAuthMessage(OAuthMessage oAuthMe
authnResult.getProperty(FrameworkConstants.AnalyticsAttributes.SESSION_ID));
// Adding federated tokens come with the authentication result of the authorization call.
addFederatedTokensToSessionCache(oAuthMessage, authnResult);
+ // Adding mapped remoted claims come with the authentication result to resolve access token claims in
+ // federated flow.
+ addMappedRemoteClaimsToSessionCache(oAuthMessage, authnResult);
}
private void updateAuthTimeInSessionDataCacheEntry(OAuthMessage oAuthMessage) {
@@ -2143,6 +2176,10 @@ private void addUserAttributesToOAuthMessage(OAuthMessage oAuthMessage, String c
authorizationGrantCacheEntry.setRequestObjectFlow(isRequestObjectFlow);
authorizationGrantCacheEntry.setFederatedTokens(sessionDataCacheEntry.getFederatedTokens());
sessionDataCacheEntry.setFederatedTokens(null);
+ Map<ClaimMapping, String> mappedRemoteClaims = sessionDataCacheEntry.getMappedRemoteClaims();
+ if (mappedRemoteClaims != null) {
+ authorizationGrantCacheEntry.setMappedRemoteClaims(mappedRemoteClaims);
+ }
oAuthMessage.setAuthorizationGrantCacheEntry(authorizationGrantCacheEntry);
}
@@ -3785,6 +3822,7 @@ private OAuth2AuthorizeReqDTO buildAuthRequest(OAuth2Parameters oauth2Params, Se
authzReqDTO.setState(oauth2Params.getState());
authzReqDTO.setHttpServletRequestWrapper(new HttpServletRequestWrapper(request));
authzReqDTO.setRequestedSubjectId(oauth2Params.getRequestedSubjectId());
+ authzReqDTO.setMappedRemoteClaims(sessionDataCacheEntry.getMappedRemoteClaims());
if (sessionDataCacheEntry.getParamMap() != null && sessionDataCacheEntry.getParamMap().get(OAuthConstants
.AMR) != null) {
@@ -4520,6 +4558,10 @@ private void addUserAttributesToCache(SessionDataCacheEntry sessionDataCacheEntr
DeviceAuthorizationGrantCacheKey cacheKey = new DeviceAuthorizationGrantCacheKey(deviceCode);
DeviceAuthorizationGrantCacheEntry cacheEntry =
new DeviceAuthorizationGrantCacheEntry(sessionDataCacheEntry.getLoggedInUser().getUserAttributes());
+ if (sessionDataCacheEntry.getMappedRemoteClaims() != null) {
+ cacheEntry.setMappedRemoteClaims(sessionDataCacheEntry
+ .getMappedRemoteClaims());
+ }
DeviceAuthorizationGrantCache.getInstance().addToCache(cacheKey, cacheEntry);
}
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheEntry.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheEntry.java
index 41e81160253..a0cc0d474c7 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheEntry.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/AuthorizationGrantCacheEntry.java
@@ -66,6 +66,8 @@ public class AuthorizationGrantCacheEntry extends CacheEntry {
private boolean hasNonOIDCClaims;
+ private Map<ClaimMapping, String> mappedRemoteClaims;
+
/*
OIDC sub claim. This should be formatted based on the Service Provider configurations to append
userStoreDomain and tenantDomain.
@@ -390,4 +392,15 @@ public void setPreIssueAccessTokenActionsExecuted(boolean preIssueAccessTokenAct
isPreIssueAccessTokenActionsExecuted = preIssueAccessTokenActionsExecuted;
}
+
+ public Map<ClaimMapping, String> getMappedRemoteClaims() {
+
+ return mappedRemoteClaims;
+ }
+
+ public void setMappedRemoteClaims(
+ Map<ClaimMapping, String> mappedRemoteClaims) {
+
+ this.mappedRemoteClaims = mappedRemoteClaims;
+ }
}
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/SessionDataCacheEntry.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/SessionDataCacheEntry.java
index b2febaedfb5..59d07dc961e 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/SessionDataCacheEntry.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/cache/SessionDataCacheEntry.java
@@ -19,6 +19,7 @@
package org.wso2.carbon.identity.oauth.cache;
import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser;
+import org.wso2.carbon.identity.application.common.model.ClaimMapping;
import org.wso2.carbon.identity.oauth2.authz.OAuthAuthzReqMessageContext;
import org.wso2.carbon.identity.oauth2.model.FederatedTokenDO;
import org.wso2.carbon.identity.oauth2.model.OAuth2Parameters;
@@ -53,6 +54,7 @@ public class SessionDataCacheEntry extends CacheEntry {
private Map<String, Serializable> endpointParams = new HashMap<>();
private List<FederatedTokenDO> federatedTokens;
+ private Map<ClaimMapping, String> mappedRemoteClaims;
public OAuthAuthzReqMessageContext getAuthzReqMsgCtx() {
return authzReqMsgCtx;
@@ -172,4 +174,14 @@ public void setFederatedTokens(List<FederatedTokenDO> federatedTokens) {
this.federatedTokens = federatedTokens;
}
+
+ public Map<ClaimMapping, String> getMappedRemoteClaims() {
+
+ return mappedRemoteClaims;
+ }
+
+ public void setMappedRemoteClaims(Map<ClaimMapping, String> mappedRemoteClaims) {
+
+ this.mappedRemoteClaims = mappedRemoteClaims;
+ }
}
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/authz/handlers/TokenResponseTypeHandler.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/authz/handlers/TokenResponseTypeHandler.java
index c2563ab165a..55523e995b8 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/authz/handlers/TokenResponseTypeHandler.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/authz/handlers/TokenResponseTypeHandler.java
@@ -554,6 +554,11 @@ private void addUserAttributesToCache(String accessToken,
authorizationGrantCacheEntry.setMaxAge(authorizeReqDTO.getMaxAge());
}
+ if (authorizeReqDTO.getMappedRemoteClaims() != null) {
+ authorizationGrantCacheEntry.setMappedRemoteClaims(
+ authorizeReqDTO.getMappedRemoteClaims());
+ }
+
ClaimMapping key = new ClaimMapping();
Claim claimOfKey = new Claim();
claimOfKey.setClaimUri(OAuth2Util.SUB);
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/authz/handlers/util/ResponseTypeHandlerUtil.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/authz/handlers/util/ResponseTypeHandlerUtil.java
index d124e392b62..08696c48c9d 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/authz/handlers/util/ResponseTypeHandlerUtil.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/authz/handlers/util/ResponseTypeHandlerUtil.java
@@ -487,6 +487,11 @@ private static void addUserAttributesToCache(String accessToken, OAuthAuthzReqMe
userAttributes.put(key, sub);
}
+ if (authorizeReqDTO.getMappedRemoteClaims() != null) {
+ authorizationGrantCacheEntry.setMappedRemoteClaims(
+ authorizeReqDTO.getMappedRemoteClaims());
+ }
+
authorizationGrantCacheEntry
.setValidityPeriod(TimeUnit.MILLISECONDS.toNanos(accessTokenDO.getValidityPeriodInMillis()));
AuthorizationGrantCache.getInstance().addToCacheByToken(authorizationGrantCacheKey,
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/device/cache/DeviceAuthorizationGrantCacheEntry.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/device/cache/DeviceAuthorizationGrantCacheEntry.java
index 9e6b022940e..3d77c42c7e4 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/device/cache/DeviceAuthorizationGrantCacheEntry.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/device/cache/DeviceAuthorizationGrantCacheEntry.java
@@ -31,6 +31,7 @@ public class DeviceAuthorizationGrantCacheEntry extends CacheEntry {
private static final long serialVersionUID = -3043225645166013281L;
private Map<ClaimMapping, String> userAttributes;
+ private Map<ClaimMapping, String> mappedRemoteClaims;
public DeviceAuthorizationGrantCacheEntry(Map<ClaimMapping, String> userAttributes) {
@@ -56,4 +57,15 @@ public void setUserAttributes(Map<ClaimMapping, String> userAttributes) {
this.userAttributes = userAttributes;
}
+
+ public Map<ClaimMapping, String> getMappedRemoteClaims() {
+
+ return mappedRemoteClaims;
+ }
+
+ public void setMappedRemoteClaims(
+ Map<ClaimMapping, String> mappedRemoteClaims) {
+
+ this.mappedRemoteClaims = mappedRemoteClaims;
+ }
}
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dto/OAuth2AuthorizeReqDTO.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dto/OAuth2AuthorizeReqDTO.java
index e3db5c13814..94cc22c362c 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dto/OAuth2AuthorizeReqDTO.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/dto/OAuth2AuthorizeReqDTO.java
@@ -19,10 +19,12 @@
package org.wso2.carbon.identity.oauth2.dto;
import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser;
+import org.wso2.carbon.identity.application.common.model.ClaimMapping;
import org.wso2.carbon.identity.oauth2.model.HttpRequestHeader;
import org.wso2.carbon.identity.openidconnect.model.RequestObject;
import java.util.LinkedHashSet;
+import java.util.Map;
import java.util.Properties;
import javax.servlet.http.Cookie;
@@ -61,6 +63,7 @@ public class OAuth2AuthorizeReqDTO {
private boolean isRequestObjectFlow;
private String state;
private String requestedSubjectId;
+ private Map<ClaimMapping, String> mappedRemoteClaims;
public String getRequestedSubjectId() {
@@ -303,4 +306,15 @@ public void setHttpServletRequestWrapper(HttpServletRequestWrapper httpServletRe
this.httpServletRequestWrapper = httpServletRequestWrapper;
}
+
+ public Map<ClaimMapping, String> getMappedRemoteClaims() {
+
+ return mappedRemoteClaims;
+ }
+
+ public void setMappedRemoteClaims(
+ Map<ClaimMapping, String> mappedRemoteClaims) {
+
+ this.mappedRemoteClaims = mappedRemoteClaims;
+ }
}
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/AccessTokenIssuer.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/AccessTokenIssuer.java
index 16f539f4ec4..0158db681b1 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/AccessTokenIssuer.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/AccessTokenIssuer.java
@@ -621,7 +621,13 @@ private Optional<AuthorizationGrantCacheEntry> getAuthzGrantCacheEntryFromDevice
DeviceAuthorizationGrantCache.getInstance().getValueFromCache(deviceCodeCacheKey);
if (cacheEntry != null) {
Map<ClaimMapping, String> userAttributes = cacheEntry.getUserAttributes();
- return Optional.of(new AuthorizationGrantCacheEntry(userAttributes));
+ AuthorizationGrantCacheEntry authorizationGrantCacheEntry =
+ new AuthorizationGrantCacheEntry(userAttributes);
+ if (cacheEntry.getMappedRemoteClaims() != null) {
+ authorizationGrantCacheEntry.setMappedRemoteClaims(cacheEntry
+ .getMappedRemoteClaims());
+ }
+ return Optional.of(authorizationGrantCacheEntry);
}
return Optional.empty();
}
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java
index 9c91b7c8a6d..ca6bbbff1df 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java
@@ -20,27 +20,46 @@
import com.nimbusds.jwt.JWTClaimsSet;
import net.minidev.json.JSONArray;
+import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
+import org.wso2.carbon.CarbonConstants;
import org.wso2.carbon.base.MultitenantConstants;
import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser;
import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkUtils;
import org.wso2.carbon.identity.application.common.IdentityApplicationManagementException;
+import org.wso2.carbon.identity.application.common.model.ClaimMapping;
import org.wso2.carbon.identity.application.common.model.ServiceProvider;
import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
+import org.wso2.carbon.identity.base.IdentityConstants;
import org.wso2.carbon.identity.base.IdentityException;
import org.wso2.carbon.identity.claim.metadata.mgt.ClaimMetadataHandler;
import org.wso2.carbon.identity.claim.metadata.mgt.exception.ClaimMetadataException;
import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
+import org.wso2.carbon.identity.core.util.IdentityUtil;
+import org.wso2.carbon.identity.oauth.cache.AuthorizationGrantCache;
+import org.wso2.carbon.identity.oauth.cache.AuthorizationGrantCacheEntry;
+import org.wso2.carbon.identity.oauth.cache.AuthorizationGrantCacheKey;
import org.wso2.carbon.identity.oauth.common.OAuthConstants;
import org.wso2.carbon.identity.oauth.common.exception.InvalidOAuthClientException;
+import org.wso2.carbon.identity.oauth.config.OAuthServerConfiguration;
import org.wso2.carbon.identity.oauth.dao.OAuthAppDO;
import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
import org.wso2.carbon.identity.oauth2.authz.OAuthAuthzReqMessageContext;
import org.wso2.carbon.identity.oauth2.dao.OAuthTokenPersistenceFactory;
+import org.wso2.carbon.identity.oauth2.device.cache.DeviceAuthorizationGrantCache;
+import org.wso2.carbon.identity.oauth2.device.cache.DeviceAuthorizationGrantCacheEntry;
+import org.wso2.carbon.identity.oauth2.device.cache.DeviceAuthorizationGrantCacheKey;
+import org.wso2.carbon.identity.oauth2.dto.OAuth2AuthorizeReqDTO;
import org.wso2.carbon.identity.oauth2.internal.OAuth2ServiceComponentHolder;
+import org.wso2.carbon.identity.oauth2.model.RefreshTokenValidationDataDO;
+import org.wso2.carbon.identity.oauth2.token.AccessTokenIssuer;
import org.wso2.carbon.identity.oauth2.token.OAuthTokenReqMessageContext;
+import org.wso2.carbon.identity.oauth2.token.OauthTokenIssuer;
+import org.wso2.carbon.identity.oauth2.token.handlers.grant.RefreshGrantHandler;
+import org.wso2.carbon.identity.oauth2.util.AuthzUtil;
import org.wso2.carbon.identity.oauth2.util.OAuth2Util;
import org.wso2.carbon.identity.openidconnect.internal.OpenIDConnectServiceComponentHolder;
import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementException;
@@ -48,6 +67,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -55,8 +75,13 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import static org.apache.commons.collections.MapUtils.isEmpty;
+import static org.apache.commons.collections.MapUtils.isNotEmpty;
+import static org.wso2.carbon.identity.oauth.common.OAuthConstants.ACCESS_TOKEN;
+import static org.wso2.carbon.identity.oauth.common.OAuthConstants.AUTHZ_CODE;
import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCClaims.ADDRESS;
import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCClaims.GROUPS;
+import static org.wso2.carbon.identity.oauth2.device.constants.Constants.DEVICE_CODE;
/**
* A class that provides OIDC claims for JWT access tokens.
@@ -66,21 +91,14 @@ public class JWTAccessTokenOIDCClaimsHandler implements CustomClaimsCallbackHand
private static final Log log = LogFactory.getLog(JWTAccessTokenOIDCClaimsHandler.class);
private static final String OAUTH2 = "oauth2";
+ private static final String OIDC_DIALECT = "http://wso2.org/oidc/claim";
@Override
public JWTClaimsSet handleCustomClaims(JWTClaimsSet.Builder builder, OAuthTokenReqMessageContext request)
throws IdentityOAuth2Exception {
- String clientId = request.getOauth2AccessTokenReqDTO().getClientId();
- String spTenantDomain = getServiceProviderTenantDomain(request);
- AuthenticatedUser authenticatedUser = request.getAuthorizedUser();
-
- Map<String, Object> claims = getAccessTokenUserClaims(authenticatedUser, clientId, spTenantDomain);
- if (claims == null || claims.isEmpty()) {
- return builder.build();
- }
- Map<String, Object> filteredClaims = handleClaimsFormat(claims, clientId, spTenantDomain);
- return setClaimsToJwtClaimSet(builder, filteredClaims);
+ Map<String, Object> claims = getUserClaimsInOIDCDialect(request);
+ return setClaimsToJwtClaimSet(builder, claims);
}
@Override
@@ -91,63 +109,569 @@ public JWTClaimsSet handleCustomClaims(JWTClaimsSet.Builder builder, OAuthAuthzR
Handling the user attributes for the access token. There is no requirement of the consent
to manage user attributes for the access token.
*/
- String clientId = request.getAuthorizationReqDTO().getConsumerKey();
- String spTenantDomain = getServiceProviderTenantDomain(request);
- AuthenticatedUser authenticatedUser = request.getAuthorizationReqDTO().getUser();
+ Map<String, Object> claims = getUserClaimsInOIDCDialect(request);
+ return setClaimsToJwtClaimSet(builder, claims);
+ }
+
+ /**
+ * Get user claims in OIDC dialect.
+ *
+ * @param requestMsgCtx OAuthTokenReqMessageContext
+ * @return User claims in OIDC dialect
+ * @throws IdentityOAuth2Exception IdentityOAuth2Exception
+ */
+ private Map<String, Object> getUserClaimsInOIDCDialect(OAuthTokenReqMessageContext requestMsgCtx)
+ throws IdentityOAuth2Exception {
+
+ Map<String, Object> userClaimsInOIDCDialect;
- Map<String, Object> claims = getAccessTokenUserClaims(authenticatedUser, clientId, spTenantDomain);
- if (claims == null || claims.isEmpty()) {
- return builder.build();
+ Map<ClaimMapping, String> userAttributes = getCachedUserAttributes(requestMsgCtx, false);
+ if ((userAttributes.isEmpty() || isOrganizationSwitchGrantType(requestMsgCtx))
+ && (isLocalUser(requestMsgCtx.getAuthorizedUser())
+ || isOrganizationSsoUserSwitchingOrganization(requestMsgCtx.getAuthorizedUser()))) {
+ if (log.isDebugEnabled()) {
+ log.debug("User attributes not found in cache against the access token or authorization code. " +
+ "Retrieving claims for local user: " + requestMsgCtx.getAuthorizedUser() + " from userstore.");
+ }
+ if (!StringUtils.equals(requestMsgCtx.getAuthorizedUser().getUserResidentOrganization(),
+ requestMsgCtx.getAuthorizedUser().getAccessingOrganization()) &&
+ !CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME &&
+ StringUtils.isNotEmpty(AuthzUtil.getUserIdOfAssociatedUser(requestMsgCtx.getAuthorizedUser()))) {
+ requestMsgCtx.getAuthorizedUser().setSharedUserId(AuthzUtil.getUserIdOfAssociatedUser(requestMsgCtx
+ .getAuthorizedUser()));
+ requestMsgCtx.getAuthorizedUser().setUserSharedOrganizationId(requestMsgCtx.getAuthorizedUser()
+ .getAccessingOrganization());
+ }
+ // Get claim in oidc dialect from user store.
+ userClaimsInOIDCDialect = retrieveClaimsForLocalUser(requestMsgCtx);
+ } else {
+ // Get claim map from the cached attributes
+ userClaimsInOIDCDialect = getOIDCClaimsFromUserAttributes(userAttributes, requestMsgCtx);
+ // Since this is a federated flow, we need to get the federated user attributes as well.
+ Map<ClaimMapping, String> federatedUserAttributes = getCachedUserAttributes(requestMsgCtx, true);
+ Map<String, Object> federatedUserClaimsInOIDCDialect =
+ getOIDCClaimsFromFederatedUserAttributes(federatedUserAttributes, requestMsgCtx);
+ userClaimsInOIDCDialect.putAll(federatedUserClaimsInOIDCDialect);
+ }
+
+ Object hasNonOIDCClaimsProperty = requestMsgCtx.getProperty(OIDCConstants.HAS_NON_OIDC_CLAIMS);
+ if (isPreserverClaimUrisInAssertion(requestMsgCtx) || (hasNonOIDCClaimsProperty != null
+ && (Boolean) hasNonOIDCClaimsProperty)) {
+ return userClaimsInOIDCDialect;
+ } else {
+ return filterClaims(userClaimsInOIDCDialect, requestMsgCtx);
}
- Map<String, Object> filteredClaims = handleClaimsFormat(claims, clientId, spTenantDomain);
- return setClaimsToJwtClaimSet(builder, filteredClaims);
}
- private Map<String, Object> getAccessTokenUserClaims(AuthenticatedUser authenticatedUser, String clientId,
- String spTenantDomain)
- throws IdentityOAuth2Exception {
+ /**
+ * Filter claims with allowed access token claims
+ *
+ * @param userClaimsInOIDCDialect User claims in OIDC dialect
+ * @param requestMsgCtx OAuthTokenReqMessageContext
+ * @return Filtered claims
+ * @throws IdentityOAuth2Exception IdentityOAuth2Exception
+ */
+ private Map<String, Object> filterClaims(Map<String, Object> userClaimsInOIDCDialect,
+ OAuthTokenReqMessageContext requestMsgCtx) throws IdentityOAuth2Exception {
+ String spTenantDomain = getServiceProviderTenantDomain(requestMsgCtx);
+ String clientId = requestMsgCtx.getOauth2AccessTokenReqDTO().getClientId();
// Get allowed access token claims.
List<String> allowedClaims = getAccessTokenClaims(clientId, spTenantDomain);
if (allowedClaims.isEmpty()) {
return new HashMap<>();
}
+ Map<String, Object> claims = allowedClaims.stream()
+ .filter(userClaimsInOIDCDialect::containsKey)
+ .collect(Collectors.toMap(claim -> claim, userClaimsInOIDCDialect::get));
+ return handleClaimsFormat(claims, clientId, spTenantDomain);
+ }
- // Get OIDC to Local claim mappings.
- Map<String, String> oidcToLocalClaimMappings = getOIDCToLocalClaimMappings(spTenantDomain);
- if (oidcToLocalClaimMappings.isEmpty()) {
+ /**
+ * Filter claims with allowed access token claims
+ *
+ * @param userClaimsInOIDCDialect User claims in OIDC dialect
+ * @param authzReqMessageContext OAuthAuthzReqMessageContext
+ * @return Filtered claims
+ * @throws IdentityOAuth2Exception IdentityOAuth2Exception
+ */
+ private Map<String, Object> filterClaims(Map<String, Object> userClaimsInOIDCDialect,
+ OAuthAuthzReqMessageContext authzReqMessageContext)
+ throws IdentityOAuth2Exception {
+
+ String spTenantDomain = getServiceProviderTenantDomain(authzReqMessageContext);
+ String clientId = authzReqMessageContext.getAuthorizationReqDTO().getConsumerKey();
+ // Get allowed access token claims.
+ List<String> allowedClaims = getAccessTokenClaims(clientId, spTenantDomain);
+ if (allowedClaims.isEmpty()) {
return new HashMap<>();
}
- List<String> localClaimURIs = allowedClaims.stream().map(oidcToLocalClaimMappings::get).filter(Objects::nonNull)
- .collect(Collectors.toList());
+ Map<String, Object> claims = allowedClaims.stream().filter(userClaimsInOIDCDialect::containsKey)
+ .collect(Collectors.toMap(claim -> claim, userClaimsInOIDCDialect::get));
+ return handleClaimsFormat(claims, clientId, spTenantDomain);
+ }
+
+ /**
+ * Get claims for local user form userstore.
+ *
+ * @param requestMsgCtx OAuthTokenReqMessageContext
+ * @return Local user claims
+ * @throws IdentityOAuth2Exception IdentityOAuth2Exception
+ */
+ private Map<String, Object> retrieveClaimsForLocalUser(OAuthTokenReqMessageContext requestMsgCtx)
+ throws IdentityOAuth2Exception {
+
try {
- return getUserClaimsFromUserStore(authenticatedUser, clientId, spTenantDomain, localClaimURIs);
+ String spTenantDomain = getServiceProviderTenantDomain(requestMsgCtx);
+ String clientId = requestMsgCtx.getOauth2AccessTokenReqDTO().getClientId();
+ AuthenticatedUser authenticatedUser = requestMsgCtx.getAuthorizedUser();
+
+ return getLocalUserClaimsInOIDCDialect(spTenantDomain, clientId, authenticatedUser);
} catch (UserStoreException | IdentityApplicationManagementException | IdentityException |
OrganizationManagementException e) {
if (FrameworkUtils.isContinueOnClaimHandlingErrorAllowed()) {
- log.error("Error occurred while getting claims for user: " + authenticatedUser +
+ log.error("Error occurred while getting claims for user: " + requestMsgCtx.getAuthorizedUser() +
" from userstore.", e);
} else {
throw new IdentityOAuth2Exception("Error occurred while getting claims for user: " +
- authenticatedUser + " from userstore.", e);
+ requestMsgCtx.getAuthorizedUser() + " from userstore.", e);
}
}
- return null;
+ return new HashMap<>();
}
/**
- * This method retrieves user claims from the user store.
+ * Get oidc claims mapping.
*
- * @param authenticatedUser Authenticated user.
- * @param clientId Client Id.
- * @param spTenantDomain SP tenant domain.
- * @param claimURIList List of claim URIs.
- * @return Map of user claims.
+ * @param userAttributes User attributes.
+ * @param requestMsgCtx Request Context.
+ * @return User attributes Map.
+ */
+ private Map<String, Object> getOIDCClaimsFromUserAttributes(Map<ClaimMapping, String> userAttributes,
+ OAuthTokenReqMessageContext requestMsgCtx)
+ throws IdentityOAuth2Exception {
+
+ String spTenantDomain = getServiceProviderTenantDomain(requestMsgCtx);
+ Map<String, String> claims = new HashMap<>();
+ if (isNotEmpty(userAttributes)) {
+ for (Map.Entry<ClaimMapping, String> entry : userAttributes.entrySet()) {
+ claims.put(entry.getKey().getRemoteClaim().getClaimUri(), entry.getValue().toString());
+ }
+ }
+ return OIDCClaimUtil.getMergedUserClaimsInOIDCDialect(spTenantDomain, claims);
+ }
+
+ /**
+ * Get oidc claims mapping.
+ *
+ * @param federatedUserAttributed User attributes.
+ * @param requestMsgCtx Request Context.
+ * @return User attributes Map.
+ */
+ private Map<String, Object> getOIDCClaimsFromFederatedUserAttributes(Map<ClaimMapping,
+ String> federatedUserAttributed, OAuthTokenReqMessageContext requestMsgCtx)
+ throws IdentityOAuth2Exception {
+
+ String spTenantDomain = getServiceProviderTenantDomain(requestMsgCtx);
+ // Retrieve OIDC to Local Claim Mappings.
+ Map<String, String> oidcToLocalClaimMappings = null;
+ try {
+ oidcToLocalClaimMappings = ClaimMetadataHandler.getInstance()
+ .getMappingsMapFromOtherDialectToCarbon(OIDC_DIALECT, null, spTenantDomain, false);
+ } catch (ClaimMetadataException e) {
+ throw new IdentityOAuth2Exception("Error while retrieving OIDC to Local claim mappings.", e);
+ }
+ // Get user claims in OIDC dialect.
+ Map<String, String> userClaimsInOidcDialect = new HashMap<>();
+ if (MapUtils.isNotEmpty(federatedUserAttributed)) {
+ for (Map.Entry<ClaimMapping, String> userAttribute : federatedUserAttributed.entrySet()) {
+ ClaimMapping claimMapping = userAttribute.getKey();
+ String claimValue = userAttribute.getValue();
+ if (oidcToLocalClaimMappings.containsValue(claimMapping.getLocalClaim().getClaimUri())) {
+ String localClaimURI = claimMapping.getLocalClaim().getClaimUri();
+ String oidcClaimUri = oidcToLocalClaimMappings.entrySet().stream()
+ .filter(entry -> entry.getValue().equals(localClaimURI))
+ .map(Map.Entry::getKey)
+ .findFirst()
+ .orElse(null);
+
+ if (oidcClaimUri != null) {
+ userClaimsInOidcDialect.put(oidcClaimUri, claimValue.toString());
+ if (log.isDebugEnabled() &&
+ IdentityUtil.isTokenLoggable(IdentityConstants.IdentityTokens.USER_CLAIMS)) {
+ log.debug("Mapped claim: key - " + oidcClaimUri + " value - " + claimValue);
+ }
+ }
+ }
+ }
+ }
+ return OIDCClaimUtil.getMergedUserClaimsInOIDCDialect(spTenantDomain, userClaimsInOidcDialect);
+ }
+
+ /**
+ * Get user claims in OIDC dialect.
+ *
+ * @param authzReqMessageContext OAuthAuthzReqMessageContext
+ * @return User claims in OIDC dialect
+ * @throws IdentityOAuth2Exception IdentityOAuth2Exception
+ */
+ private Map<String, Object> getUserClaimsInOIDCDialect(OAuthAuthzReqMessageContext authzReqMessageContext)
+ throws IdentityOAuth2Exception {
+
+ Map<String, Object> userClaimsInOIDCDialect;
+ Map<ClaimMapping, String> userAttributes =
+ getUserAttributesCachedAgainstToken(getAccessToken(authzReqMessageContext), false);
+
+ if (isEmpty(userAttributes)) {
+ if (isLocalUser(authzReqMessageContext)) {
+ if (log.isDebugEnabled()) {
+ log.debug("User attributes not found in cache. Trying to retrieve attribute for " +
+ "local user: " + authzReqMessageContext.getAuthorizationReqDTO().getUser());
+ }
+
+ userClaimsInOIDCDialect = retrieveClaimsForLocalUser(authzReqMessageContext);
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("User attributes not found in cache. Trying to retrieve attribute for federated " +
+ "user: " + authzReqMessageContext.getAuthorizationReqDTO().getUser());
+ }
+ userClaimsInOIDCDialect = retrieveClaimsForFederatedUser(authzReqMessageContext);
+ }
+ } else {
+ userClaimsInOIDCDialect = getOIDCClaimMapFromUserAttributes(userAttributes);
+ // Since this is a federated flow we are retrieving the federated user attributes as well.
+ Map<ClaimMapping, String> federatedUserAttributes =
+ getUserAttributesCachedAgainstToken(getAccessToken(authzReqMessageContext), true);
+ Map<String, Object> federatedUserClaimsInOIDCDialect =
+ getUserClaimsInOIDCDialectFromFederatedUserAttributes(authzReqMessageContext
+ .getAuthorizationReqDTO().getTenantDomain(), federatedUserAttributes);
+ userClaimsInOIDCDialect.putAll(federatedUserClaimsInOIDCDialect);
+ }
+ return filterClaims(userClaimsInOIDCDialect, authzReqMessageContext);
+ }
+
+ /**
+ * This method retrieves the user attributes cached against the access token or the authorization code.
+ * Currently, this is supported for the code grant and the refresh grant.
+ *
+ * @param requestMsgCtx The context of the OAuth token request containing necessary properties.
+ * @param fetchFederatedUserAttributes Flag to indicate whether to fetch federated user attributes.
+ * @return A map of cached user attributes against the code or the access token.
+ * @throws IdentityOAuth2Exception If an error occurs while selecting the OAuth2 token issuer.
+ */
+ private Map<ClaimMapping, String> getCachedUserAttributes(OAuthTokenReqMessageContext requestMsgCtx,
+ boolean fetchFederatedUserAttributes)
+ throws IdentityOAuth2Exception {
+
+ Map<ClaimMapping, String> userAttributes = getUserAttributesCachedAgainstAuthorizationCode(
+ getAuthorizationCode(requestMsgCtx), fetchFederatedUserAttributes);
+ if (log.isDebugEnabled()) {
+ log.debug("Retrieving claims cached against authorization_code for user: " +
+ requestMsgCtx.getAuthorizedUser());
+ }
+ if (isEmpty(userAttributes)) {
+ if (log.isDebugEnabled()) {
+ log.debug("No claims cached against the authorization_code for user: " + requestMsgCtx.
+ getAuthorizedUser() + ". Retrieving claims cached against the access_token.");
+ }
+ userAttributes = getUserAttributesCachedAgainstToken(getAccessToken(requestMsgCtx),
+ fetchFederatedUserAttributes);
+ if (log.isDebugEnabled()) {
+ log.debug("Retrieving claims cached against access_token for user: " +
+ requestMsgCtx.getAuthorizedUser());
+ }
+ }
+ // Check for claims cached against the device code.
+ if (isEmpty(userAttributes)) {
+ if (log.isDebugEnabled()) {
+ log.debug("No claims cached against the access_token for user: " +
+ requestMsgCtx.getAuthorizedUser() + ". Retrieving claims cached against the device code.");
+ }
+ userAttributes = getUserAttributesCachedAgainstDeviceCode(getDeviceCode(requestMsgCtx),
+ fetchFederatedUserAttributes);
+ }
+ /* When building the jwt token, we cannot add it to authorization cache, as we save entries against, access
+ token. Hence if it is added against authenticated user object.*/
+ if (isEmpty(userAttributes)) {
+ if (log.isDebugEnabled()) {
+ log.debug("No claims found in authorization cache. Retrieving claims from attributes of user : " +
+ requestMsgCtx.getAuthorizedUser());
+ }
+ AuthenticatedUser user = requestMsgCtx.getAuthorizedUser();
+ userAttributes = user != null ? user.getUserAttributes() : null;
+ }
+ // In the refresh flow, we need to follow the same way to get the claims.
+ if (isEmpty(userAttributes)) {
+ if (log.isDebugEnabled()) {
+ log.debug("No claims found in user in user attributes for user : " + requestMsgCtx.getAuthorizedUser());
+ }
+
+ /*
+ The purpose of this segment is retrieving the user attributes at the refresh grant while the caches
+ are disabled. The code/token acts as the key in cache layer while access token hash acts as the key for
+ entries in the persistence layer(SessionStore).
+ At this point, the token indicated by RefreshGrantHandler.PREV_ACCESS_TOKEN is no longer
+ present in the caches or the persistence layer because a new access token has already been generated
+ and added to the cache with new token references. However, RefreshGrantHandler.PREV_ACCESS_TOKEN cannot
+ yet be replaced with the new access token since the refresh token has not been generated, and
+ the new token is not yet considered "previous" by definition.
+ */
+ String latestAccessTokenHash = getLatestAccessTokenHash(requestMsgCtx);
+ if (StringUtils.isNotBlank(latestAccessTokenHash)) {
+ userAttributes = getUserAttributesCachedAgainstToken(latestAccessTokenHash,
+ fetchFederatedUserAttributes);
+ }
+
+ Object previousAccessTokenObject = requestMsgCtx.getProperty(RefreshGrantHandler.PREV_ACCESS_TOKEN);
+
+ if (previousAccessTokenObject != null) {
+ if (log.isDebugEnabled()) {
+ log.debug("Retrieving claims from previous access token of user : " + requestMsgCtx
+ .getAuthorizedUser());
+ }
+ RefreshTokenValidationDataDO refreshTokenValidationDataDO =
+ (RefreshTokenValidationDataDO) previousAccessTokenObject;
+
+ // This segment is retrieving the user attributes at the refresh grant while the caches are enabled.
+ if (isEmpty(userAttributes)) {
+ userAttributes = getUserAttributesCachedAgainstToken(refreshTokenValidationDataDO.getAccessToken(),
+ fetchFederatedUserAttributes);
+ }
+ requestMsgCtx.addProperty(OIDCConstants.HAS_NON_OIDC_CLAIMS,
+ isTokenHasCustomUserClaims(refreshTokenValidationDataDO));
+ }
+ }
+ return userAttributes;
+ }
+
+ /**
+ * Get user attributes cached against the authorization code.
+ *
+ * @param authorizationCode Authorization Code
+ * @param fetchFederatedUserAttr Flag to indicate whether to fetch federated user attributes.
+ * @return User attributes cached against the authorization code
+ */
+ private Map<ClaimMapping, String> getUserAttributesCachedAgainstAuthorizationCode(String authorizationCode,
+ boolean fetchFederatedUserAttr) {
+
+ Map<ClaimMapping, String> userAttributes = Collections.emptyMap();
+ if (authorizationCode != null) {
+ // Get the cached user claims against the authorization code if any.
+ userAttributes = getUserAttributesFromCacheUsingCode(authorizationCode, fetchFederatedUserAttr);
+ }
+ return userAttributes;
+ }
+
+ /**
+ * GEt user attributes cached against the device code.
+ *
+ * @param deviceCode Device Code
+ * @param fetchFederatedUserAttributes Flag to indicate whether to fetch federated user attributes.
+ * @return User attributes cached against the device code
+ */
+ private Map<ClaimMapping, String> getUserAttributesCachedAgainstDeviceCode(String deviceCode,
+ boolean fetchFederatedUserAttributes) {
+
+ if (StringUtils.isEmpty(deviceCode)) {
+ return Collections.emptyMap();
+ }
+ DeviceAuthorizationGrantCacheKey cacheKey = new DeviceAuthorizationGrantCacheKey(deviceCode);
+ DeviceAuthorizationGrantCacheEntry cacheEntry =
+ DeviceAuthorizationGrantCache.getInstance().getValueFromCache(cacheKey);
+ if (fetchFederatedUserAttributes) {
+ return cacheEntry == null ? Collections.emptyMap() : cacheEntry.getMappedRemoteClaims();
+ }
+ return cacheEntry == null ? Collections.emptyMap() : cacheEntry.getUserAttributes();
+ }
+
+ /**
+ * Get user attributes cached against the authorization code.
+ *
+ * @param authorizationCode Authorization Code
+ * @param fetchFederatedUserAttributes Flag to indicate whether to fetch federated user attributes.
+ * @return User attributes cached against the authorization code
+ */
+ private Map<ClaimMapping, String> getUserAttributesFromCacheUsingCode(String authorizationCode,
+ boolean fetchFederatedUserAttributes) {
+ if (log.isDebugEnabled()) {
+ if (IdentityUtil.isTokenLoggable(IdentityConstants.IdentityTokens.AUTHORIZATION_CODE)) {
+ log.debug("Retrieving user attributes cached against authorization code: " + authorizationCode);
+ } else {
+ log.debug("Retrieving user attributes cached against authorization code.");
+ }
+ }
+
+ AuthorizationGrantCacheKey cacheKey = new AuthorizationGrantCacheKey(authorizationCode);
+ AuthorizationGrantCacheEntry cacheEntry =
+ AuthorizationGrantCache.getInstance().getValueFromCacheByCode(cacheKey);
+ if (fetchFederatedUserAttributes) {
+ return cacheEntry == null ? new HashMap<>() : cacheEntry.getMappedRemoteClaims();
+ }
+ return cacheEntry == null ? new HashMap<>() : cacheEntry.getUserAttributes();
+ }
+
+ /**
+ * Get user attributes cached against the access token.
+ *
+ * @param accessToken Access Token
+ * @param fetchFederatedUserAttributes Flag to indicate whether to fetch federated user attributes.
+ * @return User attributes cached against the access token
+ */
+ private Map<ClaimMapping, String> getUserAttributesCachedAgainstToken(String accessToken,
+ boolean fetchFederatedUserAttributes) {
+ Map<ClaimMapping, String> userAttributes = Collections.emptyMap();
+ if (accessToken != null) {
+ // get the user claims cached against the access token if any
+ userAttributes = getUserAttributesFromCacheUsingToken(accessToken, fetchFederatedUserAttributes);
+ }
+ return userAttributes;
+ }
+
+ /**
+ * Get claims for local user form userstore.
+ *
+ * @param authzReqMessageContext OAuthAuthzReqMessageContext
+ * @return Local user claims
+ * @throws IdentityOAuth2Exception IdentityOAuth2Exception
+ */
+ private Map<String, Object> retrieveClaimsForLocalUser(OAuthAuthzReqMessageContext authzReqMessageContext)
+ throws IdentityOAuth2Exception {
+
+ try {
+ String spTenantDomain = getServiceProviderTenantDomain(authzReqMessageContext);
+ String clientId = authzReqMessageContext.getAuthorizationReqDTO().getConsumerKey();
+ AuthenticatedUser authenticatedUser = authzReqMessageContext.getAuthorizationReqDTO().getUser();
+
+ return getLocalUserClaimsInOIDCDialect(spTenantDomain, clientId, authenticatedUser);
+ } catch (UserStoreException | IdentityApplicationManagementException | IdentityException |
+ OrganizationManagementException e) {
+ if (FrameworkUtils.isContinueOnClaimHandlingErrorAllowed()) {
+ log.error("Error occurred while getting claims for user " +
+ authzReqMessageContext.getAuthorizationReqDTO().getUser(), e);
+ } else {
+ throw new IdentityOAuth2Exception("Error occurred while getting claims for user " +
+ authzReqMessageContext.getAuthorizationReqDTO().getUser(), e);
+ }
+ }
+ return new HashMap<>();
+ }
+
+ /**
+ * Retrieve the claim set of the AuthenticatedUser from the OAuthAuthzReqMessageContext.
+ *
+ * @param authzReqMessageContext OAuthAuthzReqMessageContext.
+ * @return Map of user attributes.
+ */
+ private Map<String, Object> retrieveClaimsForFederatedUser(OAuthAuthzReqMessageContext authzReqMessageContext)
+ throws IdentityOAuth2Exception {
+
+ OAuth2AuthorizeReqDTO oAuth2AuthorizeReqDTO = authzReqMessageContext.getAuthorizationReqDTO();
+ Map<String, Object> userClaimsMappedToOIDCDialect = new HashMap<>();
+
+ if (oAuth2AuthorizeReqDTO == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("OAuth2AuthorizeReqDTO is NULL for federated user: " +
+ authzReqMessageContext.getAuthorizationReqDTO().getUser());
+ }
+ return userClaimsMappedToOIDCDialect;
+ }
+ AuthenticatedUser authenticatedUser = oAuth2AuthorizeReqDTO.getUser();
+ if (authenticatedUser == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("Authenticated User is not available in the request");
+ }
+ return userClaimsMappedToOIDCDialect;
+ }
+ Map<ClaimMapping, String> userAttributes = authenticatedUser.getUserAttributes();
+ // Since this is a federated flow we are retrieving the federated user attributes as well.
+ Map<ClaimMapping, String> federatedUserAttributes =
+ oAuth2AuthorizeReqDTO.getMappedRemoteClaims();
+ userClaimsMappedToOIDCDialect = getOIDCClaimMapFromUserAttributes(userAttributes);
+ Map<String, Object> federatedUserClaimsMappedToOIDCDialect =
+ getUserClaimsInOIDCDialectFromFederatedUserAttributes(authzReqMessageContext.getAuthorizationReqDTO()
+ .getTenantDomain(), federatedUserAttributes);
+ userClaimsMappedToOIDCDialect.putAll(federatedUserClaimsMappedToOIDCDialect);
+ return userClaimsMappedToOIDCDialect;
+ }
+
+ /**
+ * Get claims map.
+ *
+ * @param userAttributes User Attributes
+ * @return User attribute map
*/
- private Map<String, Object> getUserClaimsFromUserStore(AuthenticatedUser authenticatedUser, String clientId,
- String spTenantDomain, List<String> claimURIList)
- throws IdentityApplicationManagementException, UserStoreException, OrganizationManagementException,
- IdentityException {
+ private Map<String, Object> getOIDCClaimMapFromUserAttributes(Map<ClaimMapping, String> userAttributes) {
+
+ Map<String, Object> claims = new HashMap<>();
+ if (isNotEmpty(userAttributes)) {
+ for (Map.Entry<ClaimMapping, String> entry : userAttributes.entrySet()) {
+ claims.put(entry.getKey().getRemoteClaim().getClaimUri(), entry.getValue());
+ }
+ }
+ return claims;
+ }
+
+ /**
+ * Get user claims in OIDC claim dialect from federated user attributes.
+ *
+ * @param spTenantDomain Service Provider Tenant Domain
+ * @param federatedUserAttr Federated User Attributes
+ * @return User claims in OIDC dialect
+ * @throws IdentityOAuth2Exception Identity OAuth2 Exception
+ */
+ private static Map<String, Object> getUserClaimsInOIDCDialectFromFederatedUserAttributes(String spTenantDomain,
+ Map<ClaimMapping, String>
+ federatedUserAttr)
+ throws IdentityOAuth2Exception {
+
+ // Retrieve OIDC to Local Claim Mappings.
+ Map<String, String> oidcToLocalClaimMappings = null;
+ try {
+ oidcToLocalClaimMappings = ClaimMetadataHandler.getInstance()
+ .getMappingsMapFromOtherDialectToCarbon(OIDC_DIALECT, null, spTenantDomain, false);
+ } catch (ClaimMetadataException e) {
+ throw new IdentityOAuth2Exception("Error while retrieving OIDC to Local claim mappings.", e);
+ }
+ // Get user claims in OIDC dialect.
+ Map<String, Object> userClaimsInOidcDialect = new HashMap<>();
+ if (MapUtils.isNotEmpty(federatedUserAttr)) {
+ for (Map.Entry<ClaimMapping, String> userAttribute : federatedUserAttr.entrySet()) {
+ ClaimMapping claimMapping = userAttribute.getKey();
+ String claimValue = userAttribute.getValue();
+ if (oidcToLocalClaimMappings.containsValue(claimMapping.getLocalClaim().getClaimUri())) {
+ String localClaimURI = claimMapping.getLocalClaim().getClaimUri();
+ String oidcClaimUri = oidcToLocalClaimMappings.entrySet().stream()
+ .filter(entry -> entry.getValue().equals(localClaimURI))
+ .map(Map.Entry::getKey).findFirst().orElse(null);
+ if (oidcClaimUri != null) {
+ userClaimsInOidcDialect.put(oidcClaimUri, claimValue);
+ if (log.isDebugEnabled() &&
+ IdentityUtil.isTokenLoggable(IdentityConstants.IdentityTokens.USER_CLAIMS)) {
+ log.debug("Mapped claim: key - " + oidcClaimUri + " value - " + claimValue);
+ }
+ }
+ }
+ }
+ }
+ return userClaimsInOidcDialect;
+ }
+
+ /**
+ * Get user claims in OIDC claim dialect from userstore.
+ *
+ * @param spTenantDomain Service Provider Tenant Domain
+ * @param clientId Client Id
+ * @param authenticatedUser Authenticated User
+ * @return User claims in OIDC dialect
+ * @throws IdentityApplicationManagementException Identity Application Management Exception
+ * @throws IdentityException Identity Exception
+ * @throws UserStoreException User Store Exception
+ * @throws OrganizationManagementException Organization Management Exception
+ */
+ private Map<String, Object> getLocalUserClaimsInOIDCDialect(String spTenantDomain, String clientId,
+ AuthenticatedUser authenticatedUser)
+ throws IdentityApplicationManagementException, IdentityException, UserStoreException,
+ OrganizationManagementException {
Map<String, Object> userClaimsMappedToOIDCDialect = new HashMap<>();
ServiceProvider serviceProvider = getServiceProvider(spTenantDomain, clientId);
@@ -156,9 +680,143 @@ private Map<String, Object> getUserClaimsFromUserStore(AuthenticatedUser authent
spTenantDomain + ". Returning empty claim map for user.");
return userClaimsMappedToOIDCDialect;
}
- return OIDCClaimUtil.getUserClaimsInOIDCDialect(serviceProvider, authenticatedUser, claimURIList);
+
+ List<String> allowedClaims = getAccessTokenClaims(clientId, spTenantDomain);
+ if (allowedClaims.isEmpty()) {
+ return new HashMap<>();
+ }
+ Map<String, String> oidcToLocalClaimMappings = getOIDCToLocalClaimMappings(spTenantDomain);
+ if (oidcToLocalClaimMappings.isEmpty()) {
+ return new HashMap<>();
+ }
+ List<String> localClaimURIs = allowedClaims.stream().map(oidcToLocalClaimMappings::get).filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ return OIDCClaimUtil.getUserClaimsInOIDCDialect(serviceProvider, authenticatedUser, localClaimURIs);
+ }
+
+ /**
+ * Get user attribute cached against the access token.
+ *
+ * @param accessToken Access token
+ * @return User attributes cached against the access token
+ */
+ private Map<ClaimMapping, String> getUserAttributesFromCacheUsingToken(String accessToken,
+ boolean fetchFederatedUserAttributes) {
+
+ if (log.isDebugEnabled()) {
+ if (IdentityUtil.isTokenLoggable(IdentityConstants.IdentityTokens.ACCESS_TOKEN)) {
+ log.debug("Retrieving user attributes cached against access token: " + accessToken);
+ } else {
+ log.debug("Retrieving user attributes cached against access token.");
+ }
+ }
+
+ AuthorizationGrantCacheKey cacheKey = new AuthorizationGrantCacheKey(accessToken);
+ AuthorizationGrantCacheEntry cacheEntry = AuthorizationGrantCache.getInstance()
+ .getValueFromCacheByToken(cacheKey);
+ if (fetchFederatedUserAttributes) {
+ return cacheEntry == null ? new HashMap<>() : cacheEntry.getMappedRemoteClaims();
+ }
+ return cacheEntry == null ? new HashMap<>() : cacheEntry.getUserAttributes();
+ }
+
+ private String getAuthorizationCode(OAuthTokenReqMessageContext requestMsgCtx) {
+
+ return (String) requestMsgCtx.getProperty(AUTHZ_CODE);
+ }
+
+ private String getAccessToken(OAuthAuthzReqMessageContext authzReqMessageContext) {
+
+ return (String) authzReqMessageContext.getProperty(ACCESS_TOKEN);
+ }
+
+ private String getAccessToken(OAuthTokenReqMessageContext requestMsgCtx) {
+
+ return (String) requestMsgCtx.getProperty(ACCESS_TOKEN);
+ }
+
+ private String getDeviceCode(OAuthTokenReqMessageContext requestMsgCtx) {
+
+ return (String) requestMsgCtx.getProperty(DEVICE_CODE);
+ }
+
+ private boolean isLocalUser(AuthenticatedUser authenticatedUser) {
+
+ return !authenticatedUser.isFederatedUser();
+ }
+
+ private boolean isLocalUser(OAuthAuthzReqMessageContext authzReqMessageContext) {
+
+ return !authzReqMessageContext.getAuthorizationReqDTO().getUser().isFederatedUser();
+ }
+
+ /**
+ * The access token hash acts as the key for entries in the SessionStore.
+ * This method retrieves the access token hash for OAuthConstants.ACCESS_TOKEN from the properties
+ * of OAuthTokenReqMessageContext treating it as the latest access token. It determines the type
+ * of access token (opaque or JWT) via the OAuth token issuer and obtains the access token hash accordingly.
+ * This method is useful for retrieving access tokens when the cache is disabled and
+ * SessionStore persistence is employed.
+ *
+ * @param oAuthTokenReqMessageContext The context of the OAuth token request containing necessary properties.
+ * @return The hash of the latest access token if available and valid, otherwise null.
+ * @throws IdentityOAuth2Exception If an error occurs while selecting the OAuth2 token issuer.
+ */
+ private String getLatestAccessTokenHash(OAuthTokenReqMessageContext oAuthTokenReqMessageContext)
+ throws IdentityOAuth2Exception {
+
+ // The OAuthConstants.ACCESS_TOKEN is considered as the latest access token.
+ Object latestAccessTokenObj = getAccessToken(oAuthTokenReqMessageContext);
+ if (latestAccessTokenObj != null && StringUtils.isNotBlank(latestAccessTokenObj.toString())) {
+
+ Object oAuthAppDOObj = oAuthTokenReqMessageContext.getProperty(AccessTokenIssuer.OAUTH_APP_DO);
+
+ if (oAuthAppDOObj != null) {
+ try {
+ OAuthAppDO oAuthAppDO = (OAuthAppDO) oAuthAppDOObj;
+ OauthTokenIssuer tokenIssuer = OAuth2Util.getOAuthTokenIssuerForOAuthApp(oAuthAppDO);
+ if (tokenIssuer != null) {
+ String latestAccessToken = latestAccessTokenObj.toString();
+ try {
+ return tokenIssuer.getAccessTokenHash(latestAccessToken);
+ } catch (OAuthSystemException e) {
+ throw new IdentityOAuth2Exception("Error occurred while generating the access token hash " +
+ "at user attribute retrieval", e);
+ }
+ }
+ } catch (ClassCastException e) {
+ log.error("Error occurred while generating the access token hash at user attribute " +
+ "retrieval", e);
+
+ }
+ }
+ }
+ return null;
}
+ /**
+ * To check whether a token has custom user claims.
+ *
+ * @param refreshTokenValidationDataDO RefreshTokenValidationDataDO.
+ * @return true if the token user attributes has non OIDC claims.
+ */
+ private boolean isTokenHasCustomUserClaims(RefreshTokenValidationDataDO refreshTokenValidationDataDO) {
+
+ if (refreshTokenValidationDataDO.getAccessToken() == null) {
+ return false;
+ }
+ AuthorizationGrantCacheKey cacheKey = new AuthorizationGrantCacheKey(
+ refreshTokenValidationDataDO.getAccessToken());
+ AuthorizationGrantCacheEntry cacheEntry = AuthorizationGrantCache.getInstance()
+ .getValueFromCacheByToken(cacheKey);
+ boolean hasNonOIDCClaims = cacheEntry != null && cacheEntry.isHasNonOIDCClaims();
+
+ if (log.isDebugEnabled()) {
+ log.debug("hasNonOIDCClaims is set to " + hasNonOIDCClaims + " for the access token of the user : "
+ + refreshTokenValidationDataDO.getAuthorizedUser());
+ }
+ return cacheEntry != null && cacheEntry.isHasNonOIDCClaims();
+ }
/**
* This method retrieves OIDC to Local claim mappings.
@@ -327,4 +985,38 @@ private String getServiceProviderTenantDomain(OAuthAuthzReqMessageContext reques
return spTenantDomain;
}
+ /**
+ * Check whether an organization SSO user is trying to switch the organization.
+ *
+ * @param authorizedUser authorized user from the token request.
+ * @return true if an organization SSO user is trying to switch the organization.
+ */
+ private boolean isOrganizationSsoUserSwitchingOrganization(AuthenticatedUser authorizedUser) {
+
+ String accessingOrganization = authorizedUser.getAccessingOrganization();
+ String userResidentOrganization = authorizedUser.getUserResidentOrganization();
+ /* A federated user with resident organization is considered as an organization SSO user. When the accessing
+ organization is different to the resident organization, it means the user is trying to switch the
+ organization. */
+ return authorizedUser.isFederatedUser() && userResidentOrganization != null && !userResidentOrganization.equals
+ (accessingOrganization);
+ }
+
+ /**
+ * Check whether grant type is organization switch grant.
+ *
+ * @param requestMsgCtx OAuthTokenReqMessageContext
+ * @return true if grant type is organization switch grant.
+ */
+ private boolean isOrganizationSwitchGrantType(OAuthTokenReqMessageContext requestMsgCtx) {
+
+ return StringUtils.equals(requestMsgCtx.getOauth2AccessTokenReqDTO().getGrantType(),
+ OAuthConstants.GrantTypes.ORGANIZATION_SWITCH);
+ }
+
+ private boolean isPreserverClaimUrisInAssertion(OAuthTokenReqMessageContext requestMsgCtx) {
+
+ return !OAuthServerConfiguration.getInstance().isConvertOriginalClaimsFromAssertionsToOIDCDialect() &&
+ requestMsgCtx.getAuthorizedUser().isFederatedUser();
+ }
}
diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java
index 408459fdc01..f6ad220a887 100644
--- a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java
+++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java
@@ -32,6 +32,7 @@
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
import org.mockito.testng.MockitoTestNGListener;
+import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeTest;
@@ -43,6 +44,7 @@
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser;
import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkUtils;
+import org.wso2.carbon.identity.application.common.model.ClaimMapping;
import org.wso2.carbon.identity.application.common.model.PermissionsAndRoleConfig;
import org.wso2.carbon.identity.application.common.model.ServiceProvider;
import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
@@ -51,15 +53,20 @@
import org.wso2.carbon.identity.core.persistence.JDBCPersistenceManager;
import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
import org.wso2.carbon.identity.core.util.IdentityUtil;
+import org.wso2.carbon.identity.oauth.cache.AuthorizationGrantCache;
+import org.wso2.carbon.identity.oauth.cache.AuthorizationGrantCacheEntry;
+import org.wso2.carbon.identity.oauth.cache.AuthorizationGrantCacheKey;
import org.wso2.carbon.identity.oauth.config.OAuthServerConfiguration;
import org.wso2.carbon.identity.oauth.dao.OAuthAppDO;
import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
+import org.wso2.carbon.identity.oauth2.TestConstants;
import org.wso2.carbon.identity.oauth2.authz.OAuthAuthzReqMessageContext;
import org.wso2.carbon.identity.oauth2.dao.OAuthTokenPersistenceFactory;
import org.wso2.carbon.identity.oauth2.dto.OAuth2AccessTokenReqDTO;
import org.wso2.carbon.identity.oauth2.dto.OAuth2AuthorizeReqDTO;
import org.wso2.carbon.identity.oauth2.internal.OAuth2ServiceComponentHolder;
import org.wso2.carbon.identity.oauth2.token.OAuthTokenReqMessageContext;
+import org.wso2.carbon.identity.oauth2.token.handlers.grant.saml.SAML2BearerGrantHandlerTest;
import org.wso2.carbon.identity.oauth2.util.AuthzUtil;
import org.wso2.carbon.identity.oauth2.util.OAuth2Util;
import org.wso2.carbon.identity.openidconnect.dao.CacheBackedScopeClaimMappingDAOImpl;
@@ -246,11 +253,19 @@ public void testHandleCustomClaimsWithoutRegisteredOIDCClaimsForOAuthTokenReqMsg
oAuthServerConfiguration.when(OAuthServerConfiguration::getInstance)
.thenReturn(oauthServerConfigurationMock);
try (MockedStatic<OAuth2Util> oAuth2Util = mockStatic(OAuth2Util.class);
- MockedStatic<ClaimMetadataHandler> claimMetadataHandler = mockStatic(ClaimMetadataHandler.class)) {
- claimMetadataHandler.when(ClaimMetadataHandler::getInstance).thenReturn(this.mockClaimMetadataHandler);
+ MockedStatic<ClaimMetadataHandler> claimMetadataHandler = mockStatic(ClaimMetadataHandler.class);
+ MockedStatic<IdentityTenantUtil> identityTenantUtil = mockStatic(IdentityTenantUtil.class);
+ MockedStatic<AuthzUtil> authzUtil = mockStatic(AuthzUtil.class)) {
+ claimMetadataHandler.when(ClaimMetadataHandler::getInstance).thenReturn(mockClaimMetadataHandler);
+ lenient().when(mockClaimMetadataHandler.getMappingsMapFromOtherDialectToCarbon(
+ anyString(), isNull(), anyString(), anyBoolean())).thenReturn(new HashMap<>());
oAuth2Util.when(() -> OAuth2Util.getAppInformationByClientId(any(), any())).thenReturn(
getoAuthAppDO(jwtAccessTokenClaims));
+ mockApplicationManagementService();
OAuthTokenReqMessageContext requestMsgCtx = getTokenReqMessageContextForLocalUser();
+ authzUtil.when(() -> AuthzUtil.getUserRoles(any(), anyString())).thenReturn(new ArrayList<>());
+ UserRealm userRealm = getUserRealmWithUserClaims(USER_CLAIMS_MAP);
+ mockUserRealm(requestMsgCtx.getAuthorizedUser().toString(), userRealm, identityTenantUtil);
JWTClaimsSet.Builder jwtClaimsSetBuilder = new JWTClaimsSet.Builder();
JWTClaimsSet jwtClaimsSet = getJwtClaimSet(jwtClaimsSetBuilder, requestMsgCtx, jdbcPersistenceManager,
oAuthServerConfiguration);
@@ -402,6 +417,71 @@ public void testHandleCustomClaimsForOAuthAuthzReqMsgContext() throws Exception
}
}
+ @Test
+ public void testHandleClaimsForOAuthTokenReqMessageContextWithAuthorizationCode() throws Exception {
+
+ try (MockedStatic<JDBCPersistenceManager> jdbcPersistenceManager = mockStatic(JDBCPersistenceManager.class);
+ MockedStatic<OAuthServerConfiguration> oAuthServerConfiguration = mockStatic(
+ OAuthServerConfiguration.class);
+ MockedStatic<ClaimMetadataHandler> claimMetadataHandler = mockStatic(ClaimMetadataHandler.class)) {
+ OAuthServerConfiguration oauthServerConfigurationMock = mock(OAuthServerConfiguration.class);
+ oAuthServerConfiguration.when(OAuthServerConfiguration::getInstance)
+ .thenReturn(oauthServerConfigurationMock);
+ try (MockedStatic<OAuth2Util> oAuth2Util = mockStatic(OAuth2Util.class);
+ MockedStatic<AuthzUtil> authzUtil = mockStatic(AuthzUtil.class);
+ MockedStatic<IdentityTenantUtil> identityTenantUtil = mockStatic(IdentityTenantUtil.class);
+ MockedStatic<IdentityUtil> identityUtil = mockStatic(IdentityUtil.class, Mockito.CALLS_REAL_METHODS)) {
+ MockedStatic<AuthorizationGrantCache> authorizationGrantCache =
+ mockStatic(AuthorizationGrantCache.class);
+ identityUtil.when(IdentityUtil::isGroupsVsRolesSeparationImprovementsEnabled).thenReturn(true);
+ authzUtil.when(() -> AuthzUtil.getUserRoles(any(), anyString())).thenReturn(new ArrayList<>());
+ oAuth2Util.when(() -> OAuth2Util.getAppInformationByClientId(any(), any())).thenReturn(
+ getoAuthAppDO(jwtAccessTokenClaims));
+ Map<String, String> mappings = getOIDCtoLocalClaimsMapping();
+ claimMetadataHandler.when(ClaimMetadataHandler::getInstance).thenReturn(mockClaimMetadataHandler);
+ lenient().when(mockClaimMetadataHandler.getMappingsMapFromOtherDialectToCarbon(
+ anyString(), isNull(), anyString(), anyBoolean())).thenReturn(mappings);
+ Map<ClaimMapping, String> userAttributes = new HashMap<>();
+ OAuthTokenReqMessageContext requestMsgCtx = getTokenReqMessageContextForFederatedUser(userAttributes);
+ requestMsgCtx.addProperty("AuthorizationCode", "dummyAuthorizationCode");
+ Map<ClaimMapping, String> federatedUserAttributes = new HashMap<>();
+ federatedUserAttributes.put(SAML2BearerGrantHandlerTest.buildClaimMapping(LOCAL_COUNTRY_CLAIM_URI),
+ TestConstants.CLAIM_VALUE1);
+ federatedUserAttributes.put(SAML2BearerGrantHandlerTest.buildClaimMapping(LOCAL_EMAIL_CLAIM_URI),
+ TestConstants.CLAIM_VALUE2);
+ AuthorizationGrantCacheEntry authorizationGrantCacheEntry = new
+ AuthorizationGrantCacheEntry();
+ authorizationGrantCacheEntry.setMappedRemoteClaims(federatedUserAttributes);
+ mockAuthorizationGrantCache(authorizationGrantCacheEntry, authorizationGrantCache);
+
+ UserRealm userRealm = getUserRealmWithUserClaims(USER_CLAIMS_MAP);
+ mockUserRealm(requestMsgCtx.getAuthorizedUser().toString(), userRealm, identityTenantUtil);
+ JWTClaimsSet.Builder jwtClaimsSetBuilder = new JWTClaimsSet.Builder();
+ JWTClaimsSet jwtClaimsSet = getJwtClaimSet(jwtClaimsSetBuilder, requestMsgCtx, jdbcPersistenceManager,
+ oAuthServerConfiguration);
+ assertNotNull(jwtClaimsSet, "JWT Custom claim handling failed.");
+ assertFalse(jwtClaimsSet.getClaims().isEmpty(), "JWT custom claim handling failed");
+ Assert.assertEquals(jwtClaimsSet.getClaims().size(), 2,
+ "Expected custom claims are not set.");
+ Assert.assertEquals(jwtClaimsSet.getClaim("email"), TestConstants.CLAIM_VALUE2,
+ "OIDC claim email is not added with the JWT token");
+ }
+ }
+ }
+
+ private void mockAuthorizationGrantCache(AuthorizationGrantCacheEntry authorizationGrantCacheEntry,
+ MockedStatic<AuthorizationGrantCache> authorizationGrantCache) {
+
+ AuthorizationGrantCache mockAuthorizationGrantCache = mock(AuthorizationGrantCache.class);
+
+ if (authorizationGrantCacheEntry == null) {
+ authorizationGrantCacheEntry = mock(AuthorizationGrantCacheEntry.class);
+ }
+ authorizationGrantCache.when(AuthorizationGrantCache::getInstance).thenReturn(mockAuthorizationGrantCache);
+ lenient().when(mockAuthorizationGrantCache.getValueFromCacheByCode(any(AuthorizationGrantCacheKey.class))).
+ thenReturn(authorizationGrantCacheEntry);
+ }
+
private static Map<String, String> getOIDCtoLocalClaimsMapping() {
Map<String, String> mappings = new HashMap<>();
@@ -504,6 +584,38 @@ private OAuthTokenReqMessageContext getTokenReqMessageContextForLocalUser() {
return requestMsgCtx;
}
+ /**
+ * To get token request message context for federates user.
+ *
+ * @param userAttributes Relevant user attributes need to be added to authenticates user.
+ * @return relevant token request context for federated authenticated user.
+ */
+ private OAuthTokenReqMessageContext getTokenReqMessageContextForFederatedUser(Map<ClaimMapping,
+ String> userAttributes) {
+
+ OAuth2AccessTokenReqDTO accessTokenReqDTO = new OAuth2AccessTokenReqDTO();
+ accessTokenReqDTO.setTenantDomain(TENANT_DOMAIN);
+ accessTokenReqDTO.setClientId(DUMMY_CLIENT_ID);
+ OAuthTokenReqMessageContext requestMsgCtx = new OAuthTokenReqMessageContext(accessTokenReqDTO);
+ requestMsgCtx.addProperty(MultitenantConstants.TENANT_DOMAIN, TENANT_DOMAIN);
+ AuthenticatedUser authenticatedUser = getDefaultAuthenticatedUserFederatedUser();
+
+ if (userAttributes != null) {
+ authenticatedUser.setUserAttributes(userAttributes);
+ }
+ requestMsgCtx.setAuthorizedUser(authenticatedUser);
+ return requestMsgCtx;
+ }
+
+ private AuthenticatedUser getDefaultAuthenticatedUserFederatedUser() {
+
+ AuthenticatedUser authenticatedUser = new AuthenticatedUser();
+ authenticatedUser.setUserName(USER_NAME);
+ authenticatedUser.setUserId(StringUtils.EMPTY);
+ authenticatedUser.setFederatedUser(true);
+ return authenticatedUser;
+ }
+
private AuthenticatedUser getDefaultAuthenticatedLocalUser() {
AuthenticatedUser authenticatedUser = new AuthenticatedUser();
diff --git a/pom.xml b/pom.xml
index 129a098f04b..2f2f6acb67d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -944,7 +944,7 @@
<carbon.kernel.registry.imp.pkg.version.range>[1.0.1, 2.0.0)</carbon.kernel.registry.imp.pkg.version.range>
<!-- Carbon Identity Framework version -->
- <carbon.identity.framework.version>7.7.39</carbon.identity.framework.version>
+ <carbon.identity.framework.version>7.7.49</carbon.identity.framework.version>
<carbon.identity.framework.imp.pkg.version.range>[5.25.234, 8.0.0)
</carbon.identity.framework.imp.pkg.version.range>
<identity.oauth.xacml.version.range>[2.0.0, 3.0.0)</identity.oauth.xacml.version.range>
From 87c606098f9bb709b4e7157de8050202115c2884 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 18 Dec 2024 14:51:31 +0000
Subject: [PATCH 38/45] [WSO2 Release] [Jenkins #5139] [Release 7.0.202]
prepare release v7.0.202
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index abe30b44579..f89bab657d9 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 6d408b72a82..a61cf267bf4 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 1c5ee5e8408..0f7abfbb28b 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index de970cc1549..2180856091e 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 2ea444f9a30..5318d1383a3 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index 0420e10d452..8234b8f90fb 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index 20569877af7..c150a35d5e7 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 029f9dc6a51..7e24ea228f4 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index 2dd6a3445b7..488e2ac4f0f 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index f2322e7de5c..cc57c68ec82 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 79f5295dab7..ab0b9b361c4 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index a1e596d6575..45343a35c5e 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index f8e460085bb..36b3a6a43b1 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index 5d9f427309c..f1511b6daba 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index a93ab254aed..0ea6b728ce7 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index 473c9d831bf..d5cfaa15f1f 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index 6ae4904465a..f2b137541c2 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 87dd4e915e6..ba9496ba53f 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index 1beded74274..d366043190c 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index b5117d6c32e..8abf9fff892 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index 560d0793ff0..6971e403ebf 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 363c5025895..590fa4032c4 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 0b71d57b76f..281709c3fa5 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index 116f12e71b7..1f9f405dce5 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 2f2f6acb67d..43992461b63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>HEAD</tag>
+ <tag>v7.0.202</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index 6a03a5463da..48de4a92bef 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 2f230275c49..0efeda41321 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202-SNAPSHOT</version>
+ <version>7.0.202</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From 707373c194c25bb9b9d5124a204189c8c6bfecec Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Wed, 18 Dec 2024 14:51:36 +0000
Subject: [PATCH 39/45] [WSO2 Release] [Jenkins #5139] [Release 7.0.202]
prepare for next development iteration
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index f89bab657d9..035c716607f 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index a61cf267bf4..73739cc3180 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 0f7abfbb28b..f5adf951188 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index 2180856091e..d6846bd3418 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 5318d1383a3..f5a1c634a4c 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index 8234b8f90fb..329c266244f 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index c150a35d5e7..ee67abd08c0 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 7e24ea228f4..2824336d07c 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index 488e2ac4f0f..aaa5086a9f2 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index cc57c68ec82..1b743732f5b 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index ab0b9b361c4..9939193e44b 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index 45343a35c5e..ea3469ca56b 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index 36b3a6a43b1..18b5a7e860f 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index f1511b6daba..ca5f8b95bdb 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 0ea6b728ce7..29088ef8208 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index d5cfaa15f1f..63c20408a0c 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index f2b137541c2..78ba873212a 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index ba9496ba53f..e4fa5d8b136 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index d366043190c..f77ada2f8dd 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index 8abf9fff892..ea246422e6c 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index 6971e403ebf..0896f65fcbd 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 590fa4032c4..2e6b8acb867 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 281709c3fa5..f4a70e53577 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index 1f9f405dce5..ef0e6ef3671 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 43992461b63..a7b4ddc7357 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>v7.0.202</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index 48de4a92bef..a46be55206f 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 0efeda41321..30ce624270c 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.202</version>
+ <version>7.0.203-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From 78442d851754f409848f7ee5eec250a9d4b78b65 Mon Sep 17 00:00:00 2001
From: Thilina Shashimal Senarath
<43197743+shashimalcse@users.noreply.github.com>
Date: Thu, 19 Dec 2024 09:08:17 +0530
Subject: [PATCH 40/45] fix application roles (#2654)
---
.../identity/oauth/common/OAuthConstants.java | 1 +
.../JWTAccessTokenOIDCClaimsHandler.java | 2 +-
.../OpenIDConnectClaimFilterImpl.java | 19 +++++++++++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/components/org.wso2.carbon.identity.oauth.common/src/main/java/org/wso2/carbon/identity/oauth/common/OAuthConstants.java b/components/org.wso2.carbon.identity.oauth.common/src/main/java/org/wso2/carbon/identity/oauth/common/OAuthConstants.java
index 395933a8f07..f4466f49f57 100644
--- a/components/org.wso2.carbon.identity.oauth.common/src/main/java/org/wso2/carbon/identity/oauth/common/OAuthConstants.java
+++ b/components/org.wso2.carbon.identity.oauth.common/src/main/java/org/wso2/carbon/identity/oauth/common/OAuthConstants.java
@@ -581,6 +581,7 @@ public static class OIDCClaims {
public static final String EMAIL_VERIFIED = "email_verified";
public static final String ADDRESS = "address";
public static final String ROLES = "roles";
+ public static final String APP_ROLES = "application_roles";
public static final String CUSTOM = "custom";
public static final String AZP = "azp";
public static final String AUTH_TIME = "auth_time";
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java
index ca6bbbff1df..4824d4adc29 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java
@@ -643,7 +643,7 @@ private static Map<String, Object> getUserClaimsInOIDCDialectFromFederatedUserAt
String oidcClaimUri = oidcToLocalClaimMappings.entrySet().stream()
.filter(entry -> entry.getValue().equals(localClaimURI))
.map(Map.Entry::getKey).findFirst().orElse(null);
- if (oidcClaimUri != null) {
+ if (oidcClaimUri != null && StringUtils.isNotBlank(claimValue)) {
userClaimsInOidcDialect.put(oidcClaimUri, claimValue);
if (log.isDebugEnabled() &&
IdentityUtil.isTokenLoggable(IdentityConstants.IdentityTokens.USER_CLAIMS)) {
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/OpenIDConnectClaimFilterImpl.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/OpenIDConnectClaimFilterImpl.java
index 93376387678..124e6baddd6 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/OpenIDConnectClaimFilterImpl.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/OpenIDConnectClaimFilterImpl.java
@@ -61,6 +61,7 @@
import static org.wso2.carbon.identity.oauth.common.OAuthConstants.LogConstants.ActionIDs.ISSUE_ACCESS_TOKEN;
import static org.wso2.carbon.identity.oauth.common.OAuthConstants.LogConstants.OAUTH_INBOUND_SERVICE;
import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCClaims.ADDRESS;
+import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCClaims.APP_ROLES;
import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCClaims.EMAIL_VERIFIED;
import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCClaims.PHONE_NUMBER_VERIFIED;
import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCClaims.ROLES;
@@ -137,6 +138,7 @@ public Map<String, Object> getClaimsFilteredByOIDCScopes(Map<String, Object> use
handleAddressClaim(claimsToBeReturned, addressScopeClaims);
}
handleRolesClaim(claimsToBeReturned);
+ handleApplicationRolesClaim(claimsToBeReturned);
handleUpdateAtClaim(claimsToBeReturned);
handlePhoneNumberVerifiedClaim(claimsToBeReturned);
handleEmailVerifiedClaim(claimsToBeReturned);
@@ -501,6 +503,23 @@ private void handleRolesClaim(Map<String, Object> returnClaims) {
}
}
+ private void handleApplicationRolesClaim(Map<String, Object> returnClaims) {
+
+ if (returnClaims.containsKey(APP_ROLES) && IdentityUtil.isGroupsVsRolesSeparationImprovementsEnabled()
+ && returnClaims.get(APP_ROLES) instanceof String) {
+ String multiAttributeSeparator = FrameworkUtils.getMultiAttributeSeparator();
+ List<String> roles = Arrays.asList(returnClaims.get(APP_ROLES).toString().split(multiAttributeSeparator));
+
+ for (String role : roles) {
+ if (UserCoreConstants.INTERNAL_DOMAIN.equalsIgnoreCase(IdentityUtil.extractDomainFromName(role))) {
+ String domainRemovedRole = UserCoreUtil.removeDomainFromName(role);
+ roles.set(roles.indexOf(role), domainRemovedRole);
+ }
+ }
+ returnClaims.put(APP_ROLES, StringUtils.join(roles, multiAttributeSeparator));
+ }
+ }
+
private void startTenantFlow(String tenantDomain, int tenantId) {
PrivilegedCarbonContext.startTenantFlow();
From daa072694d005b0a149bfcce4f7cba77e7093482 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 19 Dec 2024 03:46:47 +0000
Subject: [PATCH 41/45] [WSO2 Release] [Jenkins #5141] [Release 7.0.203]
prepare release v7.0.203
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 035c716607f..82b25f1c0d0 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 73739cc3180..f24e8aa404f 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index f5adf951188..57b37aa3631 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index d6846bd3418..9c4ccdf4fd9 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index f5a1c634a4c..03bde4b554a 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index 329c266244f..ef0aafafa3d 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index ee67abd08c0..302ad3ca894 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 2824336d07c..36518c2d574 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index aaa5086a9f2..eee1c19ba0b 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index 1b743732f5b..132f3d17584 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 9939193e44b..7c827675470 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index ea3469ca56b..e44018b250f 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index 18b5a7e860f..e24714ae878 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index ca5f8b95bdb..eb04723726f 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 29088ef8208..59284e0865b 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index 63c20408a0c..198fdf82c05 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index 78ba873212a..dae0d80ef2c 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index e4fa5d8b136..9e9750a6b0c 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index f77ada2f8dd..39b488aa5ca 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index ea246422e6c..ef38c063e0e 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index 0896f65fcbd..c9f2375e3c3 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 2e6b8acb867..a05ec5bfd39 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index f4a70e53577..1744cb3326e 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index ef0e6ef3671..95c526052fb 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index a7b4ddc7357..781f4bf3981 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>HEAD</tag>
+ <tag>v7.0.203</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index a46be55206f..e010ddd48c0 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 30ce624270c..85b04a81af4 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203-SNAPSHOT</version>
+ <version>7.0.203</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From 6c75b2f2fa05e63f86cc29e7c56363b3ccac6254 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 19 Dec 2024 03:46:49 +0000
Subject: [PATCH 42/45] [WSO2 Release] [Jenkins #5141] [Release 7.0.203]
prepare for next development iteration
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 82b25f1c0d0..a027cb860ea 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index f24e8aa404f..393e65d5ba8 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 57b37aa3631..93b169beba7 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index 9c4ccdf4fd9..94e2674511f 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 03bde4b554a..9b0d5e79ab4 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index ef0aafafa3d..8f313522795 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index 302ad3ca894..b6d3ed5b822 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 36518c2d574..465ff9bddf4 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index eee1c19ba0b..38d388ba1f1 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index 132f3d17584..0e0dfb12e72 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 7c827675470..5dc9bdd52dc 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index e44018b250f..3442b1fed3f 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index e24714ae878..d3b461d3d35 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index eb04723726f..b53c80a48d5 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 59284e0865b..7d35b65eb3e 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index 198fdf82c05..a8336513d6e 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index dae0d80ef2c..a2a99fde815 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 9e9750a6b0c..97d90d5354c 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index 39b488aa5ca..491e3a11a58 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index ef38c063e0e..36f60e81db7 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index c9f2375e3c3..f39def620b7 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index a05ec5bfd39..72c34048207 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 1744cb3326e..6742f0309e9 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index 95c526052fb..ce20517497a 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 781f4bf3981..4b2ade524ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>v7.0.203</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index e010ddd48c0..e31327cb81f 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 85b04a81af4..923e719de73 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.203</version>
+ <version>7.0.204-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From a1785956c6996e006ecc57b15329ef3f92cc3fbc Mon Sep 17 00:00:00 2001
From: Thilina Shashimal Senarath
<43197743+shashimalcse@users.noreply.github.com>
Date: Thu, 19 Dec 2024 12:50:16 +0530
Subject: [PATCH 43/45] Fix oidc claim mapping in jwt access token attributes
(#2655)
Fix oidc claim mapping in jwt access token attributes
---
.../JWTAccessTokenOIDCClaimsHandler.java | 47 +++++++------------
.../JWTAccessTokenOIDCClaimsHandlerTest.java | 4 +-
2 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java
index 4824d4adc29..dd2ecabfa41 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandler.java
@@ -264,12 +264,12 @@ private Map<String, Object> getOIDCClaimsFromUserAttributes(Map<ClaimMapping, St
/**
* Get oidc claims mapping.
*
- * @param federatedUserAttributed User attributes.
+ * @param federatedUserAttributes User attributes.
* @param requestMsgCtx Request Context.
* @return User attributes Map.
*/
private Map<String, Object> getOIDCClaimsFromFederatedUserAttributes(Map<ClaimMapping,
- String> federatedUserAttributed, OAuthTokenReqMessageContext requestMsgCtx)
+ String> federatedUserAttributes, OAuthTokenReqMessageContext requestMsgCtx)
throws IdentityOAuth2Exception {
String spTenantDomain = getServiceProviderTenantDomain(requestMsgCtx);
@@ -283,24 +283,16 @@ private Map<String, Object> getOIDCClaimsFromFederatedUserAttributes(Map<ClaimMa
}
// Get user claims in OIDC dialect.
Map<String, String> userClaimsInOidcDialect = new HashMap<>();
- if (MapUtils.isNotEmpty(federatedUserAttributed)) {
- for (Map.Entry<ClaimMapping, String> userAttribute : federatedUserAttributed.entrySet()) {
+ if (MapUtils.isNotEmpty(federatedUserAttributes)) {
+ for (Map.Entry<ClaimMapping, String> userAttribute : federatedUserAttributes.entrySet()) {
ClaimMapping claimMapping = userAttribute.getKey();
- String claimValue = userAttribute.getValue();
- if (oidcToLocalClaimMappings.containsValue(claimMapping.getLocalClaim().getClaimUri())) {
- String localClaimURI = claimMapping.getLocalClaim().getClaimUri();
- String oidcClaimUri = oidcToLocalClaimMappings.entrySet().stream()
- .filter(entry -> entry.getValue().equals(localClaimURI))
- .map(Map.Entry::getKey)
- .findFirst()
- .orElse(null);
-
- if (oidcClaimUri != null) {
- userClaimsInOidcDialect.put(oidcClaimUri, claimValue.toString());
- if (log.isDebugEnabled() &&
- IdentityUtil.isTokenLoggable(IdentityConstants.IdentityTokens.USER_CLAIMS)) {
- log.debug("Mapped claim: key - " + oidcClaimUri + " value - " + claimValue);
- }
+ String claimValue = userAttribute.getValue().toString();
+ String localClaimURI = claimMapping.getLocalClaim().getClaimUri();
+ if (oidcToLocalClaimMappings.containsKey(localClaimURI) && StringUtils.isNotBlank(claimValue)) {
+ userClaimsInOidcDialect.put(localClaimURI, claimValue);
+ if (log.isDebugEnabled() &&
+ IdentityUtil.isTokenLoggable(IdentityConstants.IdentityTokens.USER_CLAIMS)) {
+ log.debug("Mapped claim: key - " + localClaimURI + " value - " + claimValue);
}
}
}
@@ -638,17 +630,12 @@ private static Map<String, Object> getUserClaimsInOIDCDialectFromFederatedUserAt
for (Map.Entry<ClaimMapping, String> userAttribute : federatedUserAttr.entrySet()) {
ClaimMapping claimMapping = userAttribute.getKey();
String claimValue = userAttribute.getValue();
- if (oidcToLocalClaimMappings.containsValue(claimMapping.getLocalClaim().getClaimUri())) {
- String localClaimURI = claimMapping.getLocalClaim().getClaimUri();
- String oidcClaimUri = oidcToLocalClaimMappings.entrySet().stream()
- .filter(entry -> entry.getValue().equals(localClaimURI))
- .map(Map.Entry::getKey).findFirst().orElse(null);
- if (oidcClaimUri != null && StringUtils.isNotBlank(claimValue)) {
- userClaimsInOidcDialect.put(oidcClaimUri, claimValue);
- if (log.isDebugEnabled() &&
- IdentityUtil.isTokenLoggable(IdentityConstants.IdentityTokens.USER_CLAIMS)) {
- log.debug("Mapped claim: key - " + oidcClaimUri + " value - " + claimValue);
- }
+ String localClaimURI = claimMapping.getLocalClaim().getClaimUri();
+ if (oidcToLocalClaimMappings.containsKey(localClaimURI) && StringUtils.isNotBlank(claimValue)) {
+ userClaimsInOidcDialect.put(localClaimURI, claimValue);
+ if (log.isDebugEnabled() &&
+ IdentityUtil.isTokenLoggable(IdentityConstants.IdentityTokens.USER_CLAIMS)) {
+ log.debug("Mapped claim: key - " + localClaimURI + " value - " + claimValue);
}
}
}
diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java
index f6ad220a887..e69e9458283 100644
--- a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java
+++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/JWTAccessTokenOIDCClaimsHandlerTest.java
@@ -445,9 +445,9 @@ public void testHandleClaimsForOAuthTokenReqMessageContextWithAuthorizationCode(
OAuthTokenReqMessageContext requestMsgCtx = getTokenReqMessageContextForFederatedUser(userAttributes);
requestMsgCtx.addProperty("AuthorizationCode", "dummyAuthorizationCode");
Map<ClaimMapping, String> federatedUserAttributes = new HashMap<>();
- federatedUserAttributes.put(SAML2BearerGrantHandlerTest.buildClaimMapping(LOCAL_COUNTRY_CLAIM_URI),
+ federatedUserAttributes.put(SAML2BearerGrantHandlerTest.buildClaimMapping("country"),
TestConstants.CLAIM_VALUE1);
- federatedUserAttributes.put(SAML2BearerGrantHandlerTest.buildClaimMapping(LOCAL_EMAIL_CLAIM_URI),
+ federatedUserAttributes.put(SAML2BearerGrantHandlerTest.buildClaimMapping("email"),
TestConstants.CLAIM_VALUE2);
AuthorizationGrantCacheEntry authorizationGrantCacheEntry = new
AuthorizationGrantCacheEntry();
From 32834125f23f5499eac2346ac99edd8d9cf88a0e Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 19 Dec 2024 07:28:32 +0000
Subject: [PATCH 44/45] [WSO2 Release] [Jenkins #5143] [Release 7.0.204]
prepare release v7.0.204
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index a027cb860ea..3b2ef2d4c6f 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 393e65d5ba8..79124e5623a 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 93b169beba7..918fba08ade 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index 94e2674511f..ba6d1b2df04 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 9b0d5e79ab4..17b59854e0e 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index 8f313522795..4061724133d 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index b6d3ed5b822..8e4bc9a8e68 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 465ff9bddf4..21784454cea 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index 38d388ba1f1..8d77e98e8e3 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index 0e0dfb12e72..91ac62183f0 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 5dc9bdd52dc..0c4086221c5 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index 3442b1fed3f..e84db09f793 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index d3b461d3d35..2380eda560d 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index b53c80a48d5..9e0babf4929 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 7d35b65eb3e..9914b0b2d48 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index a8336513d6e..072d5b2766c 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index a2a99fde815..9ae5241e50a 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index 97d90d5354c..eb00fba6021 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index 491e3a11a58..a959410220f 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index 36f60e81db7..6b0f7e4cb68 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index f39def620b7..9add9f19335 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 72c34048207..4f1cf4df8b3 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 6742f0309e9..846ef78c93f 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index ce20517497a..f8a7798f263 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 4b2ade524ba..fe950917d64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>HEAD</tag>
+ <tag>v7.0.204</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index e31327cb81f..fe23e31af78 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 923e719de73..6fe760d668c 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204-SNAPSHOT</version>
+ <version>7.0.204</version>
</parent>
<modelVersion>4.0.0</modelVersion>
From 9095d8d8227c15b29612c7b703ab77f3f1849482 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Thu, 19 Dec 2024 07:28:34 +0000
Subject: [PATCH 45/45] [WSO2 Release] [Jenkins #5143] [Release 7.0.204]
prepare for next development iteration
---
components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++--
.../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++--
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.discovery/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +-
.../pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +-
components/org.wso2.carbon.identity.oauth/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +-
components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +-
components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +-
features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +-
pom.xml | 4 ++--
service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +-
.../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
index 3b2ef2d4c6f..1a4f25ced12 100644
--- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
<name>WSO2 Carbon - User DCR Rest API</name>
<description>WSO2 Carbon - User DCR Rest API</description>
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
index 79124e5623a..055ce350a11 100644
--- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
<description>Rest APIs for OAuth 2.0 Scope Handling</description>
diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
index 918fba08ade..357502aa446 100644
--- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml
index ba6d1b2df04..08d03438ea6 100644
--- a/components/org.wso2.carbon.identity.discovery/pom.xml
+++ b/components/org.wso2.carbon.identity.discovery/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
index 17b59854e0e..aaa18c46edc 100644
--- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
index 4061724133d..050df08811a 100644
--- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml
index 8e4bc9a8e68..9f6eb090a62 100644
--- a/components/org.wso2.carbon.identity.oauth.common/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
index 21784454cea..84a950915f1 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
index 8d77e98e8e3..b46cf5b86bc 100644
--- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
index 91ac62183f0..d1e7970cc14 100644
--- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
index 0c4086221c5..f90dc3455e5 100644
--- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>identity-inbound-auth-oauth</artifactId>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml
index e84db09f793..a54e0545f27 100644
--- a/components/org.wso2.carbon.identity.oauth.par/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
index 2380eda560d..ad3db124c13 100644
--- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
index 9e0babf4929..2bcf16ca6cb 100644
--- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
index 9914b0b2d48..66cbfcfaf41 100644
--- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml
index 072d5b2766c..8cb2db933c0 100644
--- a/components/org.wso2.carbon.identity.oauth/pom.xml
+++ b/components/org.wso2.carbon.identity.oauth/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
index 9ae5241e50a..e76ab173b96 100644
--- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml
index eb00fba6021..d958658a637 100644
--- a/components/org.wso2.carbon.identity.oidc.session/pom.xml
+++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml
index a959410220f..da59e0ebffb 100644
--- a/components/org.wso2.carbon.identity.webfinger/pom.xml
+++ b/components/org.wso2.carbon.identity.webfinger/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
index 6b0f7e4cb68..130b0d2f2ec 100644
--- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
index 9add9f19335..027ba6cca15 100644
--- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
index 4f1cf4df8b3..10d9d735156 100644
--- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
index 846ef78c93f..671dcba62cf 100644
--- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
index f8a7798f263..0415f36be1b 100644
--- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index fe950917d64..b1bdc187c3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 Carbon OAuth module</name>
<url>http://wso2.org</url>
@@ -37,7 +37,7 @@
<url>https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</url>
<developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</developerConnection>
<connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git</connection>
- <tag>v7.0.204</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
index fe23e31af78..2b5ef74a15e 100644
--- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
index 6fe760d668c..043c7a5dd47 100644
--- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
+++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>identity-inbound-auth-oauth</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>7.0.204</version>
+ <version>7.0.205-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>