From 8a6fc36a1b7af8b373ae1af6aeffadf6179c23c8 Mon Sep 17 00:00:00 2001
From: radtriste <tradisso@redhat.com>
Date: Fri, 5 May 2023 15:09:58 +0200
Subject: [PATCH 1/4] #225 Update to Jakarta

Signed-off-by: radtriste <tradisso@redhat.com>
---
 api/pom.xml | 5 +++--
 pom.xml     | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 0f9dabd9..8f085859 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -40,8 +40,8 @@
             <version>[2.13.0,)</version>
         </dependency>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
@@ -106,6 +106,7 @@
                     <serializable>true</serializable>
                     <targetVersion>${java.version}</targetVersion>
                     <usePrimitives>true</usePrimitives>
+                    <useJakartaValidation>true</useJakartaValidation>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/pom.xml b/pom.xml
index be3b0767..dbf96d00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,14 +48,14 @@
 
         <version.org.slf4j>1.7.25</version.org.slf4j>
         <version.com.fasterxml.jackson>2.10.3</version.com.fasterxml.jackson>
-        <version.javax.validation>2.0.1.Final</version.javax.validation>
+        <version.javax.validation>3.0.2</version.javax.validation>
         <version.org.junit.minor>6.0</version.org.junit.minor>
         <version.org.junit>5.${version.org.junit.minor}</version.org.junit>
         <version.org.junit.jupiter>${version.org.junit}</version.org.junit.jupiter>
         <version.org.mockito>3.0.0</version.org.mockito>
         <version.ch.qos.logback>1.1.3</version.ch.qos.logback>
         <version.org.assertj>3.13.2</version.org.assertj>
-        <version.jsonschema2pojo-maven-plugin>1.0.1</version.jsonschema2pojo-maven-plugin>
+        <version.jsonschema2pojo-maven-plugin>1.1.2</version.jsonschema2pojo-maven-plugin>
         <commons.lang.version>3.9</commons.lang.version>
         <hamcrest.version>1.3</hamcrest.version>
         <jsonassert.version>1.5.0</jsonassert.version>
@@ -118,8 +118,8 @@
                 <version>${version.com.fasterxml.jackson}</version>
             </dependency>
             <dependency>
-                <groupId>javax.validation</groupId>
-                <artifactId>validation-api</artifactId>
+                <groupId>jakarta.validation</groupId>
+                <artifactId>jakarta.validation-api</artifactId>
                 <version>${version.javax.validation}</version>
             </dependency>
             <dependency>

From db0c836f841ed6ded5fff5d18fbf47498ac5f44a Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Mon, 27 May 2024 14:41:05 -0300
Subject: [PATCH 2/4] Resolve conflicts

---
 pom.xml | 79 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 44 insertions(+), 35 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7757885a..0f039c0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,41 +33,50 @@
     </modules>
 
     <properties>
-        <java.version>11</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.maven>3.6.2</version.maven>
-        <version.enforcer.plugin>3.0.0-M2</version.enforcer.plugin>
-        <version.jdk>${java.version}</version.jdk>
-        <version.compiler.plugin>3.8.1</version.compiler.plugin>
-        <version.surefire.plugin>2.22.0</version.surefire.plugin>
-        <version.failsafe.plugin>3.1.2</version.failsafe.plugin>
-        <version.checkstyle.plugin>3.1.1</version.checkstyle.plugin>
-        <version.deploy.plugin>2.8.2</version.deploy.plugin>
-        <version.com.networknt>1.0.87</version.com.networknt>
-        <version.org.slf4j>1.7.25</version.org.slf4j>
-        <version.com.fasterxml.jackson>2.15.3</version.com.fasterxml.jackson>
-        <version.jakarta.validation>3.0.2</version.jakarta.validation>
-        <version.org.junit.minor>6.0</version.org.junit.minor>
-        <version.org.junit>5.${version.org.junit.minor}</version.org.junit>
-        <version.org.junit.jupiter>${version.org.junit}</version.org.junit.jupiter>
-        <version.org.mockito>5.6.0</version.org.mockito>
-        <version.ch.qos.logback>1.4.9</version.ch.qos.logback>
-        <version.org.assertj>3.13.2</version.org.assertj>
-        <version.jsonschema2pojo-maven-plugin>1.1.2</version.jsonschema2pojo-maven-plugin>
-        <commons.lang.version>3.13.0</commons.lang.version>
-        <hamcrest.version>1.3</hamcrest.version>
-        <jsonassert.version>1.5.0</jsonassert.version>
-        <json.schema.validation.version>1.14.1</json.schema.validation.version>
-        <version.thymeleaf>3.1.2.RELEASE</version.thymeleaf>
-        <version.plantuml>8059</version.plantuml>
-        <version.graphviz>0.17.0</version.graphviz>
-        <version.fmt-maven-plugin>2.13</version.fmt-maven-plugin>
-        <version.jar.plugin>3.2.0</version.jar.plugin>
-        <!-- Checkstyle props -->
-        <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
-        <checkstyle.header.template><![CDATA[
+      <java.version>11</java.version>
+      <maven.compiler.source>${java.version}</maven.compiler.source>
+      <maven.compiler.target>${java.version}</maven.compiler.target>
+      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <version.maven>3.6.2</version.maven>
+      
+      <!-- Plugin versions, please keep in alphabetical order -->
+      <version.buildnumber.plugin>3.2.0</version.buildnumber.plugin>
+      <version.checkstyle.plugin>3.3.1</version.checkstyle.plugin>
+      <version.compiler.plugin>3.13.0</version.compiler.plugin>
+      <version.deploy.plugin>3.1.2</version.deploy.plugin>
+      <version.enforcer.plugin>3.0.0-M2</version.enforcer.plugin>
+      <version.failsafe.plugin>3.2.5</version.failsafe.plugin>
+      <version.fmt-maven-plugin>2.23</version.fmt-maven-plugin>
+      <version.gpg.plugin>3.2.4</version.gpg.plugin>
+      <version.jar.plugin>3.4.1</version.jar.plugin>
+      <version.jdk>${java.version}</version.jdk>
+      <version.jsonschema2pojo-maven-plugin>1.1.2</version.jsonschema2pojo-maven-plugin>
+      <version.javadoc.plugin>3.6.3</version.javadoc.plugin>
+      <version.release.plugin>3.0.1</version.release.plugin>
+      <version.source.plugin>3.3.1</version.source.plugin>
+      <version.surefire.plugin>3.2.5</version.surefire.plugin>
+  
+  
+      <!-- Dependencies versions, please keep in alphabetical order -->
+      <version.ch.qos.logback>1.5.6</version.ch.qos.logback>
+      <version.com.fasterxml.jackson>2.17.1</version.com.fasterxml.jackson>
+      <version.com.networknt>1.4.0</version.com.networknt>
+      <version.commons.lang>3.14.0</version.commons.lang>
+      <version.graphviz>0.17.0</version.graphviz>
+      <version.hamcrest>1.3</version.hamcrest>
+      <version.jakarta.validation>3.1.0</version.jakarta.validation>
+      <version.jsonassert>1.5.0</version.jsonassert>
+      <version.org.assertj>3.26.0</version.org.assertj>
+      <version.org.junit.jupiter>5.10.2</version.org.junit.jupiter>
+      <version.org.mockito>5.12.0</version.org.mockito>
+      <version.org.slf4j>2.0.13</version.org.slf4j>
+      <version.plantuml>8059</version.plantuml>
+      <version.thymeleaf>3.1.2.RELEASE</version.thymeleaf>
+             
+
+      <!-- Checkstyle props -->
+      <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
+      <checkstyle.header.template><![CDATA[
 ^\/\*$\n^
 \* Copyright \d\d\d\d-Present The Serverless Workflow Specification Authors$\n^
 \*$\n^

From a7b95fbd955d0da0179e0fe404876b3612c28db1 Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Mon, 27 May 2024 14:48:16 -0300
Subject: [PATCH 3/4] Removing rebase leftovers

---
 pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6b9396a7..2495dbb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,6 @@
     <module>utils</module>
   </modules>
 
-<<<<<<< issue_225
     <properties>
       <java.version>11</java.version>
       <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -92,7 +91,6 @@
       <!-- Checkstyle props -->
       <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
       <checkstyle.header.template><![CDATA[
-=======
   <properties>
     <java.version>11</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -138,7 +136,6 @@
     <!-- Checkstyle props -->
     <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
     <checkstyle.header.template><![CDATA[
->>>>>>> main
 ^\/\*$\n^
 \* Copyright \d\d\d\d-Present The Serverless Workflow Specification Authors$\n^
 \*$\n^
@@ -276,7 +273,6 @@
     </dependencies>
   </dependencyManagement>
 
-<<<<<<< issue_225
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -340,7 +336,6 @@
                 <artifactId>graphviz-java</artifactId>
                 <version>${version.graphviz}</version>
             </dependency>
-=======
   <build>
     <plugins>
       <!-- Set properties containing the scm revision -->
@@ -381,7 +376,6 @@
         </configuration>
       </plugin>
     </plugins>
->>>>>>> main
 
     <pluginManagement>
       <plugins>

From 0eccf63cfb03ba85674c2df2ed7273e5941c2d6a Mon Sep 17 00:00:00 2001
From: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
Date: Mon, 27 May 2024 14:49:29 -0300
Subject: [PATCH 4/4] Fixing rebase

---
 pom.xml | 120 +++-----------------------------------------------------
 1 file changed, 6 insertions(+), 114 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2495dbb5..dd96751d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,51 +46,6 @@
     <module>utils</module>
   </modules>
 
-    <properties>
-      <java.version>11</java.version>
-      <maven.compiler.source>${java.version}</maven.compiler.source>
-      <maven.compiler.target>${java.version}</maven.compiler.target>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <version.maven>3.6.2</version.maven>
-      
-      <!-- Plugin versions, please keep in alphabetical order -->
-      <version.buildnumber.plugin>3.2.0</version.buildnumber.plugin>
-      <version.checkstyle.plugin>3.3.1</version.checkstyle.plugin>
-      <version.compiler.plugin>3.13.0</version.compiler.plugin>
-      <version.deploy.plugin>3.1.2</version.deploy.plugin>
-      <version.enforcer.plugin>3.0.0-M2</version.enforcer.plugin>
-      <version.failsafe.plugin>3.2.5</version.failsafe.plugin>
-      <version.fmt-maven-plugin>2.23</version.fmt-maven-plugin>
-      <version.gpg.plugin>3.2.4</version.gpg.plugin>
-      <version.jar.plugin>3.4.1</version.jar.plugin>
-      <version.jdk>${java.version}</version.jdk>
-      <version.jsonschema2pojo-maven-plugin>1.1.2</version.jsonschema2pojo-maven-plugin>
-      <version.javadoc.plugin>3.6.3</version.javadoc.plugin>
-      <version.release.plugin>3.0.1</version.release.plugin>
-      <version.source.plugin>3.3.1</version.source.plugin>
-      <version.surefire.plugin>3.2.5</version.surefire.plugin>
-  
-  
-      <!-- Dependencies versions, please keep in alphabetical order -->
-      <version.ch.qos.logback>1.5.6</version.ch.qos.logback>
-      <version.com.fasterxml.jackson>2.17.1</version.com.fasterxml.jackson>
-      <version.com.networknt>1.4.0</version.com.networknt>
-      <version.commons.lang>3.14.0</version.commons.lang>
-      <version.graphviz>0.17.0</version.graphviz>
-      <version.hamcrest>1.3</version.hamcrest>
-      <version.jakarta.validation>3.1.0</version.jakarta.validation>
-      <version.jsonassert>1.5.0</version.jsonassert>
-      <version.org.assertj>3.26.0</version.org.assertj>
-      <version.org.junit.jupiter>5.10.2</version.org.junit.jupiter>
-      <version.org.mockito>5.12.0</version.org.mockito>
-      <version.org.slf4j>2.0.13</version.org.slf4j>
-      <version.plantuml>8059</version.plantuml>
-      <version.thymeleaf>3.1.2.RELEASE</version.thymeleaf>
-             
-
-      <!-- Checkstyle props -->
-      <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
-      <checkstyle.header.template><![CDATA[
   <properties>
     <java.version>11</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -109,7 +64,7 @@
     <version.gpg.plugin>3.2.4</version.gpg.plugin>
     <version.jar.plugin>3.4.1</version.jar.plugin>
     <version.jdk>${java.version}</version.jdk>
-    <version.jsonschema2pojo-maven-plugin>1.0.1</version.jsonschema2pojo-maven-plugin>
+    <version.jsonschema2pojo-maven-plugin>1.1.2</version.jsonschema2pojo-maven-plugin>
     <version.javadoc.plugin>3.6.3</version.javadoc.plugin>
     <version.release.plugin>3.0.1</version.release.plugin>
     <version.source.plugin>3.3.1</version.source.plugin>
@@ -123,7 +78,7 @@
     <version.commons.lang>3.14.0</version.commons.lang>
     <version.graphviz>0.17.0</version.graphviz>
     <version.hamcrest>1.3</version.hamcrest>
-    <version.javax.validation>2.0.1.Final</version.javax.validation>
+    <version.jakarta.validation>3.1.0</version.jakarta.validation>
     <version.jsonassert>1.5.0</version.jsonassert>
     <version.org.assertj>3.26.0</version.org.assertj>
     <version.org.junit.jupiter>5.10.2</version.org.junit.jupiter>
@@ -196,9 +151,9 @@
         <version>${version.com.fasterxml.jackson}</version>
       </dependency>
       <dependency>
-        <groupId>javax.validation</groupId>
-        <artifactId>validation-api</artifactId>
-        <version>${version.javax.validation}</version>
+        <groupId>jakarta.validation</groupId>
+        <artifactId>jakarta.validation-api</artifactId>
+        <version>${version.jakarta.validation}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
@@ -273,69 +228,6 @@
     </dependencies>
   </dependencyManagement>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${version.org.slf4j}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>jcl-over-slf4j</artifactId>
-                <version>${version.org.slf4j}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
-                <version>${version.com.fasterxml.jackson}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>${version.com.fasterxml.jackson}</version>
-            </dependency>
-             <dependency>
-               <groupId>com.networknt</groupId>
-               <artifactId>json-schema-validator</artifactId>
-               <version>${version.com.networknt}</version>
-               <exclusions>
-                 <exclusion>
-                   <groupId>org.apache.commons</groupId>
-                   <artifactId>commons-lang3</artifactId>
-                 </exclusion>
-              </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.dataformat</groupId>
-                <artifactId>jackson-dataformat-yaml</artifactId>
-                <version>${version.com.fasterxml.jackson}</version>
-            </dependency>
-            <dependency>
-                <groupId>jakarta.validation</groupId>
-                <artifactId>jakarta.validation-api</artifactId>
-                <version>${version.jakarta.validation}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${commons.lang.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.thymeleaf</groupId>
-                <artifactId>thymeleaf</artifactId>
-                <version>${version.thymeleaf}</version>
-            </dependency>
-            <dependency>
-                <groupId>net.sourceforge.plantuml</groupId>
-                <artifactId>plantuml</artifactId>
-                <version>${version.plantuml}</version>
-            </dependency>
-            <dependency>
-                <groupId>guru.nidi</groupId>
-                <artifactId>graphviz-java</artifactId>
-                <version>${version.graphviz}</version>
-            </dependency>
   <build>
     <plugins>
       <!-- Set properties containing the scm revision -->
@@ -599,4 +491,4 @@
       </build>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>