Updating to v1.3.5

Author: ecom-espirit

.github/dependabot.yml

@@ -10,4 +10,4 @@ updates:
   - dependency-name: org.mockito:mockito-core
     versions:
     - 3.7.7
-    - 3.8.0
+    - 3.8.0

LICENSE.txt LICENSELICENSE.txt renamed to LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2012 - 2018 e-Spirit AG
+   Copyright 2012 - 2023 Crownpeak Technology GmbH - https://www.crownpeak.com
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,10 +1,42 @@
-basicworkflows
---------------
-This project contains new basic workflows developed for FirstSpirit 5.<br/>
-A workflow for release and one for delete that work in both, Java- and Webclient are provided.
-The workflows take account of dependencies so that potential generation errors are minimized and the accessibility of all elements can be ensured. The new workflows provide - in contrast to the existing workflows, known from earlier FirstSpirit versions - an enhanced function range for editors in both FirstSpirit-Clients. One can extend the functionality by implementing invividual extensions and customising the code to the characteristics of the project.
+# BasicWorkflows
 
+## Overview
 
-FirstSpirit and these workflows are developed by the e-Spirit AG (http://www.e-spirit.com).</br> 
-The head office of the e-Spirit AG is in Dortmund, Germany.</br></br>
-For more information please contact our helpdesk (helpdesk@e-spirit.com).
+This project contains the source files of the [BasicWorkflows](https://docs.e-spirit.com/module/basicworkflows/BasicWorkflows_Documentation_EN.html) module.
+
+The module provides new workflows for deleting or releasing elements in the SiteArchitect and the ContentCreator.
+
+It takes release and delete dependencies into account so that potential generation errors are minimized and the accessibility of elements is ensured.
+
+The workflows can be individually extended by setting up own implementations to fulfill project-specific needs.
+
+## Building the module
+
+**Requirements**
+* [Maven](https://maven.apache.org/)
+
+To build the module, simply run
+
+```
+mvn clean install
+```
+
+in the root directory.
+
+The built fsm file will be located at
+
+```
+./target/basicworkflows.fsm
+```
+
+## Resources
+
+[Documentation](https://docs.e-spirit.com/module/basicworkflows/BasicWorkflows_Documentation_EN.html)
+
+[Release notes](https://docs.e-spirit.com/module/basicworkflows/releasenotes/BasicWorkflows_Releasenotes_EN.html)
+
+## Legal Notices
+The BasicWorkflows module is a product of [Crownpeak Technology GmbH](https://www.crownpeak.com), Dortmund, Germany. The BasicWorkflows module is subject to the Apache-2.0 license.
+
+## Disclaimer
+This document is provided for information purposes only. Crownpeak may change the contents hereof without notice. This document is not warranted to be error-free, nor subject to any other warranties or conditions, whether expressed orally or implied in law, including implied warranties and conditions of merchantability or fitness for a particular purpose. Crownpeak specifically disclaims any liability with respect to this document and no contractual obligations are formed either directly or indirectly by this document. The technologies, functionality, services, and processes described herein are subject to change without notice.

pom.xml

@@ -1,21 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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>
 
     <groupId>com.espirit.moddev</groupId>
     <artifactId>basicworkflows</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <packaging>jar</packaging>
     <name>${project.displayName}</name>
-    <inceptionYear>2018</inceptionYear>
+    <inceptionYear>2023</inceptionYear>
     <organization>
-        <name>e-Spirit AG</name>
-        <url>http://www.e-spirit.com/</url>
+        <name>Crownpeak Technology GmbH</name>
+        <url>https://www.crownpeak.com/</url>
     </organization>
 
     <properties>
-        <project.displayName>BasicWorkflows</project.displayName>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
@@ -35,13 +34,16 @@
             <!-- Enabled for unit tests -->
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.9</version>
+                <version>3.1.0</version>
+                <configuration>
+                    <skipTests>false</skipTests>
+                </configuration>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.13</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -88,7 +90,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.4</version>
+                <version>1.8</version>
                 <executions>
                     <execution>
                         <id>rename</id>
@@ -111,7 +113,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>attach-artifacts</id>
@@ -171,13 +173,13 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>1.4</version>
+            <version>2.12.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.2</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -189,23 +191,30 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>1.3</version>
+            <version>2.2</version>
             <scope>test</scope>
         </dependency>
 
         <!-- logging -->
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.20.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.20.0</version>
             <scope>test</scope>
         </dependency>
 
         <!-- mocking -->
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.7.22</version>
+            <version>3.12.4</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -229,9 +238,10 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>license-maven-plugin</artifactId>
-                        <version>1.16</version>
+                        <version>2.0.1</version>
                         <configuration>
                             <licenseName>apache_v2</licenseName>
+                            <licenseResolver>${project.baseUri}/src/license</licenseResolver>
                         </configuration>
                         <executions>
                             <execution>
@@ -309,10 +319,10 @@
                 </property>
             </activation>
             <properties>
-                <firstspirit.version>5.2.181007</firstspirit.version>
+                <firstspirit.version>5.2.230607</firstspirit.version>
             </properties>
         </profile>
 
     </profiles>
 
-</project>
+</project>

src/main/assembly/fsm.xml

@@ -47,4 +47,4 @@
 			<outputDirectory>/META-INF/</outputDirectory>
 		</fileSet>
 	</fileSets>
-</assembly>
+</assembly>

src/main/java/com/espirit/moddev/basicworkflows/delete/DeleteObject.java

@@ -1,21 +1,19 @@
-/*-
- * ========================LICENSE_START=================================
+/*
  * BasicWorkflows Module
  * %%
- * Copyright (C) 2012 - 2018 e-Spirit AG
+ * Copyright (C) 2012 - 2023 Crownpeak Technology GmbH - https://www.crownpeak.com
  * %%
  * Licensed 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.
- * =========================LICENSE_END==================================
  */
 package com.espirit.moddev.basicworkflows.delete;
 
@@ -379,17 +377,22 @@ private Map<String, List<IDProvider>> getDeleteElements() {
                 regardPageStore();
                 // add current PageRefStore element and PageRefFolders (up-recursive)
                 regardPageRefStore();
-            }
-            if (idProvider instanceof DocumentGroup) {
+            } else if (idProvider instanceof DocumentGroup) {
                 // add current PageRefStore element and PageRefFolders (up-recursive)
                 regardPageRefStore();
-            }
             //Added for media management in CC (since FS 5.2)
-            if (idProvider instanceof Media || idProvider instanceof MediaFolder) {
+            } else if (idProvider instanceof Media || idProvider instanceof MediaFolder) {
                 //false == don't delete parent folder, see FSFIVE-53
                 final boolean deleteEmptyParent = true;
                 // add current MediaElement element and MediaFolder (up-recursive)
                 regardMediaStore(deleteEmptyParent);
+            } else {
+                deleteObjects.add(idProvider);
+
+                if (idProvider.getStore().getType() != Store.Type.TEMPLATESTORE) {
+                    // release parent folder
+                    releaseObjects.add(idProvider.getParent());
+                }
             }
         } else {
             // JC

src/main/java/com/espirit/moddev/basicworkflows/delete/WfBranchIfFolderExecutable.java

@@ -1,7 +1,7 @@
 /*
  * BasicWorkflows Module
  * %%
- * Copyright (C) 2012 - 2018 e-Spirit AG
+ * Copyright (C) 2012 - 2023 Crownpeak Technology GmbH - https://www.crownpeak.com
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/espirit/moddev/basicworkflows/delete/WfCheckPrerequisitesExecutable.java

@@ -1,7 +1,7 @@
 /*
  * BasicWorkflows Module
  * %%
- * Copyright (C) 2012 - 2018 e-Spirit AG
+ * Copyright (C) 2012 - 2023 Crownpeak Technology GmbH - https://www.crownpeak.com
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/espirit/moddev/basicworkflows/delete/WfDeleteExecutable.java

@@ -1,7 +1,7 @@
 /*
  * BasicWorkflows Module
  * %%
- * Copyright (C) 2012 - 2018 e-Spirit AG
+ * Copyright (C) 2012 - 2023 Crownpeak Technology GmbH - https://www.crownpeak.com
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/espirit/moddev/basicworkflows/delete/WfDeleteTestExecutable.java

@@ -1,7 +1,7 @@
 /*
  * BasicWorkflows Module
  * %%
- * Copyright (C) 2012 - 2018 e-Spirit AG
+ * Copyright (C) 2012 - 2023 Crownpeak Technology GmbH - https://www.crownpeak.com
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.