Skip to content

Commit db0c836

Browse files
Resolve conflicts
1 parent 79ac7a7 commit db0c836

File tree

1 file changed

+44
-35
lines changed

1 file changed

+44
-35
lines changed

pom.xml

Lines changed: 44 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -33,41 +33,50 @@
3333
</modules>
3434

3535
<properties>
36-
<java.version>11</java.version>
37-
<maven.compiler.source>${java.version}</maven.compiler.source>
38-
<maven.compiler.target>${java.version}</maven.compiler.target>
39-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40-
<version.maven>3.6.2</version.maven>
41-
<version.enforcer.plugin>3.0.0-M2</version.enforcer.plugin>
42-
<version.jdk>${java.version}</version.jdk>
43-
<version.compiler.plugin>3.8.1</version.compiler.plugin>
44-
<version.surefire.plugin>2.22.0</version.surefire.plugin>
45-
<version.failsafe.plugin>3.1.2</version.failsafe.plugin>
46-
<version.checkstyle.plugin>3.1.1</version.checkstyle.plugin>
47-
<version.deploy.plugin>2.8.2</version.deploy.plugin>
48-
<version.com.networknt>1.0.87</version.com.networknt>
49-
<version.org.slf4j>1.7.25</version.org.slf4j>
50-
<version.com.fasterxml.jackson>2.15.3</version.com.fasterxml.jackson>
51-
<version.jakarta.validation>3.0.2</version.jakarta.validation>
52-
<version.org.junit.minor>6.0</version.org.junit.minor>
53-
<version.org.junit>5.${version.org.junit.minor}</version.org.junit>
54-
<version.org.junit.jupiter>${version.org.junit}</version.org.junit.jupiter>
55-
<version.org.mockito>5.6.0</version.org.mockito>
56-
<version.ch.qos.logback>1.4.9</version.ch.qos.logback>
57-
<version.org.assertj>3.13.2</version.org.assertj>
58-
<version.jsonschema2pojo-maven-plugin>1.1.2</version.jsonschema2pojo-maven-plugin>
59-
<commons.lang.version>3.13.0</commons.lang.version>
60-
<hamcrest.version>1.3</hamcrest.version>
61-
<jsonassert.version>1.5.0</jsonassert.version>
62-
<json.schema.validation.version>1.14.1</json.schema.validation.version>
63-
<version.thymeleaf>3.1.2.RELEASE</version.thymeleaf>
64-
<version.plantuml>8059</version.plantuml>
65-
<version.graphviz>0.17.0</version.graphviz>
66-
<version.fmt-maven-plugin>2.13</version.fmt-maven-plugin>
67-
<version.jar.plugin>3.2.0</version.jar.plugin>
68-
<!-- Checkstyle props -->
69-
<checkstyle.failOnViolation>true</checkstyle.failOnViolation>
70-
<checkstyle.header.template><![CDATA[
36+
<java.version>11</java.version>
37+
<maven.compiler.source>${java.version}</maven.compiler.source>
38+
<maven.compiler.target>${java.version}</maven.compiler.target>
39+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40+
<version.maven>3.6.2</version.maven>
41+
42+
<!-- Plugin versions, please keep in alphabetical order -->
43+
<version.buildnumber.plugin>3.2.0</version.buildnumber.plugin>
44+
<version.checkstyle.plugin>3.3.1</version.checkstyle.plugin>
45+
<version.compiler.plugin>3.13.0</version.compiler.plugin>
46+
<version.deploy.plugin>3.1.2</version.deploy.plugin>
47+
<version.enforcer.plugin>3.0.0-M2</version.enforcer.plugin>
48+
<version.failsafe.plugin>3.2.5</version.failsafe.plugin>
49+
<version.fmt-maven-plugin>2.23</version.fmt-maven-plugin>
50+
<version.gpg.plugin>3.2.4</version.gpg.plugin>
51+
<version.jar.plugin>3.4.1</version.jar.plugin>
52+
<version.jdk>${java.version}</version.jdk>
53+
<version.jsonschema2pojo-maven-plugin>1.1.2</version.jsonschema2pojo-maven-plugin>
54+
<version.javadoc.plugin>3.6.3</version.javadoc.plugin>
55+
<version.release.plugin>3.0.1</version.release.plugin>
56+
<version.source.plugin>3.3.1</version.source.plugin>
57+
<version.surefire.plugin>3.2.5</version.surefire.plugin>
58+
59+
60+
<!-- Dependencies versions, please keep in alphabetical order -->
61+
<version.ch.qos.logback>1.5.6</version.ch.qos.logback>
62+
<version.com.fasterxml.jackson>2.17.1</version.com.fasterxml.jackson>
63+
<version.com.networknt>1.4.0</version.com.networknt>
64+
<version.commons.lang>3.14.0</version.commons.lang>
65+
<version.graphviz>0.17.0</version.graphviz>
66+
<version.hamcrest>1.3</version.hamcrest>
67+
<version.jakarta.validation>3.1.0</version.jakarta.validation>
68+
<version.jsonassert>1.5.0</version.jsonassert>
69+
<version.org.assertj>3.26.0</version.org.assertj>
70+
<version.org.junit.jupiter>5.10.2</version.org.junit.jupiter>
71+
<version.org.mockito>5.12.0</version.org.mockito>
72+
<version.org.slf4j>2.0.13</version.org.slf4j>
73+
<version.plantuml>8059</version.plantuml>
74+
<version.thymeleaf>3.1.2.RELEASE</version.thymeleaf>
75+
76+
77+
<!-- Checkstyle props -->
78+
<checkstyle.failOnViolation>true</checkstyle.failOnViolation>
79+
<checkstyle.header.template><![CDATA[
7180
^\/\*$\n^
7281
\* Copyright \d\d\d\d-Present The Serverless Workflow Specification Authors$\n^
7382
\*$\n^

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy