Merge branch 'wso2:master' into master

kumardeepak5 · Oct 22, 2024 · bf3770a · bf3770a
2 parents 33a0702 + 4290fc1
commit bf3770a
Show file tree

Hide file tree

Showing 59 changed files with 1,143 additions and 316 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: ❗️ Issue/Bug report
 about: Report issue or bug related to the project
 title: ''
-labels: 'bug'
+labels: 'Type/Bug'
 assignees: ''
 
 ---

diff --git a/.github/ISSUE_TEMPLATE/doc_issues.md b/.github/ISSUE_TEMPLATE/doc_issues.md
@@ -2,7 +2,7 @@
 name: 📕 Doc issues
 about: Please report documentation issues here
 title: ''
-labels: 'docs'
+labels: 'Type/Docs'
 assignees: ''
 
 ---

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: ➕ Feature request
 about: Suggest an idea for this project
 title: ''
-labels: 'feature'
+labels: 'Type/NewFeature'
 assignees: ''
 
 ---

diff --git a/.github/ISSUE_TEMPLATE/improvement.md b/.github/ISSUE_TEMPLATE/improvement.md
@@ -2,7 +2,7 @@
 name: ✅ Improvement suggestion
 about: Suggest an improvement for the project
 title: ''
-labels: 'improvement'
+labels: 'Type/Improvement'
 assignees: ''
 
 ---

diff --git a/.github/ISSUE_TEMPLATE/test_request.md b/.github/ISSUE_TEMPLATE/test_request.md
@@ -2,7 +2,7 @@
 name: "✅ Testing Task"
 about: Create a testing task to improve the quality of the product.
 title: ''
-labels: 'test'
+labels: 'Type/Test'
 assignees: ''
 
 ---

diff --git a/.github/workflows/product-is-builder-jdk17.yml b/.github/workflows/product-is-builder-jdk17.yml
@@ -3,8 +3,8 @@ name: product-is-builder-jdk17
 on:
   workflow_dispatch:
   schedule:
-#    At 00:00 on day-of-month 1
-    - cron:  '0 0 1 * *'
+#    Daily at 17:00 UTC (10.30 PM SL time)
+    - cron:  '0 17 * * *'
 
 
 env:
@@ -39,21 +39,32 @@ jobs:
           ls
           cd modules/integration/
           mvn clean install --batch-mode | tee mvn-build.log
+          
           PR_BUILD_STATUS=$(cat mvn-build.log | grep "\[INFO\] BUILD" | grep -oE '[^ ]+$')
           PR_TEST_RESULT=$(sed -n -e '/\[INFO\] Results:/,/\[INFO\] Tests run:/ p' mvn-build.log)
+          
           PR_BUILD_FINAL_RESULT=$(
             echo "==========================================================="
             echo "product-is BUILD $PR_BUILD_STATUS"
             echo "=========================================================="
             echo ""
             echo "$PR_TEST_RESULT"
           )
+          
           PR_BUILD_RESULT_LOG_TEMP=$(echo "$PR_BUILD_FINAL_RESULT" | sed 's/$/%0A/')
           PR_BUILD_RESULT_LOG=$(echo $PR_BUILD_RESULT_LOG_TEMP)
           echo "::warning::$PR_BUILD_RESULT_LOG"
+          
           PR_BUILD_SUCCESS_COUNT=$(grep -o -i "\[INFO\] BUILD SUCCESS" mvn-build.log | wc -l)
-          if [ "$PR_BUILD_SUCCESS_COUNT" != "3" ]; then
+          if [ "$PR_BUILD_SUCCESS_COUNT" != "11" ]; then
+            echo "Success Count $PR_BUILD_SUCCESS_COUNT"
             echo "PR BUILD not successfull. Aborting."
             echo "::error::PR BUILD not successfull. Check artifacts for logs."
             exit 1
           fi
+          
+          echo ""
+          echo "=========================================================="
+          echo "Build completed"
+          echo "=========================================================="
+          echo ""
diff --git a/.github/workflows/product-is-builder-jdk21.yml b/.github/workflows/product-is-builder-jdk21.yml
@@ -0,0 +1,70 @@
+name: product-is-builder-jdk21
+
+on:
+  workflow_dispatch:
+  schedule:
+#    Daily at 23:00 UTC (04.30 AM SL time)
+    - cron:  '0 23 * * *'
+
+
+env:
+  MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    env:
+      JAVA_TOOL_OPTIONS: "-Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true"
+
+    steps:
+      - name: Checkout repository code
+        uses: actions/checkout@v2
+      - name: Set up Adopt JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: "11"
+          distribution: "adopt"
+      - name: Product-IS build with JDK 11 without Integration Tests
+        run: |
+          mvn clean install --batch-mode -Dmaven.test.skip=true | tee mvn-build.log
+      - name: Set up Adopt JDK 21
+        uses: actions/setup-java@v2
+        with:
+          java-version: "21"
+          distribution: "adopt"
+      - name: Product-IS build with JDK 21 with Integration Tests
+        run: |
+          ls
+          cd modules/integration/
+          mvn clean install --batch-mode | tee mvn-build.log
+          
+          PR_BUILD_STATUS=$(cat mvn-build.log | grep "\[INFO\] BUILD" | grep -oE '[^ ]+$')
+          PR_TEST_RESULT=$(sed -n -e '/\[INFO\] Results:/,/\[INFO\] Tests run:/ p' mvn-build.log)
+          
+          PR_BUILD_FINAL_RESULT=$(
+            echo "==========================================================="
+            echo "product-is BUILD $PR_BUILD_STATUS"
+            echo "=========================================================="
+            echo ""
+            echo "$PR_TEST_RESULT"
+          )
+          
+          PR_BUILD_RESULT_LOG_TEMP=$(echo "$PR_BUILD_FINAL_RESULT" | sed 's/$/%0A/')
+          PR_BUILD_RESULT_LOG=$(echo $PR_BUILD_RESULT_LOG_TEMP)
+          echo "::warning::$PR_BUILD_RESULT_LOG"
+          
+          PR_BUILD_SUCCESS_COUNT=$(grep -o -i "\[INFO\] BUILD SUCCESS" mvn-build.log | wc -l)
+          if [ "$PR_BUILD_SUCCESS_COUNT" != "11" ]; then
+            echo "Success Count $PR_BUILD_SUCCESS_COUNT"
+            echo "PR BUILD not successfull. Aborting."
+            echo "::error::PR BUILD not successfull. Check artifacts for logs."
+            exit 1
+          fi
+          
+          echo ""
+          echo "=========================================================="
+          echo "Build completed"
+          echo "=========================================================="
+          echo ""
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-m3-SNAPSHOT</version>
+        <version>7.1.0-m4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>api-resources-full</artifactId>
-    <version>7.1.0-m3-SNAPSHOT</version>
+    <version>7.1.0-m4-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-m3-SNAPSHOT</version>
+        <version>7.1.0-m4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>api-resources</artifactId>
-    <version>7.1.0-m3-SNAPSHOT</version>
+    <version>7.1.0-m4-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-m3-SNAPSHOT</version>
+        <version>7.1.0-m4-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-m3-SNAPSHOT</version>
+        <version>7.1.0-m4-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-m3-SNAPSHOT</version>
+        <version>7.1.0-m4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

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-m3-SNAPSHOT</version>
+		<version>7.1.0-m4-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-m3-SNAPSHOT</version>
+		<version>7.1.0-m4-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-m3-SNAPSHOT</version>
+		<version>7.1.0-m4-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-m3-SNAPSHOT</version>
+    	<version>7.1.0-m4-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-m3-SNAPSHOT</version>
+        <version>7.1.0-m4-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-m3-SNAPSHOT</version>
+        <version>7.1.0-m4-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-m3-SNAPSHOT</version>
+        <version>7.1.0-m4-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-m3-SNAPSHOT</version>
+        <version>7.1.0-m4-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-m3-SNAPSHOT</version>
+        <version>7.1.0-m4-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-m3-SNAPSHOT</version>
+        <version>7.1.0-m4-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-m3-SNAPSHOT</version>
+        <version>7.1.0-m4-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-m3-SNAPSHOT</version>
+        <version>7.1.0-m4-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-m3-SNAPSHOT</version>
+        <version>7.1.0-m4-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-m3-SNAPSHOT</version>
+        <version>7.1.0-m4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>