From 6d4b32cbcfe776b46225ede9d8f5ed7c5664e878 Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Wed, 21 Aug 2024 18:24:36 +0200 Subject: [PATCH 1/6] chore: bump dependencies --- java/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 6fc69a4..078467a 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -26,12 +26,12 @@ jakarta.xml.bind jakarta.xml.bind-api - 2.3.3 + 4.0.2 com.sun.xml.bind jaxb-impl - 2.3.3 + 3.0.1 @@ -43,7 +43,7 @@ info.picocli picocli - 4.5.1 + 4.7.5 From ece2ff99dcd9b36d0781f07a1e648c0fa41b928d Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Wed, 21 Aug 2024 18:28:28 +0200 Subject: [PATCH 2/6] log4j --- java/pom.xml | 3 +-- .../analytics/tools/bpmn/generator/internal/XmlParser.java | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 078467a..b269a91 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -13,7 +13,6 @@ 17 5.10.2 - 2.17.1 @@ -38,7 +37,7 @@ org.apache.logging.log4j log4j-core - ${log4j.version} + 2.23.1 info.picocli diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/XmlParser.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/XmlParser.java index 4e5536f..148822b 100644 --- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/XmlParser.java +++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/XmlParser.java @@ -15,7 +15,6 @@ */ package io.process.analytics.tools.bpmn.generator.internal; -import java.io.File; import java.io.StringReader; import java.io.StringWriter; From dbb2b690918af9acf0dadadaa9d244ab279875ab Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Wed, 21 Aug 2024 18:43:11 +0200 Subject: [PATCH 3/6] bump deps --- java/pom.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index b269a91..dbb800a 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -30,7 +30,8 @@ com.sun.xml.bind jaxb-impl - 3.0.1 + 4.0.5 + runtime @@ -129,7 +130,7 @@ org.codehaus.mojo jaxb2-maven-plugin - 2.5.0 + 3.2.0 xjc @@ -147,7 +148,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.4.0 + 3.6.0 add-source From c68be7389a23859f43d4105f05798948eb5a195d Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Wed, 21 Aug 2024 18:43:34 +0200 Subject: [PATCH 4/6] WIP fix compilation errors --- .../tools/bpmn/generator/internal/BPMNDiagramRichBuilder.java | 2 +- .../bpmn/generator/internal/BpmnNamespacePrefixMapper.java | 2 -- .../analytics/tools/bpmn/generator/internal/Semantic.java | 2 +- .../analytics/tools/bpmn/generator/internal/XmlParser.java | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/BPMNDiagramRichBuilder.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/BPMNDiagramRichBuilder.java index d1de69e..5b8ce0c 100644 --- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/BPMNDiagramRichBuilder.java +++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/BPMNDiagramRichBuilder.java @@ -20,7 +20,6 @@ import java.util.Optional; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; import io.process.analytics.tools.bpmn.generator.model.display.DisplayDimension; @@ -29,6 +28,7 @@ import io.process.analytics.tools.bpmn.generator.model.display.DisplayPoint; import io.process.analytics.tools.bpmn.generator.internal.generated.model.*; import io.process.analytics.tools.bpmn.generator.model.ShapeType; +import jakarta.xml.bind.JAXBElement; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/BpmnNamespacePrefixMapper.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/BpmnNamespacePrefixMapper.java index 7927061..525bbdd 100644 --- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/BpmnNamespacePrefixMapper.java +++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/BpmnNamespacePrefixMapper.java @@ -15,8 +15,6 @@ */ package io.process.analytics.tools.bpmn.generator.internal; -import com.sun.xml.bind.marshaller.NamespacePrefixMapper; - import java.util.HashMap; import java.util.Map; import java.util.Set; diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/Semantic.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/Semantic.java index ae90aa0..2fa8a01 100644 --- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/Semantic.java +++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/Semantic.java @@ -19,10 +19,10 @@ import java.util.stream.Collectors; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; import io.process.analytics.tools.bpmn.generator.internal.generated.model.*; +import jakarta.xml.bind.JAXBElement; import lombok.Getter; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/XmlParser.java b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/XmlParser.java index 148822b..b1ee95d 100644 --- a/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/XmlParser.java +++ b/java/src/main/java/io/process/analytics/tools/bpmn/generator/internal/XmlParser.java @@ -18,11 +18,11 @@ import java.io.StringReader; import java.io.StringWriter; -import javax.xml.bind.*; import javax.xml.transform.stream.StreamSource; import io.process.analytics.tools.bpmn.generator.internal.generated.model.ObjectFactory; import io.process.analytics.tools.bpmn.generator.internal.generated.model.TDefinitions; +import jakarta.xml.bind.*; public class XmlParser { From 79767be20f90bd9e0e13e10338147d21f6445929 Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Wed, 21 Aug 2024 18:53:42 +0200 Subject: [PATCH 5/6] WIP fix compilation errors in test --- .../tools/bpmn/generator/internal/XmlParserTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/java/src/test/java/io/process/analytics/tools/bpmn/generator/internal/XmlParserTest.java b/java/src/test/java/io/process/analytics/tools/bpmn/generator/internal/XmlParserTest.java index 6634d08..5ac7447 100644 --- a/java/src/test/java/io/process/analytics/tools/bpmn/generator/internal/XmlParserTest.java +++ b/java/src/test/java/io/process/analytics/tools/bpmn/generator/internal/XmlParserTest.java @@ -22,8 +22,7 @@ import java.io.IOException; import java.util.List; -import javax.xml.bind.JAXBElement; - +import jakarta.xml.bind.JAXBElement; import org.junit.jupiter.api.Test; import io.process.analytics.tools.bpmn.generator.internal.generated.model.*; @@ -56,4 +55,4 @@ public void unmarshall() throws IOException { assertThat(plane.getId()).isEqualTo("BPMNPlane_1"); } -} \ No newline at end of file +} From e326a1f128be33face0226f86ba91c62f2157811 Mon Sep 17 00:00:00 2001 From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com> Date: Sun, 13 Oct 2024 16:10:38 +0200 Subject: [PATCH 6/6] wf: add "ntp" option to maven command to remove useless download logs --- .github/workflows/build-java.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml index a930d97..dc7ec9c 100644 --- a/.github/workflows/build-java.yml +++ b/.github/workflows/build-java.yml @@ -37,5 +37,5 @@ jobs: distribution: 'zulu' cache: maven - name: Build - run: ./mvnw -V verify + run: ./mvnw -V -ntp verify working-directory: java