Merge branch 'master' into pre-issue-access-token-action-tests

wso2 · Nov 26, 2024 · 64c7949 · 64c7949
2 parents 02627bf + f1644fd
commit 64c7949
Show file tree

Hide file tree

Showing 48 changed files with 341 additions and 209 deletions.
diff --git a/.github/workflows/dependency-updater.yml b/.github/workflows/dependency-updater.yml
@@ -7,7 +7,7 @@ on:
     - cron:  '0 15 * * *'
 
 env:
-  MAVEN_OPTS: -Xmx4g -Xms1g
+  MAVEN_OPTS: -Xmx4g -Xms1g -XX:+HeapDumpOnOutOfMemoryError
   REPOSITORY: product-is
   GIT_USERNAME: jenkins-is-staging
   GIT_EMAIL: jenkins-is-staging@wso2.com
@@ -167,7 +167,7 @@ jobs:
         with:
           name: heap-dump
           path: |
-            product-is/**/heap-dump.hprof
+            **/**.hprof
           if-no-files-found: ignore
       - name: Google Chat Notification
         run: |

diff --git a/.github/workflows/fapi-oidc-conformance-test.yml b/.github/workflows/fapi-oidc-conformance-test.yml
@@ -40,6 +40,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         java-version: 11.0.18+10
+        distribution: temurin
 
     - name: Setup Python
       run: |

diff --git a/.github/workflows/oidc-conformance-test.yml b/.github/workflows/oidc-conformance-test.yml
@@ -44,6 +44,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         java-version: 11.0.18+10
+        distribution: temurin
 
     - name: Setup Python
       run: |

diff --git a/.github/workflows/pr-builder-test-JDK11.yml b/.github/workflows/pr-builder-test-JDK11.yml
@@ -13,7 +13,7 @@ on:
         required: true
 
 env:
-  MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Djdk.util.zip.disableZip64ExtraFieldValidation=true
+  MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 -Djdk.util.zip.disableZip64ExtraFieldValidation=true -XX:+HeapDumpOnOutOfMemoryError
 
 
 jobs:
@@ -123,7 +123,7 @@ jobs:
         with:
           name: heap-dump
           path: |
-            product-is/**/heap-dump.hprof
+            **/**.hprof
           if-no-files-found: ignore
       - name: Comment build status
         if: always()

diff --git a/modules/api-resources/api-resources-full/pom.xml b/modules/api-resources/api-resources-full/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>api-resources</artifactId>
-        <version>7.1.0-m5-SNAPSHOT</version>
+        <version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>api-resources-full</artifactId>
-    <version>7.1.0-m5-SNAPSHOT</version>
+    <version>7.1.0-m6-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>WSO2 Identity Server - All Rest API</name>

diff --git a/modules/api-resources/pom.xml b/modules/api-resources/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.1.0-m5-SNAPSHOT</version>
+        <version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>api-resources</artifactId>
-    <version>7.1.0-m5-SNAPSHOT</version>
+    <version>7.1.0-m6-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>WSO2 Identity Server - Rest API</name>

diff --git a/modules/authenticators/pom.xml b/modules/authenticators/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.1.0-m5-SNAPSHOT</version>
+        <version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/connectors/pom.xml b/modules/connectors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.1.0-m5-SNAPSHOT</version>
+        <version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.1.0-m5-SNAPSHOT</version>
+        <version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/distribution/src/repository/resources/conf/deployment.toml b/modules/distribution/src/repository/resources/conf/deployment.toml
@@ -39,6 +39,9 @@ hash= "66cd9688a2ae068244ea01e70f0e230f5623b7fa4cdecb65070a09ec06452262"
 [identity.auth_framework.endpoint]
 app_password= "dashboard"
 
+[notification_templates]
+enable_unicode_support = true
+
 # The KeyStore which is used for encrypting/decrypting internal data. By default the primary keystore is used as the internal keystore.
 
 #[keystore.internal]

diff --git a/modules/features/org.wso2.identity.styles.feature/pom.xml b/modules/features/org.wso2.identity.styles.feature/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>7.1.0-m5-SNAPSHOT</version>
+		<version>7.1.0-m6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/modules/features/org.wso2.identity.ui.feature/pom.xml b/modules/features/org.wso2.identity.ui.feature/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>7.1.0-m5-SNAPSHOT</version>
+		<version>7.1.0-m6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/modules/features/org.wso2.identity.utils.feature/pom.xml b/modules/features/org.wso2.identity.utils.feature/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>7.1.0-m5-SNAPSHOT</version>
+		<version>7.1.0-m6-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/modules/features/pom.xml b/modules/features/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>identity-server-parent</artifactId>
-    	<version>7.1.0-m5-SNAPSHOT</version>
+    	<version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration-ui-templates/pom.xml b/modules/integration-ui-templates/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.1.0-m5-SNAPSHOT</version>
+        <version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.1.0-m5-SNAPSHOT</version>
+        <version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.1.0-m5-SNAPSHOT</version>
+        <version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/extensions/pom.xml b/modules/integration/tests-common/extensions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.1.0-m5-SNAPSHOT</version>
+        <version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.1.0-m5-SNAPSHOT</version>
+        <version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/jacoco-report-generator/pom.xml b/modules/integration/tests-common/jacoco-report-generator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.1.0-m5-SNAPSHOT</version>
+        <version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.1.0-m5-SNAPSHOT</version>
+        <version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.1.0-m5-SNAPSHOT</version>
+        <version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.1.0-m5-SNAPSHOT</version>
+        <version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-integration/tests-backend/pom.xml b/modules/integration/tests-integration/tests-backend/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.1.0-m5-SNAPSHOT</version>
+        <version>7.1.0-m6-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -47,7 +47,7 @@
                         <version>2.22.1</version>
                         <configuration>
                             <!--<argLine>-Xmx1024m -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
-                            <argLine>-Xmx1024m
+                            <argLine>-Xmx1536m -XX:+HeapDumpOnOutOfMemoryError
                                 -Dorg.apache.jasper.compiler.disablejsr199=true
                                 --add-opens=java.base/java.lang=ALL-UNNAMED
                                 --add-opens=java.base/java.util=ALL-UNNAMED

diff --git a/...rc/test/java/org/wso2/identity/integration/test/oauth2/OAuth2ServiceJWTGrantTestCase.java b/...rc/test/java/org/wso2/identity/integration/test/oauth2/OAuth2ServiceJWTGrantTestCase.java
@@ -102,6 +102,7 @@ public class OAuth2ServiceJWTGrantTestCase extends OAuth2ServiceAbstractIntegrat
     private static final String COUNTRY_OIDC_CLAIM = "country";
     private static final String COUNTRY_NEW_OIDC_CLAIM = "customclaim";
     private static final String COUNTRY_LOCAL_CLAIM_URI = "http://wso2.org/claims/country";
+    private static final String STATE_LOCAL_CLAIM_URI = "http://wso2.org/claims/stateorprovince";
     private static final String EMAIL_OIDC_CLAIM = "email";
     private static final String EMAIL_CLAIM_VALUE = "email@email.com";
     private static final String EMAIL_LOCAL_CLAIM_URI = "http://wso2.org/claims/emailaddress";
@@ -590,7 +591,9 @@ private void addAdminUser() throws Exception {
      */
     private void changeCountryOIDCDialect() throws Exception {
 
-        claimManagementRestClient.deleteExternalClaim(ENCODED_OIDC_CLAIM_DIALECT, COUNTRY_CLAIM_ID);
+        ExternalClaimReq updateCountryReq = new ExternalClaimReq().claimURI(COUNTRY_OIDC_CLAIM)
+                .mappedLocalClaimURI(STATE_LOCAL_CLAIM_URI);
+        claimManagementRestClient.updateExternalClaim(ENCODED_OIDC_CLAIM_DIALECT, COUNTRY_CLAIM_ID, updateCountryReq);
 
         ExternalClaimReq externalClaimReq = new ExternalClaimReq();
         externalClaimReq.setClaimURI(COUNTRY_NEW_OIDC_CLAIM);