diff options
author | gjoranv <gv@yahooinc.com> | 2023-07-20 22:45:35 +0200 |
---|---|---|
committer | gjoranv <gv@yahooinc.com> | 2023-07-24 10:36:13 +0200 |
commit | 7930f98907bcd8ac58ee7dbd9c0ae13a4f82462b (patch) | |
tree | 8c817ed91ef25ff5d8666b93f5cade87fc4da477 | |
parent | a4629c4b21ca020f997b5bec095e09c6ebb73e6f (diff) |
Move jersey version property from internal repo to open source.
-rw-r--r-- | configserver/pom.xml | 10 | ||||
-rw-r--r-- | dependency-versions/pom.xml | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/configserver/pom.xml b/configserver/pom.xml index 2ee7adb7ef8..7c94464864c 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -42,12 +42,12 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> - <version>2.25</version> + <version>${jersey.vespa.version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> - <version>2.25</version> + <version>${jersey.vespa.version}</version> <exclusions> <exclusion> <groupId>org.glassfish.jersey.media</groupId> @@ -58,12 +58,12 @@ <dependency> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-proxy-client</artifactId> - <version>2.25</version> + <version>${jersey.vespa.version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-json-jackson</artifactId> - <version>2.25</version> + <version>${jersey.vespa.version}</version> <exclusions> <!-- Prevent embedding deps provided by jdisc --> <exclusion> @@ -79,7 +79,7 @@ <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-multipart</artifactId> - <version>2.25</version> + <version>${jersey.vespa.version}</version> </dependency> <!-- END Jersey deps --> diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 4a25d4ed45d..4146ea3853c 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -29,7 +29,7 @@ <properties> - <!-- Dependencies available from the Jdisc container, see container-dependency-versions/pom.xml --> + <!-- BEGIN Dependencies available from the Jdisc container, see container-dependency-versions/pom.xml --> <aopalliance.vespa.version>1.0</aopalliance.vespa.version> <error-prone-annotations.vespa.version>2.18.0</error-prone-annotations.vespa.version> <guava.vespa.version>32.1.1-jre</guava.vespa.version> @@ -42,7 +42,7 @@ <jaxb.vespa.version>2.3.0</jaxb.vespa.version> <slf4j.vespa.version>1.7.32</slf4j.vespa.version> <xml-apis.vespa.version>1.4.01</xml-apis.vespa.version> - + <!-- END Dependencies available from the Jdisc container --> <!-- Dependencies used internally in Vespa, not visible for users --> <airline.vespa.version>0.9</airline.vespa.version> @@ -75,6 +75,7 @@ <felix.log.vespa.version>1.0.1</felix.log.vespa.version> <findbugs.vespa.version>3.0.2</findbugs.vespa.version> <!-- Should be kept in sync with guava --> <hdrhistogram.vespa.version>2.1.12</hdrhistogram.vespa.version> + <jersey.vespa.version>2.25</jersey.vespa.version> <jetty.vespa.version>11.0.15</jetty.vespa.version> <jetty-servlet-api.vespa.version>5.0.2</jetty-servlet-api.vespa.version> <jjwt.vespa.version>0.11.5</jjwt.vespa.version> |