chore(backend): Test Java 21 and identify next steps after illegal (#28622)

.github/data/slack-mappings.json

@@ -98,7 +98,7 @@
   },
   {
     "github_user": "jgambarios",
-    "slack_id": "D04SH7PU16Z"
+    "slack_id": "U028X13T2"
   },
   {
     "github_user": "fishsmith",
@@ -144,10 +144,6 @@
     "github_user": "josemejias11",
     "slack_id": "U03RU9U23RQ"
   },
-  {
-    "github_user": "dcolina",
-    "slack_id": "U04SKNT3W7L"
-  },
   {
     "github_user": "melissarojas-dotcms",
     "slack_id": "U047MRAKREJ"

.github/workflows/cli-release-process.yml

@@ -19,7 +19,7 @@ defaults:
     shell: bash
 
 env:
-  JAVA_VERSION: 11
+  JAVA_VERSION: 21
   JAVA_DISTRO: temurin
   GRAALVM_VERSION: '22.3.1'
   MVN_PACKAGE_TYPE: 'uber-jar'

.github/workflows/maven-build-docker-image.yml

@@ -50,7 +50,7 @@ jobs:
     name: Build/Push Image
     runs-on: ubuntu-latest
     env:
-      JAVA_VERSION: 11
+      JAVA_VERSION: 21
       JAVA_DISTRO: temurin
       JVM_TEST_MAVEN_OPTS: '-e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
       DOCKER_BUILD_CONTEXT: /home/runner/work/_temp/core-build

.github/workflows/pr-notifier.yml

@@ -30,6 +30,7 @@ jobs:
     if: always()
     env:
       SOURCE_REPOSITORY: ${{ github.repository }}
+    continue-on-error: true
     steps:
       - name: Resolve User
         id: resolve-user
@@ -55,22 +56,22 @@ jobs:
           githack_core_repo_url=https://${githack_host}/${{ env.SOURCE_REPOSITORY }}
 
           branch=/${{ github.head_ref }}
-          [[ "${branch}" == '/master' ]] && branch=
-
-          slack_mappings_file=.github/data/slack-mappings.json
-          slack_mapping_url=${githack_core_repo_url}${branch}/${slack_mappings_file}
+          slack_mappings_file=slack-mappings.json
+          slack_mappings_path=.github/data/${slack_mappings_file}
+          slack_mapping_url=${githack_core_repo_url}${branch}/${slack_mappings_path}
 
           if [[ -n "${github_user}" ]]; then
-            if [[ -f ${slack_mappings_file} ]]; then
-              json=$(curl -s ${slack_mapping_url})
-
-              channel_id=$( \
-                jq '.[] | select(.github_user == "${github_user}")' <<< "${json}" | \
-                jq -r '.slack_id' \
-              )
-            fi
+            json=$(curl -s ${slack_mapping_url})
+
+            channel_id=$( \
+              jq ".[] | select(.github_user == \"${github_user}\")" <<< "${json}" | \
+              jq -r '.slack_id' \
+            )
+
+            echo "Resolved channel id [${channel_id}] from [${slack_mappings_file}]"
 
             if [[ -z "${channel_id}" ]]; then
+              echo "Channel id could not be resolved from [${slack_mappings_file}]. Attempting to resolve from Github user email."
               user_email=$( \
                 curl \
                   -u ${{ secrets.CI_MACHINE_USER }}:${{ secrets.CI_MACHINE_TOKEN }} \
@@ -81,6 +82,7 @@ jobs:
                 sed "s/\"email\"://g" | \
                 tr -d '",[:space:]' \
               )
+              echo "Resolved user email: [${user_email}]"
 
               if [[ -n "${user_email}" ]]; then
                 channel_id=$( \
@@ -95,11 +97,15 @@ jobs:
                   sed "s/\"id\"://g" | \
                   tr -d '",[:space:]' \
                 )
+
+                echo "Resolved channel id [${channel_id}] from email [${user_email}]"
               fi
             fi
           fi
 
-          [[ -z "${channel_id}" ]] && channel_id=${{ env.DEFAULT_CHANNEL_ID }}
+          [[ -z "${channel_id}" ]] \
+            && echo "Channel id could not be resolved, defaulting to eng's [${{ env.DEFAULT_CHANNEL_ID }}]" \
+            && channel_id=${{ env.DEFAULT_CHANNEL_ID }}
           echo "channel_id=${channel_id}" >> $GITHUB_OUTPUT
           echo "channel_id=${channel_id}"
 

.github/workflows/reusable-ci-build.yml

@@ -11,14 +11,14 @@ env:
   REGISTRY: ghcr.io
   DOCKER_IMAGE: dotcms/dotcms_test
   DOCKER_TAG: run-${{ github.run_id }}
-
+  JAVA_VERSION: 21
 jobs:
   #
   # Initial JDK 11 Build
   # Basic build and install all with maven without running tests.
   # Provides local maven repo for subsequent steps
   #
-  build-jdk11:
+  build-jdk:
     name: "Initial Artifact Build"
     runs-on: ubuntu-20.04
     if: inputs.core-build == true
@@ -35,10 +35,10 @@ jobs:
         if: github.ref != 'refs/heads/master'
         run: git fetch origin master:master
       - uses: ./.github/actions/cleanup-runner
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'temurin'
       - name: Get Date
         id: get-date

.github/workflows/reusable-ci-test.yml

@@ -38,7 +38,8 @@ env:
   DOCKER_IMAGE: dotcms/dotcms_test
   DOCKER_TAG: run-${{ inputs.artifact-run-id || github.run_id }}
   ARTIFACT_RUN_ID: ${{ inputs.artifact-run-id || github.run_id }}
-
+  JAVA_VERSION: 21
+  JAVA_DISTRO: temurin
 jobs:
   #
   # Run all JVM Unit Tests in parallel with other tests
@@ -53,7 +54,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ { name: "11", java-version: 11, distribution: 'temurin', maven_args: "" } ]
+        java: [ { name: "21", java-version: 21, distribution: 'temurin', maven_args: "" } ]
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java.name }}
@@ -108,7 +109,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        java: [ { name: "11", java-version: 11, distribution: 'temurin', maven_args: "" } ]
+        java: [ { name: "21", java-version: 21, distribution: 'temurin', maven_args: "" } ]
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java.name }}
@@ -182,10 +183,10 @@ jobs:
       MAVEN_OPTS: -Xmx2048m
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 21
           distribution: 'temurin'
       - name: Get Date
         id: get-date
@@ -253,7 +254,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ { name: "11", java-version: 11, distribution: 'temurin', maven_args: "" } ]
+        java: [ { name: "21", java-version: 21, distribution: 'temurin', maven_args: "" } ]
         suites:
           - { name: "MainSuite 1a", pathName: "mainsuite1a", maven_args: '-Dit.test=MainSuite1a -Dit.test.forkcount=1' }
           - { name: "MainSuite 1b", pathName: "mainsuite1b", maven_args: '-Dit.test=MainSuite1b -Dit.test.forkcount=1' }
@@ -317,6 +318,11 @@ jobs:
       - id: fetch-core
         name: Fetch Core Repo
         uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
       - name: Download Maven Repo
         uses: actions/download-artifact@v4
         with:

.github/workflows/reusable-sonarqube.yml

@@ -11,7 +11,10 @@ on:
         required: true
       SONAR_HOST_URL:
         required: true
-
+# sonarqube only runs with Java 17+
+env:
+  JAVA_VERSION: 21
+  JAVA_DISTRO: temurin
 jobs:
   sonarqube:
     name: SonarQube Scan
@@ -25,10 +28,10 @@ jobs:
       - name: Setup master branch locally without switching current branch
         if: github.ref != 'refs/heads/master'
         run: git fetch origin master:master
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
       - name: Get Date
         id: get-date

.sdkmanrc

@@ -1 +1 @@
-java=11.0.22-ms
+java=21.0.3-ms

bom/application/pom.xml

@@ -26,7 +26,6 @@
         <jackson.version>2.16.1</jackson.version>
         <jersey.version>2.22.1</jersey.version>
         <graalvm.version>22.3.3</graalvm.version>
-        <dotcms.tika-api.version>2023.09.8</dotcms.tika-api.version>
     </properties>
     <dependencyManagement>
 
@@ -59,7 +58,7 @@
             <dependency>
                 <groupId>com.dotcms.core.plugins</groupId>
                 <artifactId>com.dotcms.tika-api</artifactId>
-                <version>${dotcms.tika-api.version}</version>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
@@ -727,7 +726,7 @@
             <dependency>
                 <groupId>com.graphql-java</groupId>
                 <artifactId>graphql-java</artifactId>
-                <version>13.0</version>
+                <version>17.5</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId>
@@ -738,14 +737,16 @@
             <dependency>
                 <groupId>com.graphql-java</groupId>
                 <artifactId>graphql-java-extended-scalars</artifactId>
-                <version>1.0.1</version>
+                <version>17.1</version>
             </dependency>
             <dependency>
                 <groupId>com.graphql-java-kickstart</groupId>
                 <artifactId>graphql-java-servlet</artifactId>
-                <version>9.1.0</version>
+                <version>13.0.1</version>
             </dependency>
 
+
+
             <!--
              *****************************
                 Database Support
@@ -797,7 +798,7 @@
            <dependency>
                 <groupId>dnsjava</groupId>
                 <artifactId>dnsjava</artifactId>
-                <version>2.1.8</version>
+                <version>3.5.3</version>
             </dependency>
 
             <dependency>
@@ -1503,7 +1504,12 @@
                 <artifactId>mockito-core</artifactId>
                 <version>5.11.0</version>
             </dependency>
-
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-junit-jupiter</artifactId>
+                <version>5.11.0</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <!-- Hamcrest is a framework for writing matcher objects allowing 'match' rules to be defined declaratively. -->
                 <groupId>org.hamcrest</groupId>

core-web/apps/dotcms-ui/src/app/view/components/login/dot-login-component/dot-login.component.ts

@@ -2,7 +2,7 @@ import { Observable, Subject } from 'rxjs';
 
 import { HttpErrorResponse } from '@angular/common/http';
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { FormControl, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Params } from '@angular/router';
 
 import { SelectItem } from 'primeng/api';
@@ -116,11 +116,15 @@ export class DotLoginComponent implements OnInit, OnDestroy {
         this.setInitialMessage(loginInfo);
     }
 
+    private isEmail(potentialEmail: string): boolean {
+        return !!new FormControl(potentialEmail, Validators.email).errors?.email;
+    }
+
     private setInitialMessage(loginInfo: DotLoginInformation): void {
         this.route.queryParams.pipe(take(1)).subscribe((params: Params) => {
             if (params['changedPassword']) {
                 this.setMessage(loginInfo.i18nMessagesMap['reset-password-success']);
-            } else if (params['resetEmailSent']) {
+            } else if (params['resetEmailSent'] && !this.isEmail(params['resetEmail'])) {
                 this.setMessage(
                     loginInfo.i18nMessagesMap['a-new-password-has-been-sent-to-x'].replace(
                         '{0}',

core-web/apps/dotcms-ui/src/stories/primeng/data/Tree.stories.ts

@@ -1,27 +1,26 @@
-// also exported from '@storybook/angular' if you can deal with breaking changes in 6.1
-import { Meta, moduleMetadata, Story } from '@storybook/angular';
+import { TreeNode } from 'primeng/api';
+import { Tree, TreeModule } from 'primeng/tree';
 
-import { TreeModule } from 'primeng/tree';
+import type { Meta, StoryObj } from '@storybook/angular';
 
-export default {
+const meta: Meta<Tree> = {
     title: 'PrimeNG/Data/Tree',
-    decorators: [
-        moduleMetadata({
-            imports: [TreeModule]
-        })
-    ],
+    component: Tree,
     parameters: {
         layout: 'centered',
         docs: {
             description: {
                 component:
-                    'Paginator is a generic component to display content in paged format.: https://primefaces.org/primeng/showcase/#/paginator'
+                    'Tree is used to display hierarchical data: https://www.primefaces.org/primeng-v15-lts/tree'
             }
         }
     }
-} as Meta;
+};
+export default meta;
+
+type Story = StoryObj<Tree>;
 
-const files = [
+export const files: TreeNode[] = [
     {
         label: 'Documents',
         data: 'Documents Folder',
@@ -102,21 +101,14 @@ const files = [
     }
 ];
 
-const BasicTemplate = `<p-tree [value]="files"></p-tree>`;
-
-export const Basic: Story = () => {
-    return {
-        template: BasicTemplate,
+export const Default: Story = {
+    render: () => ({
+        moduleMetadata: {
+            imports: [TreeModule]
+        },
         props: {
             files
-        }
-    };
-};
-
-Basic.parameters = {
-    docs: {
-        source: {
-            code: BasicTemplate
-        }
-    }
+        },
+        template: `<p-tree [value]="files"></p-tree>`
+    })
 };