Skip to content

Commit 3355738

Browse files
committed
[Fix_#359] Migration to 0.10 DSL
Signed-off-by: Francisco Javier Tirado Sarti <ftirados@redhat.com> [Fix #359] Generating not referenced Pojos Signed-off-by: Francisco Javier Tirado Sarti <ftirados@redhat.com>
1 parent a1cb0b6 commit 3355738

File tree

1 file changed

+14
-55
lines changed

1 file changed

+14
-55
lines changed

pom.xml

Lines changed: 14 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,15 @@
3838

3939
<modules>
4040
<module>api</module>
41-
<module>spi</module>
42-
<module>validation</module>
43-
<module>diagram</module>
44-
<module>utils</module>
41+
<module>custom-generator</module>
4542
</modules>
4643

4744
<properties>
4845
<java.version>11</java.version>
4946
<maven.compiler.source>${java.version}</maven.compiler.source>
5047
<maven.compiler.target>${java.version}</maven.compiler.target>
5148
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
52-
<version.maven>3.6.2</version.maven>
49+
<version.maven>3.9.7</version.maven>
5350

5451
<!-- Plugin versions, please keep in alphabetical order -->
5552
<version.buildnumber.plugin>3.2.0</version.buildnumber.plugin>
@@ -62,8 +59,13 @@
6259
<version.gpg.plugin>3.2.4</version.gpg.plugin>
6360
<version.jar.plugin>3.4.1</version.jar.plugin>
6461
<version.jdk>${java.version}</version.jdk>
62+
<<<<<<< Upstream, based on main
6563
<version.jsonschema2pojo-maven-plugin>1.1.2</version.jsonschema2pojo-maven-plugin>
6664
<version.javadoc.plugin>3.7.0</version.javadoc.plugin>
65+
=======
66+
<version.jsonschema2pojo-maven-plugin>1.2.1</version.jsonschema2pojo-maven-plugin>
67+
<version.javadoc.plugin>3.6.3</version.javadoc.plugin>
68+
>>>>>>> 008f450 [Fix_#359] Migration to 0.10 DSL
6769
<version.release.plugin>3.0.1</version.release.plugin>
6870
<version.source.plugin>3.3.1</version.source.plugin>
6971
<version.surefire.plugin>3.2.5</version.surefire.plugin>
@@ -73,18 +75,13 @@
7375
<version.ch.qos.logback>1.5.6</version.ch.qos.logback>
7476
<version.com.fasterxml.jackson>2.17.1</version.com.fasterxml.jackson>
7577
<version.com.networknt>1.4.0</version.com.networknt>
76-
<version.commons.lang>3.14.0</version.commons.lang>
77-
<version.graphviz>0.17.0</version.graphviz>
78-
<version.hamcrest>1.3</version.hamcrest>
7978
<version.jakarta.validation>3.1.0</version.jakarta.validation>
8079
<version.jsonassert>1.5.0</version.jsonassert>
8180
<version.org.assertj>3.26.0</version.org.assertj>
8281
<version.org.junit.jupiter>5.10.2</version.org.junit.jupiter>
8382
<version.org.mockito>5.12.0</version.org.mockito>
8483
<version.org.slf4j>2.0.13</version.org.slf4j>
85-
<version.plantuml>8059</version.plantuml>
86-
<version.thymeleaf>3.1.2.RELEASE</version.thymeleaf>
87-
84+
8885

8986
<!-- Checkstyle props -->
9087
<checkstyle.failOnViolation>true</checkstyle.failOnViolation>
@@ -117,11 +114,6 @@
117114
<artifactId>slf4j-api</artifactId>
118115
<version>${version.org.slf4j}</version>
119116
</dependency>
120-
<dependency>
121-
<groupId>org.slf4j</groupId>
122-
<artifactId>jcl-over-slf4j</artifactId>
123-
<version>${version.org.slf4j}</version>
124-
</dependency>
125117
<dependency>
126118
<groupId>com.fasterxml.jackson.core</groupId>
127119
<artifactId>jackson-core</artifactId>
@@ -136,44 +128,23 @@
136128
<groupId>com.networknt</groupId>
137129
<artifactId>json-schema-validator</artifactId>
138130
<version>${version.com.networknt}</version>
139-
<exclusions>
140-
<exclusion>
141-
<groupId>org.apache.commons</groupId>
142-
<artifactId>commons-lang3</artifactId>
143-
</exclusion>
144-
</exclusions>
145131
</dependency>
146132
<dependency>
147133
<groupId>com.fasterxml.jackson.dataformat</groupId>
148134
<artifactId>jackson-dataformat-yaml</artifactId>
149135
<version>${version.com.fasterxml.jackson}</version>
150136
</dependency>
137+
<dependency>
138+
<groupId>org.jsonschema2pojo</groupId>
139+
<artifactId>jsonschema2pojo-core</artifactId>
140+
<version>${version.jsonschema2pojo-maven-plugin}</version>
141+
</dependency>
151142
<dependency>
152143
<groupId>jakarta.validation</groupId>
153144
<artifactId>jakarta.validation-api</artifactId>
154145
<version>${version.jakarta.validation}</version>
155146
</dependency>
156-
<dependency>
157-
<groupId>org.apache.commons</groupId>
158-
<artifactId>commons-lang3</artifactId>
159-
<version>${version.commons.lang}</version>
160-
</dependency>
161-
<dependency>
162-
<groupId>org.thymeleaf</groupId>
163-
<artifactId>thymeleaf</artifactId>
164-
<version>${version.thymeleaf}</version>
165-
</dependency>
166-
<dependency>
167-
<groupId>net.sourceforge.plantuml</groupId>
168-
<artifactId>plantuml</artifactId>
169-
<version>${version.plantuml}</version>
170-
</dependency>
171-
<dependency>
172-
<groupId>guru.nidi</groupId>
173-
<artifactId>graphviz-java</artifactId>
174-
<version>${version.graphviz}</version>
175-
</dependency>
176-
147+
177148
<!-- test -->
178149
<dependency>
179150
<groupId>org.junit.jupiter</groupId>
@@ -211,18 +182,6 @@
211182
<version>${version.org.assertj}</version>
212183
<scope>test</scope>
213184
</dependency>
214-
<dependency>
215-
<groupId>org.hamcrest</groupId>
216-
<artifactId>hamcrest-library</artifactId>
217-
<version>${version.hamcrest}</version>
218-
<scope>test</scope>
219-
</dependency>
220-
<dependency>
221-
<groupId>org.skyscreamer</groupId>
222-
<artifactId>jsonassert</artifactId>
223-
<version>${version.jsonassert}</version>
224-
<scope>test</scope>
225-
</dependency>
226185
</dependencies>
227186
</dependencyManagement>
228187

0 commit comments

Comments
 (0)