TECH-1573: Update master with recent changes from the 45x branch

.github/maven.settings.xml

@@ -55,6 +55,11 @@
             <username>${env.NEXUS_USERNAME}</username>
             <password>${env.NEXUS_PASSWORD}</password>
         </server>
+        <server>
+            <id>jahia-releases</id>
+            <username>${env.NEXUS_USERNAME}</username>
+            <password>${env.NEXUS_PASSWORD}</password>
+        </server>
         <server>
             <id>jahia-internal</id>
             <username>${env.NEXUS_USERNAME}</username>

.github/workflows/on-code-change.yml

@@ -89,7 +89,7 @@ jobs:
           should_use_build_artifacts: true
           jahia_cluster_enabled: false
           should_skip_testrail: true
-          jahia_image: jahia/jahia-ee-dev:8-SNAPSHOT
+          jahia_image: jahia/jahia-ee-dev:8.1-SNAPSHOT
           github_artifact_name: content-editor-standalone-artifacts-${{ github.run_number }}
           bastion_ssh_private_key: ${{ secrets.BASTION_SSH_PRIVATE_KEY_JAHIACI }}
           jahia_license: ${{ secrets.JAHIA_LICENSE_8X_FULL }}

.github/workflows/on-merge.yml

@@ -7,7 +7,7 @@ on:
   push:
     branches:
       - 'master'
-      - '/[0-9]_[0-9]_[Xx]/'
+      - '[0-9]_[0-9]_[Xx]'
     tags-ignore:
       - '**'
 
@@ -62,7 +62,7 @@ jobs:
           module_id: content-editor
           testrail_project: Content Editor
           tests_manifest: provisioning-manifest-build.yml
-          jahia_image: jahia/jahia-ee-dev:8-SNAPSHOT
+          jahia_image: jahia/jahia-ee-dev:8.1-SNAPSHOT
           should_use_build_artifacts: true
           should_skip_testrail: true
           github_artifact_name: content-editor-standalone-artifacts-${{ github.run_number }}

pom.xml

@@ -34,15 +34,15 @@
     </parent>
     <artifactId>content-editor</artifactId>
     <name>Jahia Content Editor</name>
-    <version>4.5.0</version>
+    <version>4.5.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <description>Jahia Content Editor React extension.</description>
 
     <scm>
         <connection>scm:git:git@github.com:Jahia/content-editor.git</connection>
         <developerConnection>scm:git:git@github.com:Jahia/content-editor.git</developerConnection>
         <url>https://github.com/Jahia/content-editor</url>
-        <tag>4_5_0</tag>
+        <tag>master</tag>
     </scm>
     <properties>
         <jahia-module-type>system</jahia-module-type>

src/javascript/DesignSystem/DatePicker/DatePicker.jsx

@@ -10,14 +10,20 @@ import {withStyles} from '@material-ui/core';
 import frLocale from 'dayjs/locale/fr';
 import deLocale from 'dayjs/locale/de';
 import enLocale from 'dayjs/locale/en';
+import esLocale from 'dayjs/locale/es';
+import ptLocale from 'dayjs/locale/pt';
+import itLocale from 'dayjs/locale/it';
 
 import dayjs from 'dayjs';
 import {generateWeekdaysShort, getDateTime, getHourFromDisabledDays} from '../DatePickerInput/date.util';
 
 const locales = {
     fr: generateWeekdaysShort(frLocale),
     de: generateWeekdaysShort(deLocale),
-    en: generateWeekdaysShort(enLocale)
+    en: generateWeekdaysShort(enLocale),
+    es: generateWeekdaysShort(esLocale),
+    pt: generateWeekdaysShort(ptLocale),
+    it: generateWeekdaysShort(itLocale)
 };
 
 const DatePickerCmp = ({
@@ -32,7 +38,7 @@ const DatePickerCmp = ({
     const [month, setMonth] = useState(selectedDateTime ? new Date(selectedDateTime) : new Date());
 
     const isDateTime = variant === 'datetime';
-    const locale = locales[lang] || {};
+    const locale = locales[lang] || locales.en;
 
     const selectedDays = selectedDateTime ? [selectedDateTime] : [];
     const selectedHour = selectedDateTime ? dayjs(selectedDateTime).format('HH:mm') : '00:00';

src/javascript/SelectorTypes/RichText/RichText.utils.js

@@ -19,9 +19,11 @@ export function fillCKEditorPicker(setUrl, dialog, contentPicker, pickerResult)
 
     const altElementId = dialog.getName() === 'image2' ? 'alt' : 'txtAlt';
 
-    dialog
-        .getContentElement('info', eltId === 'url' ? 'advTitle' : altElementId)
-        .setValue(pickerResult.name);
+    const contentElement = dialog.getContentElement('info', eltId === 'url' ? 'advTitle' : altElementId);
+
+    if (contentElement !== undefined) {
+        contentElement.setValue(pickerResult.name);
+    }
 
     // Wrap path to build Jahia url.
     const pathWithEncodedFileName = pickerResult.path.replace(/\/([^/]+\.[^/?#]+)(\?|#|$)/, (_, fileName, suffix) => `/${encodeURIComponent(fileName)}${suffix}`);

tests/jahia-module/pom.xml

@@ -52,7 +52,7 @@
     <groupId>org.jahia.test</groupId>
     <artifactId>content-editor-test-module</artifactId>
     <name>Test module for content-editor</name>
-    <version>4.4.0-SNAPSHOT</version>
+    <version>4.5.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <description>This is the custom module (text-field-initializer) for content-editor cypress tests.</description>
 

tests/jahia-module/pom.xml.versionsBackup

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    This file is part of Jahia, next-generation open source CMS:
+    Jahia's next-generation, open source CMS stems from a widely acknowledged vision
+    of enterprise application convergence - web, search, document, social and portal -
+    unified by the simplicity of web content management.
+
+    For more information, please visit http://www.jahia.com.
+
+    Copyright (C) 2002-2020 Jahia Solutions Group SA. All rights reserved.
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+    As a special exception to the terms and conditions of version 2.0 of
+    the GPL (or any later version), you may redistribute this Program in connection
+    with Free/Libre and Open Source Software ("FLOSS") applications as described
+    in Jahia's FLOSS exception. You should have received a copy of the text
+    describing the FLOSS exception, and it is also available here:
+    http://www.jahia.com/license
+
+    Commercial and Supported Versions of the program (dual licensing):
+    alternatively, commercial and supported versions of the program may be used
+    in accordance with the terms and conditions contained in a separate
+    written agreement between you and Jahia Solutions Group SA.
+
+    If you are unsure which license is appropriate for your use,
+    please contact the sales department at sales@jahia.com.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>jahia-modules</artifactId>
+        <groupId>org.jahia.modules</groupId>
+        <version>8.1.1.0</version>
+        <relativePath />
+    </parent>
+    <groupId>org.jahia.test</groupId>
+    <artifactId>content-editor-test-module</artifactId>
+    <name>Test module for content-editor</name>
+    <version>4.4.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <description>This is the custom module (text-field-initializer) for content-editor cypress tests.</description>
+
+    <repositories>
+        <repository>
+            <id>jahia-public</id>
+            <name>Jahia Public Repository</name>
+            <url>https://devtools.jahia.com/nexus/content/groups/public</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Jahia-Depends>default</Jahia-Depends>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

tests/provisioning-manifest-build.yml

@@ -24,12 +24,17 @@
 - import: "jar:mvn:org.jahia.modules/digitall/2.3.0/zip/import!/users.zip"
 - importSite: "jar:mvn:org.jahia.modules/digitall/2.3.0/zip/import!/Digitall.zip"
 
-- addMavenRepository: 'https://devtools.jahia.com/nexus/content/groups/public/@snapshots@noreleases'
+- addMavenRepository: 'https://devtools.jahia.com/nexus/content/groups/public/'
+- installBundle:
+  - 'mvn:org.jahia.modules/jcontent/2.12.0'
+  autoStart: true
+  uninstallPreviousVersion: true
+
 - addMavenRepository: 'https://devtools.jahia.com/nexus/content/groups/internal@id=jahia-internal@snapshots'
   username: ${env:NEXUS_USERNAME}
   password: ${env:NEXUS_PASSWORD}
 - installBundle:
-  - 'mvn:org.jahia.modules/jcontent'
+  - 'mvn:org.jahia.modules/site-settings-seo/4.4.0-SNAPSHOT'
   - url: 'mvn:org.jahia.modules/qa-module'
   autoStart: true
   uninstallPreviousVersion: true

tests/provisioning-manifest-snapshot.yml

@@ -27,7 +27,8 @@
   username: ${env:NEXUS_USERNAME}
   password: ${env:NEXUS_PASSWORD}
 - installBundle:
-  - 'mvn:org.jahia.modules/jcontent'
+  - 'mvn:org.jahia.modules/site-settings-seo/4.4.0-SNAPSHOT'
+  - 'mvn:org.jahia.modules/jcontent/2.12.0'
   - 'mvn:org.jahia.modules/content-editor'
   - 'mvn:org.jahia.test/content-editor-test-module'
   autoStart: true