|
38 | 38 |
|
39 | 39 | <modules>
|
40 | 40 | <module>api</module>
|
41 |
| - <module>spi</module> |
42 |
| - <module>validation</module> |
43 |
| - <module>diagram</module> |
44 |
| - <module>utils</module> |
| 41 | + <module>custom-generator</module> |
45 | 42 | </modules>
|
46 | 43 |
|
47 | 44 | <properties>
|
48 | 45 | <java.version>11</java.version>
|
49 | 46 | <maven.compiler.source>${java.version}</maven.compiler.source>
|
50 | 47 | <maven.compiler.target>${java.version}</maven.compiler.target>
|
51 | 48 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
52 |
| - <version.maven>3.6.2</version.maven> |
| 49 | + <version.maven>3.9.7</version.maven> |
53 | 50 |
|
54 | 51 | <!-- Plugin versions, please keep in alphabetical order -->
|
55 | 52 | <version.buildnumber.plugin>3.2.0</version.buildnumber.plugin>
|
|
62 | 59 | <version.gpg.plugin>3.2.4</version.gpg.plugin>
|
63 | 60 | <version.jar.plugin>3.4.1</version.jar.plugin>
|
64 | 61 | <version.jdk>${java.version}</version.jdk>
|
| 62 | +<<<<<<< Upstream, based on main |
65 | 63 | <version.jsonschema2pojo-maven-plugin>1.1.2</version.jsonschema2pojo-maven-plugin>
|
66 | 64 | <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 |
67 | 69 | <version.release.plugin>3.0.1</version.release.plugin>
|
68 | 70 | <version.source.plugin>3.3.1</version.source.plugin>
|
69 | 71 | <version.surefire.plugin>3.2.5</version.surefire.plugin>
|
|
73 | 75 | <version.ch.qos.logback>1.5.6</version.ch.qos.logback>
|
74 | 76 | <version.com.fasterxml.jackson>2.17.1</version.com.fasterxml.jackson>
|
75 | 77 | <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> |
79 | 78 | <version.jakarta.validation>3.1.0</version.jakarta.validation>
|
80 | 79 | <version.jsonassert>1.5.0</version.jsonassert>
|
81 | 80 | <version.org.assertj>3.26.0</version.org.assertj>
|
82 | 81 | <version.org.junit.jupiter>5.10.2</version.org.junit.jupiter>
|
83 | 82 | <version.org.mockito>5.12.0</version.org.mockito>
|
84 | 83 | <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 | + |
88 | 85 |
|
89 | 86 | <!-- Checkstyle props -->
|
90 | 87 | <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
|
|
117 | 114 | <artifactId>slf4j-api</artifactId>
|
118 | 115 | <version>${version.org.slf4j}</version>
|
119 | 116 | </dependency>
|
120 |
| - <dependency> |
121 |
| - <groupId>org.slf4j</groupId> |
122 |
| - <artifactId>jcl-over-slf4j</artifactId> |
123 |
| - <version>${version.org.slf4j}</version> |
124 |
| - </dependency> |
125 | 117 | <dependency>
|
126 | 118 | <groupId>com.fasterxml.jackson.core</groupId>
|
127 | 119 | <artifactId>jackson-core</artifactId>
|
|
136 | 128 | <groupId>com.networknt</groupId>
|
137 | 129 | <artifactId>json-schema-validator</artifactId>
|
138 | 130 | <version>${version.com.networknt}</version>
|
139 |
| - <exclusions> |
140 |
| - <exclusion> |
141 |
| - <groupId>org.apache.commons</groupId> |
142 |
| - <artifactId>commons-lang3</artifactId> |
143 |
| - </exclusion> |
144 |
| - </exclusions> |
145 | 131 | </dependency>
|
146 | 132 | <dependency>
|
147 | 133 | <groupId>com.fasterxml.jackson.dataformat</groupId>
|
148 | 134 | <artifactId>jackson-dataformat-yaml</artifactId>
|
149 | 135 | <version>${version.com.fasterxml.jackson}</version>
|
150 | 136 | </dependency>
|
| 137 | + <dependency> |
| 138 | + <groupId>org.jsonschema2pojo</groupId> |
| 139 | + <artifactId>jsonschema2pojo-core</artifactId> |
| 140 | + <version>${version.jsonschema2pojo-maven-plugin}</version> |
| 141 | + </dependency> |
151 | 142 | <dependency>
|
152 | 143 | <groupId>jakarta.validation</groupId>
|
153 | 144 | <artifactId>jakarta.validation-api</artifactId>
|
154 | 145 | <version>${version.jakarta.validation}</version>
|
155 | 146 | </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 | + |
177 | 148 | <!-- test -->
|
178 | 149 | <dependency>
|
179 | 150 | <groupId>org.junit.jupiter</groupId>
|
|
211 | 182 | <version>${version.org.assertj}</version>
|
212 | 183 | <scope>test</scope>
|
213 | 184 | </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> |
226 | 185 | </dependencies>
|
227 | 186 | </dependencyManagement>
|
228 | 187 |
|
|
0 commit comments