Skip to content

Commit cf2853d

Browse files
author
Gary Keim
authored
Merge pull request #311 from GaryWKeim/TAB-8175_fix_java11
TAB-8157: fix Java 11
2 parents 7ddbeb7 + 289a76c commit cf2853d

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

pom.xml

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<jersey.version>2.36</jersey.version>
2323

2424
<guava.version>31.1-jre</guava.version>
25-
<groovy.version>3.0.11</groovy.version>
25+
<groovy.version>3.0.12</groovy.version>
2626
<shiro.version>1.9.1</shiro.version>
2727
<csrfguard.version>4.1.4</csrfguard.version>
2828

@@ -40,8 +40,7 @@
4040
<commons-io.version>2.11.0</commons-io.version>
4141
<commons-logging.version>1.2</commons-logging.version>
4242
<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>
4544
<h2.version>1.3.154</h2.version>
4645
<sizeof-agent.version>1.0.1</sizeof-agent.version>
4746
<hibernate-core.version>3.5.1-Final</hibernate-core.version>
@@ -103,6 +102,16 @@
103102
<artifactId>jetty-webapp</artifactId>
104103
<version>${jetty.version}</version>
105104
</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>
106115
<dependency>
107116
<groupId>org.eclipse.jetty</groupId>
108117
<artifactId>jetty-client</artifactId>
@@ -305,6 +314,13 @@
305314
<groupId>com.fasterxml.jackson.jaxrs</groupId>
306315
<artifactId>jackson-jaxrs-json-provider</artifactId>
307316
<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>
308324
</dependency>
309325

310326
<!-- these are from wan40 -->
@@ -319,13 +335,6 @@
319335
<version>${jackson.version}</version>
320336
</dependency>
321337

322-
323-
<dependency>
324-
<groupId>com.sun.activation</groupId>
325-
<artifactId>javax.activation</artifactId>
326-
<version>${javax-activation.version}</version>
327-
</dependency>
328-
329338
<dependency>
330339
<groupId>org.slf4j</groupId>
331340
<artifactId>slf4j-api</artifactId>

0 commit comments

Comments
 (0)