diff options
Diffstat (limited to 'container-dependency-versions/pom.xml')
| -rw-r--r-- | container-dependency-versions/pom.xml | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index fe37c08a947..b6af723670a 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -5,7 +5,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>container-dependency-versions</artifactId> <packaging>pom</packaging> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <name>container-dependency-versions</name> <description>Versions for all 3rd party dependencies provided from the Vespa container.</description> <url>https://github.com/vespa-engine</url> @@ -144,11 +144,6 @@ <version>${guice.version}</version> <classifier>no_aop</classifier> </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.4</version> - </dependency> <dependency> <groupId>commons-daemon</groupId> <artifactId>commons-daemon</artifactId> @@ -186,24 +181,27 @@ <version>${javax.ws.rs-api.version}</version> </dependency> - <!-- TODO: upgrade jaxb artifacts to >=2.3.0. - See https://stackoverflow.com/questions/50237516/proper-fix-for-java-10-complaining-about-illegal-reflection-access-by-jaxb-impl --> + <!-- jaxb start --> <dependency> + <!-- Needed by felix --> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>${jaxb.version}</version> </dependency> <dependency> + <!-- Needed by jersey --> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-core</artifactId> <version>${jaxb.version}</version> </dependency> <dependency> + <!-- Needed by jersey --> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> <version>${jaxb.version}</version> </dependency> <dependency> + <!-- Needed by jersey --> <groupId>com.sun.activation</groupId> <artifactId>javax.activation</artifactId> <version>1.2.0</version> @@ -236,16 +234,6 @@ <version>${felix.version}</version> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${apache.httpclient.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>${apache.httpcore.version}</version> - </dependency> - <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> <version>${bouncycastle.version}</version> @@ -458,12 +446,10 @@ </dependencyManagement> <properties> - <apache.httpclient.version>4.4.1</apache.httpclient.version> - <apache.httpcore.version>4.4.1</apache.httpcore.version> <bouncycastle.version>1.58</bouncycastle.version> - <felix.version>5.6.10</felix.version> + <felix.version>6.0.1</felix.version> <findbugs.version>1.3.9</findbugs.version> - <guava.version>18.0</guava.version> + <guava.version>20.0</guava.version> <guice.version>3.0</guice.version> <jaxb.version>2.3.0</jaxb.version> <jetty.version>9.4.14.v20181114</jetty.version> |