From 52daa60ffb6f9cf0e83961fe84b7fe5aace4c9b3 Mon Sep 17 00:00:00 2001 From: Team E-Commerce Date: Wed, 28 Jun 2023 12:16:21 +0000 Subject: [PATCH 1/2] Updating to v1.3.5 --- .github/dependabot.yml | 2 +- LICENSE.txt => LICENSE | 2 +- README.md | 48 ++++++-- pom.xml | 50 +++++---- src/main/assembly/fsm.xml | 2 +- .../basicworkflows/delete/DeleteObject.java | 23 ++-- .../delete/WfBranchIfFolderExecutable.java | 2 +- .../WfCheckPrerequisitesExecutable.java | 2 +- .../delete/WfDeleteExecutable.java | 2 +- .../delete/WfDeleteTestExecutable.java | 2 +- .../WfFindRelatedObjectsExecutable.java | 2 +- .../delete/WfShowActionDialogExecutable.java | 2 +- ...nDialogExecutableWithCancelTransition.java | 2 +- .../WfShowRelatedObjectsExecutable.java | 2 +- .../delete/WfShowWarningExecutable.java | 2 +- .../basicworkflows/delete/WorkflowObject.java | 2 +- .../basicworkflows/delete/package-info.java | 2 +- .../basicworkflows/release/ReleaseObject.java | 10 +- .../WfFindRelatedObjectsExecutable.java | 2 +- .../release/WfReleaseExecutable.java | 2 +- .../release/WfReleaseTestExecutable.java | 2 +- .../WfShowNotReleasedObjectsExecutable.java | 2 +- .../release/WfShowWarningExecutable.java | 2 +- .../release/WorkflowObject.java | 2 +- .../basicworkflows/release/package-info.java | 2 +- .../util/AbstractWorkflowExecutable.java | 2 +- .../util/BasicWorkflowStatusProvider.java | 2 +- .../moddev/basicworkflows/util/Dialog.java | 2 +- .../basicworkflows/util/FormEvaluator.java | 2 +- .../basicworkflows/util/FormValidator.java | 2 +- .../basicworkflows/util/FsException.java | 2 +- .../moddev/basicworkflows/util/FsLocale.java | 2 +- .../basicworkflows/util/IntegrationTest.java | 2 +- .../basicworkflows/util/ReferenceResult.java | 2 +- .../basicworkflows/util/StoreComparator.java | 4 +- .../moddev/basicworkflows/util/StoreUtil.java | 2 +- .../util/WorkflowConstants.java | 2 +- .../util/WorkflowSessionHelper.java | 2 +- .../basicworkflows/util/package-info.java | 2 +- .../annotations/PublicComponent.java | 17 +++ src/main/resources/LICENSE.TXT | 2 +- .../moddev/basicworkflows/Messages.properties | 2 +- .../basicworkflows/Messages_de.properties | 2 +- .../basicworkflows/Messages_en.properties | 2 +- src/main/resources/module.xml | 106 +++++------------- src/main/resources/web/web.xml | 3 +- .../delete/DeleteObjectTest.java | 10 +- .../WfCheckPrerequisitesExecutableTest.java | 2 +- .../delete/WorkflowObjectTest.java | 2 +- ...fShowNotReleasedObjectsExecutableTest.java | 2 +- .../basicworkflows/util/BaseContextRule.java | 2 +- .../util/BasicWorkflowStatusProviderTest.java | 2 +- .../basicworkflows/util/DialogTest.java | 2 +- .../util/ReferenceResultTest.java | 2 +- .../util/ReleaseStateChangedTestData.java | 2 +- .../util/StoreComparatorTest.java | 2 +- .../util/WorkflowSessionHelperTest.java | 2 +- 57 files changed, 185 insertions(+), 182 deletions(-) rename LICENSE.txt => LICENSE (99%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 205fe60..bacb58c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,4 +10,4 @@ updates: - dependency-name: org.mockito:mockito-core versions: - 3.7.7 - - 3.8.0 + - 3.8.0 \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE similarity index 99% rename from LICENSE.txt rename to LICENSE index 19692d9..1406762 100644 --- a/LICENSE.txt +++ b/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. diff --git a/README.md b/README.md index 3edbf29..b9f4ca5 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,42 @@ -basicworkflows --------------- -This project contains new basic workflows developed for FirstSpirit 5.
-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).
-The head office of the e-Spirit AG is in Dortmund, Germany.

-For more information please contact our helpdesk (helpdesk@e-spirit.com). \ No newline at end of file +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. \ No newline at end of file diff --git a/pom.xml b/pom.xml index 708d401..4553565 100644 --- a/pom.xml +++ b/pom.xml @@ -1,21 +1,20 @@ - + 4.0.0 com.espirit.moddev basicworkflows - 1.3.4 + 1.3.5 jar ${project.displayName} - 2018 + 2023 - e-Spirit AG - http://www.e-spirit.com/ + Crownpeak Technology GmbH + https://www.crownpeak.com/ - BasicWorkflows UTF-8 UTF-8 @@ -35,13 +34,16 @@ maven-surefire-plugin - 2.9 + 3.1.0 + + false + org.apache.maven.plugins maven-failsafe-plugin - 2.13 + 3.1.0 @@ -88,7 +90,7 @@ org.apache.maven.plugins maven-antrun-plugin - 1.4 + 1.8 rename @@ -111,7 +113,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.4.0 attach-artifacts @@ -171,13 +173,13 @@ commons-io commons-io - 1.4 + 2.12.0 test junit junit - 4.12 + 4.13.2 test @@ -189,15 +191,22 @@ org.hamcrest hamcrest-library - 1.3 + 2.2 test - log4j - log4j - 1.2.16 + org.apache.logging.log4j + log4j-api + 2.20.0 + test + + + + org.apache.logging.log4j + log4j-core + 2.20.0 test @@ -205,7 +214,7 @@ org.mockito mockito-core - 2.7.22 + 3.12.4 test @@ -229,9 +238,10 @@ org.codehaus.mojo license-maven-plugin - 1.16 + 2.0.1 apache_v2 + ${project.baseUri}/src/license @@ -309,10 +319,10 @@ - 5.2.181007 + 5.2.230607 - + \ No newline at end of file diff --git a/src/main/assembly/fsm.xml b/src/main/assembly/fsm.xml index 5b57f4f..f9fc8fe 100644 --- a/src/main/assembly/fsm.xml +++ b/src/main/assembly/fsm.xml @@ -47,4 +47,4 @@ /META-INF/ - + \ No newline at end of file diff --git a/src/main/java/com/espirit/moddev/basicworkflows/delete/DeleteObject.java b/src/main/java/com/espirit/moddev/basicworkflows/delete/DeleteObject.java index a058b83..9860a37 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/delete/DeleteObject.java +++ b/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> 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 diff --git a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfBranchIfFolderExecutable.java b/src/main/java/com/espirit/moddev/basicworkflows/delete/WfBranchIfFolderExecutable.java index 5f43dfd..ee81374 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfBranchIfFolderExecutable.java +++ b/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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfCheckPrerequisitesExecutable.java b/src/main/java/com/espirit/moddev/basicworkflows/delete/WfCheckPrerequisitesExecutable.java index f9479cf..b95c8ca 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfCheckPrerequisitesExecutable.java +++ b/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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfDeleteExecutable.java b/src/main/java/com/espirit/moddev/basicworkflows/delete/WfDeleteExecutable.java index dbe58ca..a0a283e 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfDeleteExecutable.java +++ b/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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfDeleteTestExecutable.java b/src/main/java/com/espirit/moddev/basicworkflows/delete/WfDeleteTestExecutable.java index 8e414fb..cc08a2a 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfDeleteTestExecutable.java +++ b/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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfFindRelatedObjectsExecutable.java b/src/main/java/com/espirit/moddev/basicworkflows/delete/WfFindRelatedObjectsExecutable.java index 9986b2a..6b20ff1 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfFindRelatedObjectsExecutable.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/delete/WfFindRelatedObjectsExecutable.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowActionDialogExecutable.java b/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowActionDialogExecutable.java index 86bdac3..03029d8 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowActionDialogExecutable.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowActionDialogExecutable.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowActionDialogExecutableWithCancelTransition.java b/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowActionDialogExecutableWithCancelTransition.java index 4706599..b599e8a 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowActionDialogExecutableWithCancelTransition.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowActionDialogExecutableWithCancelTransition.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowRelatedObjectsExecutable.java b/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowRelatedObjectsExecutable.java index 4f48988..15fc515 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowRelatedObjectsExecutable.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowRelatedObjectsExecutable.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowWarningExecutable.java b/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowWarningExecutable.java index d2b6ca1..308b015 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowWarningExecutable.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/delete/WfShowWarningExecutable.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/delete/WorkflowObject.java b/src/main/java/com/espirit/moddev/basicworkflows/delete/WorkflowObject.java index 3951022..baa02cd 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/delete/WorkflowObject.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/delete/WorkflowObject.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/delete/package-info.java b/src/main/java/com/espirit/moddev/basicworkflows/delete/package-info.java index f2b3479..3d1faad 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/delete/package-info.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/delete/package-info.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/release/ReleaseObject.java b/src/main/java/com/espirit/moddev/basicworkflows/release/ReleaseObject.java index 8d2f999..c665494 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/release/ReleaseObject.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/release/ReleaseObject.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.release; diff --git a/src/main/java/com/espirit/moddev/basicworkflows/release/WfFindRelatedObjectsExecutable.java b/src/main/java/com/espirit/moddev/basicworkflows/release/WfFindRelatedObjectsExecutable.java index 3d15adb..8546396 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/release/WfFindRelatedObjectsExecutable.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/release/WfFindRelatedObjectsExecutable.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/release/WfReleaseExecutable.java b/src/main/java/com/espirit/moddev/basicworkflows/release/WfReleaseExecutable.java index 83d0859..c3c884d 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/release/WfReleaseExecutable.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/release/WfReleaseExecutable.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/release/WfReleaseTestExecutable.java b/src/main/java/com/espirit/moddev/basicworkflows/release/WfReleaseTestExecutable.java index f26f886..17e519f 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/release/WfReleaseTestExecutable.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/release/WfReleaseTestExecutable.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/release/WfShowNotReleasedObjectsExecutable.java b/src/main/java/com/espirit/moddev/basicworkflows/release/WfShowNotReleasedObjectsExecutable.java index ba48009..b5d33fa 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/release/WfShowNotReleasedObjectsExecutable.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/release/WfShowNotReleasedObjectsExecutable.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/release/WfShowWarningExecutable.java b/src/main/java/com/espirit/moddev/basicworkflows/release/WfShowWarningExecutable.java index c9cdbe1..97a51b7 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/release/WfShowWarningExecutable.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/release/WfShowWarningExecutable.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/release/WorkflowObject.java b/src/main/java/com/espirit/moddev/basicworkflows/release/WorkflowObject.java index 8f44f96..a7ad828 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/release/WorkflowObject.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/release/WorkflowObject.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/release/package-info.java b/src/main/java/com/espirit/moddev/basicworkflows/release/package-info.java index f5d19c4..349d0a1 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/release/package-info.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/release/package-info.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/util/AbstractWorkflowExecutable.java b/src/main/java/com/espirit/moddev/basicworkflows/util/AbstractWorkflowExecutable.java index 84cef12..0e6756a 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/util/AbstractWorkflowExecutable.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/util/AbstractWorkflowExecutable.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/util/BasicWorkflowStatusProvider.java b/src/main/java/com/espirit/moddev/basicworkflows/util/BasicWorkflowStatusProvider.java index 8211589..c6b6e13 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/util/BasicWorkflowStatusProvider.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/util/BasicWorkflowStatusProvider.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/util/Dialog.java b/src/main/java/com/espirit/moddev/basicworkflows/util/Dialog.java index b8ca55e..c83ca24 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/util/Dialog.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/util/Dialog.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/util/FormEvaluator.java b/src/main/java/com/espirit/moddev/basicworkflows/util/FormEvaluator.java index 3638e3c..f6af6a9 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/util/FormEvaluator.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/util/FormEvaluator.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/util/FormValidator.java b/src/main/java/com/espirit/moddev/basicworkflows/util/FormValidator.java index 8d1a5cd..bb8b460 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/util/FormValidator.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/util/FormValidator.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/util/FsException.java b/src/main/java/com/espirit/moddev/basicworkflows/util/FsException.java index e4989fd..95c1a55 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/util/FsException.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/util/FsException.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/util/FsLocale.java b/src/main/java/com/espirit/moddev/basicworkflows/util/FsLocale.java index 821c366..98e5424 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/util/FsLocale.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/util/FsLocale.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/util/IntegrationTest.java b/src/main/java/com/espirit/moddev/basicworkflows/util/IntegrationTest.java index 1955cc1..dcd3e80 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/util/IntegrationTest.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/util/IntegrationTest.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/util/ReferenceResult.java b/src/main/java/com/espirit/moddev/basicworkflows/util/ReferenceResult.java index 2f67f9b..d84c5ec 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/util/ReferenceResult.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/util/ReferenceResult.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/util/StoreComparator.java b/src/main/java/com/espirit/moddev/basicworkflows/util/StoreComparator.java index 4a226f6..a57a884 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/util/StoreComparator.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/util/StoreComparator.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. @@ -75,7 +75,7 @@ else if (isPageStoreObject(type2)) { } } } - + private boolean isMediaStoreObject(final Type type) { return type == Store.Type.MEDIASTORE; } diff --git a/src/main/java/com/espirit/moddev/basicworkflows/util/StoreUtil.java b/src/main/java/com/espirit/moddev/basicworkflows/util/StoreUtil.java index bfc6b40..a9662e9 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/util/StoreUtil.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/util/StoreUtil.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/util/WorkflowConstants.java b/src/main/java/com/espirit/moddev/basicworkflows/util/WorkflowConstants.java index 50b9cb7..aa99a21 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/util/WorkflowConstants.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/util/WorkflowConstants.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/util/WorkflowSessionHelper.java b/src/main/java/com/espirit/moddev/basicworkflows/util/WorkflowSessionHelper.java index 847bdbd..64f2587 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/util/WorkflowSessionHelper.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/util/WorkflowSessionHelper.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. diff --git a/src/main/java/com/espirit/moddev/basicworkflows/util/package-info.java b/src/main/java/com/espirit/moddev/basicworkflows/util/package-info.java index 4f08486..7048f99 100644 --- a/src/main/java/com/espirit/moddev/basicworkflows/util/package-info.java +++ b/src/main/java/com/espirit/moddev/basicworkflows/util/package-info.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. diff --git a/src/main/java/com/espirit/moddev/components/annotations/PublicComponent.java b/src/main/java/com/espirit/moddev/components/annotations/PublicComponent.java index 0b53a22..544feeb 100644 --- a/src/main/java/com/espirit/moddev/components/annotations/PublicComponent.java +++ b/src/main/java/com/espirit/moddev/components/annotations/PublicComponent.java @@ -1,3 +1,20 @@ +/* + * BasicWorkflows Module + * %% + * 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. + */ package com.espirit.moddev.components.annotations; import java.lang.annotation.Retention; diff --git a/src/main/resources/LICENSE.TXT b/src/main/resources/LICENSE.TXT index 2db714e..a23fa34 100644 --- a/src/main/resources/LICENSE.TXT +++ b/src/main/resources/LICENSE.TXT @@ -1,6 +1,6 @@ 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. diff --git a/src/main/resources/com/espirit/moddev/basicworkflows/Messages.properties b/src/main/resources/com/espirit/moddev/basicworkflows/Messages.properties index 06f58dc..51cc0ae 100644 --- a/src/main/resources/com/espirit/moddev/basicworkflows/Messages.properties +++ b/src/main/resources/com/espirit/moddev/basicworkflows/Messages.properties @@ -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. diff --git a/src/main/resources/com/espirit/moddev/basicworkflows/Messages_de.properties b/src/main/resources/com/espirit/moddev/basicworkflows/Messages_de.properties index 84145fd..96bb15d 100644 --- a/src/main/resources/com/espirit/moddev/basicworkflows/Messages_de.properties +++ b/src/main/resources/com/espirit/moddev/basicworkflows/Messages_de.properties @@ -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. diff --git a/src/main/resources/com/espirit/moddev/basicworkflows/Messages_en.properties b/src/main/resources/com/espirit/moddev/basicworkflows/Messages_en.properties index 06f58dc..51cc0ae 100644 --- a/src/main/resources/com/espirit/moddev/basicworkflows/Messages_en.properties +++ b/src/main/resources/com/espirit/moddev/basicworkflows/Messages_en.properties @@ -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. diff --git a/src/main/resources/module.xml b/src/main/resources/module.xml index 5bb347e..e2c3d4d 100644 --- a/src/main/resources/module.xml +++ b/src/main/resources/module.xml @@ -1,95 +1,41 @@ - - ${project.displayName} - ${project.displayName} - ${project.version} - ${project.displayName} - com.espirit.moddev - - - Delete WorkFlow Check Prerequisites Executable - com.espirit.moddev.basicworkflows.delete.WfCheckPrerequisitesExecutable - - - Delete WorkFlow Delete Executable - com.espirit.moddev.basicworkflows.delete.WfDeleteExecutable - - - Delete WorkFlow Test Delete Executable - com.espirit.moddev.basicworkflows.delete.WfDeleteTestExecutable - - - Delete WorkFlow Find Related Objects Executable - com.espirit.moddev.basicworkflows.delete.WfFindRelatedObjectsExecutable - - - Delete WorkFlow Show Related Objects Executable - com.espirit.moddev.basicworkflows.delete.WfShowRelatedObjectsExecutable - - - Delete WorkFlow Show Warning Executable - com.espirit.moddev.basicworkflows.delete.WfShowWarningExecutable - - - Delete WorkFlow Branch If Folder Executable - com.espirit.moddev.basicworkflows.delete.WfBranchIfFolderExecutable - + BasicWorkflows Module + %% + 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 - - WorkFlow Find Related Objects Executable - com.espirit.moddev.basicworkflows.release.WfFindRelatedObjectsExecutable - - - WorkFlow Release Executable - com.espirit.moddev.basicworkflows.release.WfReleaseExecutable - - - WorkFlow Release Test Executable - com.espirit.moddev.basicworkflows.release.WfReleaseTestExecutable - - - WorkFlow Show Not Released Objects Executable - com.espirit.moddev.basicworkflows.release.WfShowNotReleasedObjectsExecutable - - - WorkFlow Show Warning Executable - com.espirit.moddev.basicworkflows.release.WfShowWarningExecutable - + 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. - - ${project.displayName} Status Provider - com.espirit.moddev.basicworkflows.util.BasicWorkflowStatusProvider - +--> + + basicworkflows + BasicWorkflows (I,L) + $version + BasicWorkflows + e-Spirit AG + + $components - ${project.displayName}_ContentCreator_Library + BasicWorkflows_ContentCreator_Library web/web.xml - lib/${project.artifactId}-${project.version}-jar-with-dependencies.jar + $resources - lib/${project.artifactId}-${project.version}-jar-with-dependencies.jar + $resources \ No newline at end of file diff --git a/src/main/resources/web/web.xml b/src/main/resources/web/web.xml index c1eb951..ebe5c3c 100644 --- a/src/main/resources/web/web.xml +++ b/src/main/resources/web/web.xml @@ -3,7 +3,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. @@ -25,4 +25,3 @@ FirstSpirit WebEdit WebApp to provide all classes. - diff --git a/src/test/java/com/espirit/moddev/basicworkflows/delete/DeleteObjectTest.java b/src/test/java/com/espirit/moddev/basicworkflows/delete/DeleteObjectTest.java index 1d0ac21..f3c5072 100644 --- a/src/test/java/com/espirit/moddev/basicworkflows/delete/DeleteObjectTest.java +++ b/src/test/java/com/espirit/moddev/basicworkflows/delete/DeleteObjectTest.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; diff --git a/src/test/java/com/espirit/moddev/basicworkflows/delete/WfCheckPrerequisitesExecutableTest.java b/src/test/java/com/espirit/moddev/basicworkflows/delete/WfCheckPrerequisitesExecutableTest.java index 7a9774c..514994d 100644 --- a/src/test/java/com/espirit/moddev/basicworkflows/delete/WfCheckPrerequisitesExecutableTest.java +++ b/src/test/java/com/espirit/moddev/basicworkflows/delete/WfCheckPrerequisitesExecutableTest.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. diff --git a/src/test/java/com/espirit/moddev/basicworkflows/delete/WorkflowObjectTest.java b/src/test/java/com/espirit/moddev/basicworkflows/delete/WorkflowObjectTest.java index 78dbecf..077baad 100644 --- a/src/test/java/com/espirit/moddev/basicworkflows/delete/WorkflowObjectTest.java +++ b/src/test/java/com/espirit/moddev/basicworkflows/delete/WorkflowObjectTest.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. diff --git a/src/test/java/com/espirit/moddev/basicworkflows/release/WfShowNotReleasedObjectsExecutableTest.java b/src/test/java/com/espirit/moddev/basicworkflows/release/WfShowNotReleasedObjectsExecutableTest.java index b7ae901..cbd5fca 100644 --- a/src/test/java/com/espirit/moddev/basicworkflows/release/WfShowNotReleasedObjectsExecutableTest.java +++ b/src/test/java/com/espirit/moddev/basicworkflows/release/WfShowNotReleasedObjectsExecutableTest.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. diff --git a/src/test/java/com/espirit/moddev/basicworkflows/util/BaseContextRule.java b/src/test/java/com/espirit/moddev/basicworkflows/util/BaseContextRule.java index f9f01b5..deec9bc 100644 --- a/src/test/java/com/espirit/moddev/basicworkflows/util/BaseContextRule.java +++ b/src/test/java/com/espirit/moddev/basicworkflows/util/BaseContextRule.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. diff --git a/src/test/java/com/espirit/moddev/basicworkflows/util/BasicWorkflowStatusProviderTest.java b/src/test/java/com/espirit/moddev/basicworkflows/util/BasicWorkflowStatusProviderTest.java index fcaaeab..1af2399 100644 --- a/src/test/java/com/espirit/moddev/basicworkflows/util/BasicWorkflowStatusProviderTest.java +++ b/src/test/java/com/espirit/moddev/basicworkflows/util/BasicWorkflowStatusProviderTest.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. diff --git a/src/test/java/com/espirit/moddev/basicworkflows/util/DialogTest.java b/src/test/java/com/espirit/moddev/basicworkflows/util/DialogTest.java index d9452a0..ebb6362 100644 --- a/src/test/java/com/espirit/moddev/basicworkflows/util/DialogTest.java +++ b/src/test/java/com/espirit/moddev/basicworkflows/util/DialogTest.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. diff --git a/src/test/java/com/espirit/moddev/basicworkflows/util/ReferenceResultTest.java b/src/test/java/com/espirit/moddev/basicworkflows/util/ReferenceResultTest.java index db7a017..84daddf 100644 --- a/src/test/java/com/espirit/moddev/basicworkflows/util/ReferenceResultTest.java +++ b/src/test/java/com/espirit/moddev/basicworkflows/util/ReferenceResultTest.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. diff --git a/src/test/java/com/espirit/moddev/basicworkflows/util/ReleaseStateChangedTestData.java b/src/test/java/com/espirit/moddev/basicworkflows/util/ReleaseStateChangedTestData.java index b6e174e..ba979db 100644 --- a/src/test/java/com/espirit/moddev/basicworkflows/util/ReleaseStateChangedTestData.java +++ b/src/test/java/com/espirit/moddev/basicworkflows/util/ReleaseStateChangedTestData.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. diff --git a/src/test/java/com/espirit/moddev/basicworkflows/util/StoreComparatorTest.java b/src/test/java/com/espirit/moddev/basicworkflows/util/StoreComparatorTest.java index 3640b1b..58ba493 100644 --- a/src/test/java/com/espirit/moddev/basicworkflows/util/StoreComparatorTest.java +++ b/src/test/java/com/espirit/moddev/basicworkflows/util/StoreComparatorTest.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. diff --git a/src/test/java/com/espirit/moddev/basicworkflows/util/WorkflowSessionHelperTest.java b/src/test/java/com/espirit/moddev/basicworkflows/util/WorkflowSessionHelperTest.java index 03e95ac..3907286 100644 --- a/src/test/java/com/espirit/moddev/basicworkflows/util/WorkflowSessionHelperTest.java +++ b/src/test/java/com/espirit/moddev/basicworkflows/util/WorkflowSessionHelperTest.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. From b25f17743ad11c2e5ca993b8cde22f3e0b411854 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 04:26:19 +0000 Subject: [PATCH 2/2] Bump license-maven-plugin from 1.2 to 2.2.0 Bumps [license-maven-plugin](https://github.com/mojohaus/license-maven-plugin) from 1.2 to 2.2.0. - [Release notes](https://github.com/mojohaus/license-maven-plugin/releases) - [Commits](https://github.com/mojohaus/license-maven-plugin/compare/license-maven-plugin-1.2...2.2.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:license-maven-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4553565..cf81d24 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 @@ -238,7 +238,7 @@ org.codehaus.mojo license-maven-plugin - 2.0.1 + 2.2.0 apache_v2 ${project.baseUri}/src/license @@ -283,7 +283,7 @@ org.codehaus.mojo license-maven-plugin - 1.2 + 2.2.0 true true