|
22 | 22 | <jersey.version>2.36</jersey.version>
|
23 | 23 |
|
24 | 24 | <guava.version>31.1-jre</guava.version>
|
25 |
| - <groovy.version>3.0.11</groovy.version> |
| 25 | + <groovy.version>3.0.12</groovy.version> |
26 | 26 | <shiro.version>1.9.1</shiro.version>
|
27 | 27 | <csrfguard.version>4.1.4</csrfguard.version>
|
28 | 28 |
|
|
40 | 40 | <commons-io.version>2.11.0</commons-io.version>
|
41 | 41 | <commons-logging.version>1.2</commons-logging.version>
|
42 | 42 | <commons-httpclient.version>3.1</commons-httpclient.version>
|
43 |
| - <jaxb-runtime.version>4.0.0</jaxb-runtime.version> |
44 |
| - <javax-activation.version>1.2.0</javax-activation.version> |
| 43 | + <jaxb-runtime.version>2.3.6</jaxb-runtime.version> |
45 | 44 | <h2.version>1.3.154</h2.version>
|
46 | 45 | <sizeof-agent.version>1.0.1</sizeof-agent.version>
|
47 | 46 | <hibernate-core.version>3.5.1-Final</hibernate-core.version>
|
|
103 | 102 | <artifactId>jetty-webapp</artifactId>
|
104 | 103 | <version>${jetty.version}</version>
|
105 | 104 | </dependency>
|
| 105 | + <dependency> |
| 106 | + <groupId>org.eclipse.jetty</groupId> |
| 107 | + <artifactId>jetty-http</artifactId> |
| 108 | + <version>${jetty.version}</version> |
| 109 | + </dependency> |
| 110 | + <dependency> |
| 111 | + <groupId>org.eclipse.jetty</groupId> |
| 112 | + <artifactId>jetty-io</artifactId> |
| 113 | + <version>${jetty.version}</version> |
| 114 | + </dependency> |
106 | 115 | <dependency>
|
107 | 116 | <groupId>org.eclipse.jetty</groupId>
|
108 | 117 | <artifactId>jetty-client</artifactId>
|
|
305 | 314 | <groupId>com.fasterxml.jackson.jaxrs</groupId>
|
306 | 315 | <artifactId>jackson-jaxrs-json-provider</artifactId>
|
307 | 316 | <version>${jackson.version}</version>
|
| 317 | + <exclusions> |
| 318 | + <!-- We get jakarta.activation-api from jaxb-runtime --> |
| 319 | + <exclusion> |
| 320 | + <groupId>jakarta.activation</groupId> |
| 321 | + <artifactId>jakarta.activation-api</artifactId> |
| 322 | + </exclusion> |
| 323 | + </exclusions> |
308 | 324 | </dependency>
|
309 | 325 |
|
310 | 326 | <!-- these are from wan40 -->
|
|
319 | 335 | <version>${jackson.version}</version>
|
320 | 336 | </dependency>
|
321 | 337 |
|
322 |
| - |
323 |
| - <dependency> |
324 |
| - <groupId>com.sun.activation</groupId> |
325 |
| - <artifactId>javax.activation</artifactId> |
326 |
| - <version>${javax-activation.version}</version> |
327 |
| - </dependency> |
328 |
| - |
329 | 338 | <dependency>
|
330 | 339 | <groupId>org.slf4j</groupId>
|
331 | 340 | <artifactId>slf4j-api</artifactId>
|
|
0 commit comments