|
19 | 19 | <dependency> |
20 | 20 | <groupId>org.springframework.boot</groupId> |
21 | 21 | <artifactId>spring-boot-starter-web</artifactId> |
22 | | - <exclusions> |
23 | | - <exclusion> |
24 | | - <artifactId>spring-boot-starter-tomcat</artifactId> |
25 | | - <groupId>org.springframework.boot</groupId> |
26 | | - </exclusion> |
27 | | - <exclusion> |
28 | | - <artifactId>spring-boot-starter-logging</artifactId> |
29 | | - <groupId>org.springframework.boot</groupId> |
30 | | - </exclusion> |
31 | | - </exclusions> |
32 | | - </dependency> |
33 | | - |
34 | | - <dependency> |
35 | | - <groupId>org.apache.logging.log4j</groupId> |
36 | | - <artifactId>log4j-slf4j-impl</artifactId> |
37 | | - <version>2.20.0</version> |
38 | | - </dependency> |
39 | | - |
40 | | - <dependency> |
41 | | - <artifactId>spring-boot-starter-tomcat</artifactId> |
42 | | - <groupId>org.springframework.boot</groupId> |
43 | | - <scope>provided</scope> |
44 | 22 | </dependency> |
45 | 23 |
|
46 | 24 | <dependency> |
|
131 | 109 | <groupId>io.fabric8</groupId> |
132 | 110 | <artifactId>kubernetes-model</artifactId> |
133 | 111 | <version>4.13.3</version> |
134 | | - <exclusions> |
135 | | - <exclusion> |
136 | | - <groupId>com.squareup.okhttp3</groupId> |
137 | | - <artifactId>okhttpn</artifactId> |
138 | | - </exclusion> |
139 | | - </exclusions> |
140 | | - </dependency> |
141 | | - <dependency> |
142 | | - <groupId>com.squareup.okhttp3</groupId> |
143 | | - <artifactId>okhttp</artifactId> |
144 | | - <version>4.10.0</version> |
145 | 112 | </dependency> |
| 113 | + |
146 | 114 | <!-- k8s --> |
147 | 115 | <dependency> |
148 | 116 | <groupId>io.fabric8</groupId> |
|
160 | 128 | </exclusion> |
161 | 129 | </exclusions> |
162 | 130 | </dependency> |
163 | | - |
164 | 131 | <dependency> |
165 | 132 | <groupId>com.fasterxml.jackson.core</groupId> |
166 | 133 | <artifactId>jackson-databind</artifactId> |
167 | 134 | <version>2.12.7.1</version> |
168 | 135 | </dependency> |
169 | | - |
170 | 136 | <dependency> |
171 | 137 | <groupId>com.hubspot.jackson</groupId> |
172 | 138 | <artifactId>jackson-datatype-protobuf</artifactId> |
173 | 139 | <version>0.9.12</version> |
174 | | - <exclusions> |
175 | | - <exclusion> |
176 | | - <groupId>com.google.protobuf</groupId> |
177 | | - <artifactId>protobuf-java</artifactId> |
178 | | - </exclusion> |
179 | | - </exclusions> |
180 | 140 | </dependency> |
181 | 141 |
|
182 | 142 | <dependency> |
183 | | - <groupId>com.google.protobuf</groupId> |
184 | | - <artifactId>protobuf-java</artifactId> |
185 | | - <version>3.21.12</version> |
| 143 | + <groupId>org.yaml</groupId> |
| 144 | + <artifactId>snakeyaml</artifactId> |
| 145 | + <version>1.26</version> |
186 | 146 | </dependency> |
187 | 147 |
|
188 | | -<!-- <dependency>--> |
189 | | -<!-- <groupId>org.yaml</groupId>--> |
190 | | -<!-- <artifactId>snakeyaml</artifactId>--> |
191 | | -<!-- <version>2.2</version>--> |
192 | | -<!-- </dependency>--> |
193 | | - |
194 | 148 | <!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils --> |
195 | 149 | <dependency> |
196 | 150 | <groupId>commons-beanutils</groupId> |
|
274 | 228 | <target>1.8</target> |
275 | 229 | <encoding>UTF-8</encoding> |
276 | 230 | </configuration> |
277 | | - </plugin> |
278 | 231 |
|
| 232 | + </plugin> |
279 | 233 | <plugin> |
280 | 234 | <groupId>org.apache.maven.plugins</groupId> |
281 | | - <artifactId>maven-surefire-plugin</artifactId> |
282 | | - <version>2.17</version> |
| 235 | + <artifactId>maven-war-plugin</artifactId> |
| 236 | + <configuration> |
| 237 | + <failOnMissingWebXml>false</failOnMissingWebXml> |
| 238 | + <webResources> |
| 239 | + <resource> |
| 240 | + <directory>lib/</directory> |
| 241 | + <targetPath>WEB-INF/lib</targetPath> |
| 242 | + <includes> |
| 243 | + <include>**/*.jar</include> |
| 244 | + </includes> |
| 245 | + </resource> |
| 246 | + </webResources> |
| 247 | + </configuration> |
283 | 248 | </plugin> |
284 | 249 |
|
285 | 250 | <plugin> |
286 | | - <groupId>org.springframework.boot</groupId> |
287 | | - <artifactId>spring-boot-maven-plugin</artifactId> |
288 | | - <version>2.0.2.RELEASE</version> |
289 | | - <configuration> |
290 | | - <mainClass>org.hango.cloud.ApiPlaneApplication</mainClass> |
291 | | - <excludeArtifactIds>spring-boot-starter-tomcat</excludeArtifactIds> |
292 | | - <excludeGroupIds>org.apache.tomcat.embed</excludeGroupIds> |
293 | | - <layout>ZIP</layout> |
294 | | - </configuration> |
295 | | - <executions> |
296 | | - <execution> |
297 | | - <goals> |
298 | | - <goal>repackage</goal> |
299 | | - </goals> |
300 | | - </execution> |
301 | | - </executions> |
| 251 | + <groupId>org.apache.maven.plugins</groupId> |
| 252 | + <artifactId>maven-surefire-plugin</artifactId> |
| 253 | + <version>2.17</version> |
302 | 254 | </plugin> |
303 | 255 | </plugins> |
304 | 256 |
|
|
0 commit comments