Skip to content

Commit 0eccf63

Browse files
ricardozaniniricardozanini
authored
Fixing rebase
1 parent a7b95fb commit 0eccf63

File tree

1 file changed

+6
-114
lines changed

1 file changed

+6
-114
lines changed

‎pom.xml

+6-114
Original file line numberDiff line numberDiff line change
@@ -46,51 +46,6 @@
4646
<module>utils</module>
4747
</modules>
4848

49-
<properties>
50-
<java.version>11</java.version>
51-
<maven.compiler.source>${java.version}</maven.compiler.source>
52-
<maven.compiler.target>${java.version}</maven.compiler.target>
53-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
54-
<version.maven>3.6.2</version.maven>
55-
56-
<!-- Plugin versions, please keep in alphabetical order -->
57-
<version.buildnumber.plugin>3.2.0</version.buildnumber.plugin>
58-
<version.checkstyle.plugin>3.3.1</version.checkstyle.plugin>
59-
<version.compiler.plugin>3.13.0</version.compiler.plugin>
60-
<version.deploy.plugin>3.1.2</version.deploy.plugin>
61-
<version.enforcer.plugin>3.0.0-M2</version.enforcer.plugin>
62-
<version.failsafe.plugin>3.2.5</version.failsafe.plugin>
63-
<version.fmt-maven-plugin>2.23</version.fmt-maven-plugin>
64-
<version.gpg.plugin>3.2.4</version.gpg.plugin>
65-
<version.jar.plugin>3.4.1</version.jar.plugin>
66-
<version.jdk>${java.version}</version.jdk>
67-
<version.jsonschema2pojo-maven-plugin>1.1.2</version.jsonschema2pojo-maven-plugin>
68-
<version.javadoc.plugin>3.6.3</version.javadoc.plugin>
69-
<version.release.plugin>3.0.1</version.release.plugin>
70-
<version.source.plugin>3.3.1</version.source.plugin>
71-
<version.surefire.plugin>3.2.5</version.surefire.plugin>
72-
73-
74-
<!-- Dependencies versions, please keep in alphabetical order -->
75-
<version.ch.qos.logback>1.5.6</version.ch.qos.logback>
76-
<version.com.fasterxml.jackson>2.17.1</version.com.fasterxml.jackson>
77-
<version.com.networknt>1.4.0</version.com.networknt>
78-
<version.commons.lang>3.14.0</version.commons.lang>
79-
<version.graphviz>0.17.0</version.graphviz>
80-
<version.hamcrest>1.3</version.hamcrest>
81-
<version.jakarta.validation>3.1.0</version.jakarta.validation>
82-
<version.jsonassert>1.5.0</version.jsonassert>
83-
<version.org.assertj>3.26.0</version.org.assertj>
84-
<version.org.junit.jupiter>5.10.2</version.org.junit.jupiter>
85-
<version.org.mockito>5.12.0</version.org.mockito>
86-
<version.org.slf4j>2.0.13</version.org.slf4j>
87-
<version.plantuml>8059</version.plantuml>
88-
<version.thymeleaf>3.1.2.RELEASE</version.thymeleaf>
89-
90-
91-
<!-- Checkstyle props -->
92-
<checkstyle.failOnViolation>true</checkstyle.failOnViolation>
93-
<checkstyle.header.template><![CDATA[
9449
<properties>
9550
<java.version>11</java.version>
9651
<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -109,7 +64,7 @@
10964
<version.gpg.plugin>3.2.4</version.gpg.plugin>
11065
<version.jar.plugin>3.4.1</version.jar.plugin>
11166
<version.jdk>${java.version}</version.jdk>
112-
<version.jsonschema2pojo-maven-plugin>1.0.1</version.jsonschema2pojo-maven-plugin>
67+
<version.jsonschema2pojo-maven-plugin>1.1.2</version.jsonschema2pojo-maven-plugin>
11368
<version.javadoc.plugin>3.6.3</version.javadoc.plugin>
11469
<version.release.plugin>3.0.1</version.release.plugin>
11570
<version.source.plugin>3.3.1</version.source.plugin>
@@ -123,7 +78,7 @@
12378
<version.commons.lang>3.14.0</version.commons.lang>
12479
<version.graphviz>0.17.0</version.graphviz>
12580
<version.hamcrest>1.3</version.hamcrest>
126-
<version.javax.validation>2.0.1.Final</version.javax.validation>
81+
<version.jakarta.validation>3.1.0</version.jakarta.validation>
12782
<version.jsonassert>1.5.0</version.jsonassert>
12883
<version.org.assertj>3.26.0</version.org.assertj>
12984
<version.org.junit.jupiter>5.10.2</version.org.junit.jupiter>
@@ -196,9 +151,9 @@
196151
<version>${version.com.fasterxml.jackson}</version>
197152
</dependency>
198153
<dependency>
199-
<groupId>javax.validation</groupId>
200-
<artifactId>validation-api</artifactId>
201-
<version>${version.javax.validation}</version>
154+
<groupId>jakarta.validation</groupId>
155+
<artifactId>jakarta.validation-api</artifactId>
156+
<version>${version.jakarta.validation}</version>
202157
</dependency>
203158
<dependency>
204159
<groupId>org.apache.commons</groupId>
@@ -273,69 +228,6 @@
273228
</dependencies>
274229
</dependencyManagement>
275230

276-
<dependencyManagement>
277-
<dependencies>
278-
<dependency>
279-
<groupId>org.slf4j</groupId>
280-
<artifactId>slf4j-api</artifactId>
281-
<version>${version.org.slf4j}</version>
282-
</dependency>
283-
<dependency>
284-
<groupId>org.slf4j</groupId>
285-
<artifactId>jcl-over-slf4j</artifactId>
286-
<version>${version.org.slf4j}</version>
287-
</dependency>
288-
<dependency>
289-
<groupId>com.fasterxml.jackson.core</groupId>
290-
<artifactId>jackson-core</artifactId>
291-
<version>${version.com.fasterxml.jackson}</version>
292-
</dependency>
293-
<dependency>
294-
<groupId>com.fasterxml.jackson.core</groupId>
295-
<artifactId>jackson-databind</artifactId>
296-
<version>${version.com.fasterxml.jackson}</version>
297-
</dependency>
298-
<dependency>
299-
<groupId>com.networknt</groupId>
300-
<artifactId>json-schema-validator</artifactId>
301-
<version>${version.com.networknt}</version>
302-
<exclusions>
303-
<exclusion>
304-
<groupId>org.apache.commons</groupId>
305-
<artifactId>commons-lang3</artifactId>
306-
</exclusion>
307-
</exclusions>
308-
</dependency>
309-
<dependency>
310-
<groupId>com.fasterxml.jackson.dataformat</groupId>
311-
<artifactId>jackson-dataformat-yaml</artifactId>
312-
<version>${version.com.fasterxml.jackson}</version>
313-
</dependency>
314-
<dependency>
315-
<groupId>jakarta.validation</groupId>
316-
<artifactId>jakarta.validation-api</artifactId>
317-
<version>${version.jakarta.validation}</version>
318-
</dependency>
319-
<dependency>
320-
<groupId>org.apache.commons</groupId>
321-
<artifactId>commons-lang3</artifactId>
322-
<version>${commons.lang.version}</version>
323-
</dependency>
324-
<dependency>
325-
<groupId>org.thymeleaf</groupId>
326-
<artifactId>thymeleaf</artifactId>
327-
<version>${version.thymeleaf}</version>
328-
</dependency>
329-
<dependency>
330-
<groupId>net.sourceforge.plantuml</groupId>
331-
<artifactId>plantuml</artifactId>
332-
<version>${version.plantuml}</version>
333-
</dependency>
334-
<dependency>
335-
<groupId>guru.nidi</groupId>
336-
<artifactId>graphviz-java</artifactId>
337-
<version>${version.graphviz}</version>
338-
</dependency>
339231
<build>
340232
<plugins>
341233
<!-- Set properties containing the scm revision -->
@@ -599,4 +491,4 @@
599491
</build>
600492
</profile>
601493
</profiles>
602-
</project>
494+
</project>

0 commit comments

Comments
 (0)