From 9463d08d130a7f1b89d6162dc4fb3cdebd0adbf9 Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Mon, 10 Nov 2025 22:58:12 +0100 Subject: [PATCH] update office version --- Dockerfile | 2 +- Dockerfile-debug | 2 +- dynamixs-ai-app/pom.xml | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 2 + .../resources/META-INF/system-de-1.3.0.bpmn | 1747 ----------------- .../src/main/resources/build.properties | 7 + .../resources/{META-INF => }/imixs.properties | 0 pom.xml | 14 +- 8 files changed, 19 insertions(+), 1757 deletions(-) create mode 100644 dynamixs-ai-app/src/main/resources/META-INF/MANIFEST.MF delete mode 100644 dynamixs-ai-app/src/main/resources/META-INF/system-de-1.3.0.bpmn create mode 100644 dynamixs-ai-app/src/main/resources/build.properties rename dynamixs-ai-app/src/main/resources/{META-INF => }/imixs.properties (100%) diff --git a/Dockerfile b/Dockerfile index 5c00671..1282aac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM imixs/imixs-office-workflow:5.1.3-SNAPSHOT-wildfly-29.0.1.Final-jdk17 +FROM imixs/imixs-office-workflow:5.1.5-wildfly-29.0.1.Final-jdk17 # Debug # Setup configuration diff --git a/Dockerfile-debug b/Dockerfile-debug index f801c72..b81c28c 100644 --- a/Dockerfile-debug +++ b/Dockerfile-debug @@ -1,4 +1,4 @@ -FROM imixs/imixs-office-workflow:5.1.3-SNAPSHOT-wildfly-29.0.1.Final-jdk17 +FROM imixs/imixs-office-workflow:5.1.5-wildfly-29.0.1.Final-jdk17 # Deploy artefact RUN rm -r /opt/jboss/wildfly/standalone/deployments/* diff --git a/dynamixs-ai-app/pom.xml b/dynamixs-ai-app/pom.xml index 7708dcc..1835046 100644 --- a/dynamixs-ai-app/pom.xml +++ b/dynamixs-ai-app/pom.xml @@ -126,7 +126,7 @@ org.apache.maven.plugins maven-war-plugin - 3.2.0 + 3.3.1 false diff --git a/dynamixs-ai-app/src/main/resources/META-INF/MANIFEST.MF b/dynamixs-ai-app/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..58630c0 --- /dev/null +++ b/dynamixs-ai-app/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff --git a/dynamixs-ai-app/src/main/resources/META-INF/system-de-1.3.0.bpmn b/dynamixs-ai-app/src/main/resources/META-INF/system-de-1.3.0.bpmn deleted file mode 100644 index 46aca7a..0000000 --- a/dynamixs-ai-app/src/main/resources/META-INF/system-de-1.3.0.bpmn +++ /dev/null @@ -1,1747 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - SequenceFlow_16 - - - - - - true - - - - - - SequenceFlow_23 - SequenceFlow_24 - SequenceFlow_25 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /pages/admin/profilelist]]> - - - - - - - - - false - - - SequenceFlow_11 - SequenceFlow_33 - SequenceFlow_1 - - - - - - true - - - - - - - - - SequenceFlow_20 - SequenceFlow_1 - SequenceFlow_36 - SequenceFlow_8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /pages/admin/profilelist]]> - - - - - - namcurrentEditor]]> - - - false - - - SequenceFlow_31 - SequenceFlow_35 - SequenceFlow_23 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /pages/admin/profilelist]]> - - - - - - namcurrentEditor]]> - - - false - - - SequenceFlow_25 - SequenceFlow_36 - - - - - - - - - SequenceFlow_16 - SequenceFlow_17 - - - - SequenceFlow_24 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /pages/admin/profilelist]]> - - - - - - - - - false - - - Erster Zugriff eines neuen Users, eMail mit Info geht raus, User erhält Autorenrecht. - SequenceFlow_17 - SequenceFlow_20 - - - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_8 - SequenceFlow_11 - SequenceFlow_34 - SequenceFlow_35 - - - - - - - - - - - - - - - - SequenceFlow_27 - SequenceFlow_30 - SequenceFlow_33 - - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_34 - SequenceFlow_27 - - - - - - - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_30 - SequenceFlow_31 - - - - - - - - - - - - - - - - - - - - - - - ID:90 - Remove assigend Access Roles - - - - - - - Inaktiv - - - - - - - - - - - - - - - - - true - - - - - - SequenceFlow_2 - SequenceFlow_47 - - sequenceFlow_JMgDMg - sequenceFlow_8XBE8w - sequenceFlow_bi6JLA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /pages/admin/organisation]]> - - - Daten speichern und aktualisieren - sequenceFlow_8XBE8w - - - SequenceFlow_2 - - - - - - - SequenceFlow_13 - - - - - - - - - true - - - - - - - - - SequenceFlow_13 - SequenceFlow_18 - - sequenceFlow_1foKEw - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_18 - SequenceFlow_40 - sequenceFlow_bi6JLA - - - - - - - - - - - true - - - - - - - SequenceFlow_49 - SequenceFlow_46 - - sequenceFlow_vS37bQ - SequenceFlow_45 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /pages/admin/organisation]]> - - - - SequenceFlow_44 - SequenceFlow_45 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /pages/admin/organisation]]> - - - - SequenceFlow_46 - SequenceFlow_47 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /pages/admin/organisation]]> - - - Daten speichern und aktualisieren - SequenceFlow_49 - - - - - - - - true - - - - - - - - - SequenceFlow_32 - SequenceFlow_40 - - sequenceFlow_o5DkGg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /pages/admin/organisation]]> - - - - SequenceFlow_29 - SequenceFlow_37 - SequenceFlow_32 - - - - - - - - - - - - - - - - sequenceFlow_JMgDMg - SequenceFlow_29 - SequenceFlow_44 - sequenceFlow_jEhFfw - - - - - - - - sequenceFlow_xyzUBQ - - - - - - - - sequenceFlow_jEhFfw - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /pages/admin/organisation]]> - - - - SequenceFlow_39 - sequenceFlow_xyzUBQ - sequenceFlow_1foKEw - - - - - - - - sequenceFlow_o5DkGg - - - - - - - - sequenceFlow_MiQVNg - - - - - - - sequenceFlow_vS37bQ - SequenceFlow_37 - sequenceFlow_MiQVNg - - - - - - - - - - - - - - - - - - - true - - - - - - - - - SequenceFlow_5 - SequenceFlow_22 - SequenceFlow_9 - - sequenceFlow_EAoxKQ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - /pages/admin/organisation]]> - - - Daten speichern und aktualisieren - SequenceFlow_5 - - - SequenceFlow_6 - - - - - - - - - - SequenceFlow_14 - - - - - - - - - true - - - - - - - - - SequenceFlow_15 - SequenceFlow_14 - SequenceFlow_21 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /pages/admin/organisation]]> - - - - SequenceFlow_10 - SequenceFlow_26 - SequenceFlow_15 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_21 - SequenceFlow_28 - SequenceFlow_22 - - - - - - - - - - - true - - - - - - - - - SequenceFlow_12 - SequenceFlow_26 - SequenceFlow_28 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /pages/admin/organisation]]> - - - - SequenceFlow_9 - SequenceFlow_12 - - - - - - - - - - - - - - - - SequenceFlow_10 - SequenceFlow_6 - sequenceFlow_EAoxKQ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dynamixs-ai-app/src/main/resources/build.properties b/dynamixs-ai-app/src/main/resources/build.properties new file mode 100644 index 0000000..a9842bc --- /dev/null +++ b/dynamixs-ai-app/src/main/resources/build.properties @@ -0,0 +1,7 @@ +# Build Information +build.version=${project.version} +build.timestamp=${org.imixs.build.timestamp} +build.office.version=${org.imixs.office.version} +build.marty.version=${org.imixs.marty.version} +build.workflow.version=${org.imixs.workflow.version} +build.name=${imixs-office.applicationname} \ No newline at end of file diff --git a/dynamixs-ai-app/src/main/resources/META-INF/imixs.properties b/dynamixs-ai-app/src/main/resources/imixs.properties similarity index 100% rename from dynamixs-ai-app/src/main/resources/META-INF/imixs.properties rename to dynamixs-ai-app/src/main/resources/imixs.properties diff --git a/pom.xml b/pom.xml index e9d2015..74f6d0c 100644 --- a/pom.xml +++ b/pom.xml @@ -52,21 +52,25 @@ 17 17 UTF-8 + UTF-8 + + src/main/webapp war ${maven.build.timestamp} yyyyMMddHHmmss + Production 10.0.0 6.0 - 6.2.4-SNAPSHOT + 6.2.5-SNAPSHOT + 5.1.6-SNAPSHOT + 1.0.2-SNAPSHOT 3.1.3 - 1.0.1-SNAPSHOT - 5.1.5-SNAPSHOT 5.1.0 3.2.1-SNAPSHOT 1.1.3-SNAPSHOT @@ -78,16 +82,12 @@ 5.9.2 5.8.0 - src/main/webapp dynamixs-ai / imixsrealm jdbc/office lucene/office-workflow-index - java:/mail/org.imixs.workflow.mail