Merge branch 'main' into flowable-release-7.0.0

flowable · Nov 7, 2023 · 3428ac3 · 3428ac3
2 parents e2adddd + 7b7f353
commit 3428ac3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -8,9 +8,9 @@ Flowable (V7)
     ![Docker Hub](https://shields.io/docker/pulls/flowable/flowable-rest)](https://hub.docker.com/u/flowable/flowable-rest)
 
 [License:  
-	![license](https://img.shields.io/hexpm/l/plug.svg)](https://github.com/flowable/flowable-engine/blob/master/LICENSE)
+	![license](https://img.shields.io/hexpm/l/plug.svg)](https://github.com/flowable/flowable-engine/blob/main/LICENSE)
 
-![Flowable Actions CI](https://github.com/flowable/flowable-engine/workflows/Flowable%20Main%20Build/badge.svg?branch=master)
+![Flowable Actions CI](https://github.com/flowable/flowable-engine/actions/workflows/main.yml/badge.svg?branch=main)
 
 Homepage: https://www.flowable.org/
 

diff --git a/...s/flowable-cmmn-converter/src/main/java/org/flowable/cmmn/converter/CmmnXmlConverter.java b/...s/flowable-cmmn-converter/src/main/java/org/flowable/cmmn/converter/CmmnXmlConverter.java
@@ -47,6 +47,7 @@
 import org.flowable.cmmn.converter.export.CaseExport;
 import org.flowable.cmmn.converter.export.CmmnDIExport;
 import org.flowable.cmmn.converter.export.DefinitionsRootExport;
+import org.flowable.cmmn.converter.export.PlanItemDefinitionExport;
 import org.flowable.cmmn.converter.export.StageExport;
 import org.flowable.cmmn.converter.export.TextAnnotationExport;
 import org.flowable.cmmn.converter.util.PlanItemDependencyUtil;
@@ -294,7 +295,7 @@ public byte[] convertToXML(CmmnModel model, String encoding) {
 
                 Stage planModel = caseModel.getPlanModel();
 
-                StageExport.getInstance().writePlanItemDefinition(model, planModel, xtw);
+                PlanItemDefinitionExport.writePlanItemDefinition(model, planModel, xtw);
 
                 // end case element
                 xtw.writeEndElement();

diff --git a/...flowable-cmmn-converter/src/main/java/org/flowable/cmmn/converter/export/StageExport.java b/...flowable-cmmn-converter/src/main/java/org/flowable/cmmn/converter/export/StageExport.java
@@ -29,7 +29,7 @@ public static StageExport getInstance() {
         return instance;
     }
 
-    private StageExport() {
+    protected StageExport() {
     }
 
     @Override