Skip to content

Commit

Permalink
Merge pull request #28294 from vespa-engine/renovate/jersey-monorepo
Browse files Browse the repository at this point in the history
Update jersey monorepo to v2.40
  • Loading branch information
bjorncs authored Aug 31, 2023
2 parents 98a1f7e + 71feeac commit 8ea84bc
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 17 deletions.
2 changes: 1 addition & 1 deletion dependency-versions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<java-jjwt.vespa.version>0.11.5</java-jjwt.vespa.version>
<java-jwt.vespa.version>3.19.4</java-jwt.vespa.version>
<jaxb.runtime.vespa.version>2.3.8</jaxb.runtime.vespa.version>
<jersey.vespa.version>2.25</jersey.vespa.version>
<jersey.vespa.version>2.40</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>
<jimfs.vespa.version>1.3.0</jimfs.vespa.version>
Expand Down
28 changes: 12 additions & 16 deletions vespa-dependencies-enforcer/allowed-maven-dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,12 @@ io.prometheus:simpleclient_common:0.16.0
io.prometheus:simpleclient_tracer_common:0.16.0
io.prometheus:simpleclient_tracer_otel:0.16.0
io.prometheus:simpleclient_tracer_otel_agent:0.16.0
jakarta.annotation:jakarta.annotation-api:1.3.5
jakarta.validation:jakarta.validation-api:2.0.2
jakarta.ws.rs:jakarta.ws.rs-api:2.1.6
javax.annotation:javax.annotation-api:1.2
javax.inject:javax.inject:1
javax.servlet:javax.servlet-api:3.1.0
javax.validation:validation-api:1.1.0.Final
javax.ws.rs:javax.ws.rs-api:2.1.1
javax.xml.bind:jaxb-api:2.3.0
joda-time:joda-time:2.12.5
Expand Down Expand Up @@ -167,27 +169,21 @@ org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2
org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5
org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5
org.fusesource.jansi:jansi:1.18
org.glassfish.hk2:hk2-api:2.5.0-b30
org.glassfish.hk2:hk2-locator:2.5.0-b30
org.glassfish.hk2:hk2-utils:2.5.0-b30
org.glassfish.hk2:osgi-resource-locator:1.0.1
org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b30
org.glassfish.hk2.external:javax.inject:2.5.0-b30
org.glassfish.hk2:osgi-resource-locator:1.0.3
org.glassfish.hk2.external:jakarta.inject:2.6.1
org.glassfish.jaxb:jaxb-runtime:2.3.8
org.glassfish.jaxb:txw2:2.3.8
org.glassfish.jersey.bundles.repackaged:jersey-guava:2.25
org.glassfish.jersey.core:jersey-client:2.25
org.glassfish.jersey.core:jersey-common:2.25
org.glassfish.jersey.core:jersey-server:2.25
org.glassfish.jersey.ext:jersey-entity-filtering:2.25
org.glassfish.jersey.ext:jersey-proxy-client:2.25
org.glassfish.jersey.media:jersey-media-json-jackson:2.25
org.glassfish.jersey.media:jersey-media-multipart:2.25
org.glassfish.jersey.core:jersey-client:2.40
org.glassfish.jersey.core:jersey-common:2.40
org.glassfish.jersey.core:jersey-server:2.40
org.glassfish.jersey.ext:jersey-entity-filtering:2.40
org.glassfish.jersey.ext:jersey-proxy-client:2.40
org.glassfish.jersey.media:jersey-media-json-jackson:2.40
org.glassfish.jersey.media:jersey-media-multipart:2.40
org.hamcrest:hamcrest:2.2
org.hamcrest:hamcrest-core:2.2
org.hdrhistogram:HdrHistogram:2.1.12
org.iq80.snappy:snappy:0.4
org.javassist:javassist:3.20.0-GA
org.json:json:20230618
org.junit.jupiter:junit-jupiter-api:5.8.1
org.junit.jupiter:junit-jupiter-engine:5.8.1
Expand Down

0 comments on commit 8ea84bc

Please sign in to comment.