diff options
9 files changed, 53 insertions, 50 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java index 62b56e6e8ff..4956698cc2f 100644 --- a/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java +++ b/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java @@ -7,7 +7,6 @@ import com.yahoo.search.dispatch.LoadBalancer.GroupStatus; import com.yahoo.search.dispatch.searchcluster.Group; import com.yahoo.search.dispatch.searchcluster.Node; import org.junit.jupiter.api.Test; -import org.opentest4j.AssertionFailedError; import java.time.Duration; import java.time.Instant; @@ -34,7 +33,7 @@ public class LoadBalancerTest { Optional<Group> grp = lb.takeGroup(null); Group group = grp.orElseThrow(() -> { - throw new AssertionFailedError("Expected a SearchCluster.Group"); + throw new IllegalStateException("Expected a SearchCluster.Group"); }); assertEquals(1, group.nodes().size()); } @@ -47,7 +46,7 @@ public class LoadBalancerTest { Optional<Group> grp = lb.takeGroup(null); Group group = grp.orElseThrow(() -> { - throw new AssertionFailedError("Expected a SearchCluster.Group"); + throw new IllegalStateException("Expected a SearchCluster.Group"); }); assertEquals(1, group.nodes().size()); } diff --git a/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java index 8422196638a..b325bde05d9 100644 --- a/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/SortingTestCase.java @@ -81,8 +81,8 @@ public class SortingTestCase { private void requireThatChineseHasCorrectRules(Collator col) { final int reorderCodes [] = {UScript.HAN}; - assertEquals("14.0.0.0", col.getUCAVersion().toString()); - assertEquals("153.112.40.0", col.getVersion().toString()); + assertEquals("15.0.0.0", col.getUCAVersion().toString()); + assertEquals("153.120.43.8", col.getVersion().toString()); assertEquals(Arrays.toString(reorderCodes), Arrays.toString(col.getReorderCodes())); assertNotEquals("", ((RuleBasedCollator) col).getRules()); diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index 34fd7843aad..5ff4513cdc6 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -72,28 +72,30 @@ find zkfacade/src/main/java/org/apache/curator -name package-info.java | \ xargs perl -pi -e 's/major = [0-9]+, minor = [0-9]+, micro = [0-9]+/major = 5, minor = 3, micro = 0/g' --> - <bouncycastle.vespa.version>1.74</bouncycastle.vespa.version> + <bouncycastle.vespa.version>1.76</bouncycastle.vespa.version> <curator.vespa.version>5.4.0</curator.vespa.version> - <commons-codec.vespa.version>1.15</commons-codec.vespa.version> + <commons-codec.vespa.version>1.16.0</commons-codec.vespa.version> + <commons-csv.vespa.version>1.10.0</commons-csv.vespa.version> <commons-exec.vespa.version>1.3</commons-exec.vespa.version> - <commons-io.vespa.version>2.11.0</commons-io.vespa.version> + <commons-io.vespa.version>2.13.0</commons-io.vespa.version> + <commons-lang3.vespa.version>3.13.0</commons-lang3.vespa.version> <commons.math3.vespa.version>3.6.1</commons.math3.vespa.version> <commons-compress.vespa.version>1.23.0</commons-compress.vespa.version> - <eclipse-collections.vespa.version>11.0.0</eclipse-collections.vespa.version> + <eclipse-collections.vespa.version>11.1.0</eclipse-collections.vespa.version> <felix.vespa.version>7.0.5</felix.vespa.version> <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 --> <hamcrest.vespa.version>2.2</hamcrest.vespa.version> <hdrhistogram.vespa.version>2.1.12</hdrhistogram.vespa.version> - <icu4j.vespa.version>70.1</icu4j.vespa.version> + <icu4j.vespa.version>73.2</icu4j.vespa.version> <java-jjwt.vespa.version>0.11.5</java-jjwt.vespa.version> - <java-jwt.vespa.version>3.10.0</java-jwt.vespa.version> - <jaxb.runtime.vespa.version>2.3.2</jaxb.runtime.vespa.version> <!-- 2.3.3 has a BROKEN manifest --> + <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> <jetty.vespa.version>11.0.15</jetty.vespa.version> <jetty-servlet-api.vespa.version>5.0.2</jetty-servlet-api.vespa.version> - <jna.vespa.version>5.11.0</jna.vespa.version> - <joda-time.vespa.version>2.12.2</joda-time.vespa.version> + <jna.vespa.version>5.13.0</jna.vespa.version> + <joda-time.vespa.version>2.12.5</joda-time.vespa.version> <junit.vespa.version>5.8.1</junit.vespa.version> <junit.platform.vespa.version>1.8.1</junit.platform.vespa.version> <junit4.vespa.version>4.13.2</junit4.vespa.version> @@ -108,12 +110,13 @@ <netty-tcnative.vespa.version>2.0.61.Final</netty-tcnative.vespa.version> <onnxruntime.vespa.version>1.15.1</onnxruntime.vespa.version> <opennlp.vespa.version>1.9.3</opennlp.vespa.version> - <opentest4j.vespa.version>1.2.0</opentest4j.vespa.version> - <org.json.vespa.version>20230227</org.json.vespa.version> + <opentest4j.vespa.version>1.3.0</opentest4j.vespa.version> + <org.json.vespa.version>20230618</org.json.vespa.version> <org.lz4.vespa.version>1.8.0</org.lz4.vespa.version> <prometheus.client.vespa.version>0.6.0</prometheus.client.vespa.version> - <protobuf.vespa.version>3.24.0</protobuf.vespa.version> + <protobuf.vespa.version>3.24.2</protobuf.vespa.version> <spifly.vespa.version>1.3.6</spifly.vespa.version> + <snappy.vespa.version>1.1.10.3</snappy.vespa.version> <surefire.vespa.version>3.1.2</surefire.vespa.version> <wiremock.vespa.version>2.35.0</wiremock.vespa.version> <xerces.vespa.version>2.12.2</xerces.vespa.version> diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt index e9beb4f2d40..3cb617aea87 100644 --- a/maven-plugins/allowed-maven-dependencies.txt +++ b/maven-plugins/allowed-maven-dependencies.txt @@ -12,14 +12,14 @@ com.google.guava:failureaccess:1.0.1 com.google.guava:guava:32.1.1-jre com.google.inject:guice:4.2.3 com.google.j2objc:j2objc-annotations:2.8 -commons-codec:commons-codec:1.15 -commons-io:commons-io:2.11.0 +commons-codec:commons-codec:1.16.0 +commons-io:commons-io:2.13.0 javax.annotation:javax.annotation-api:1.2 javax.inject:javax.inject:1 org.apache-extras.beanshell:bsh:2.0b6 org.apache.commons:commons-collections4:4.4 org.apache.commons:commons-compress:1.23.0 -org.apache.commons:commons-lang3:3.12.0 +org.apache.commons:commons-lang3:3.13.0 org.apache.maven:maven-archiver:3.6.1 org.apache.maven:maven-artifact:3.9.4 org.apache.maven:maven-builder-support:3.9.4 @@ -81,4 +81,4 @@ org.junit.platform:junit-platform-commons:1.8.1 org.junit.platform:junit-platform-engine:1.8.1 org.mockito:mockito-core:4.0.0 org.objenesis:objenesis:3.2 -org.opentest4j:opentest4j:1.2.0 +org.opentest4j:opentest4j:1.3.0 diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPathTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPathTest.java index bbe96272b4b..5d96787214a 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPathTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/UnixPathTest.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.node.admin.task.util.file; import com.yahoo.vespa.test.file.TestFileSystem; import org.junit.jupiter.api.Test; -import org.opentest4j.AssertionFailedError; import java.nio.charset.StandardCharsets; import java.nio.file.FileSystem; @@ -173,7 +172,7 @@ public class UnixPathTest { assertEquals("bar", absolutePath.getFilename()); var pathWithoutSlash = new UnixPath("foo"); - assertRuntimeException(IllegalStateException.class, "Path has no parent directory: 'foo'", () -> pathWithoutSlash.getParent()); + assertRuntimeException(IllegalStateException.class, "Path has no parent directory: 'foo'", pathWithoutSlash::getParent); assertEquals("foo", pathWithoutSlash.getFilename()); var pathWithSlash = new UnixPath("/foo"); @@ -190,7 +189,7 @@ public class UnixPathTest { fail("No exception was thrown"); } catch (RuntimeException e) { if (!baseClass.isInstance(e)) { - throw new AssertionFailedError("Exception class mismatch", baseClass.getName(), e.getClass().getName()); + fail("Exception class mismatch " + baseClass.getName() + " != " + e.getClass().getName()); } assertEquals(message, e.getMessage()); diff --git a/parent/pom.xml b/parent/pom.xml index 2c4882805f0..a18cd4a6576 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -612,7 +612,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.12.0</version> + <version>${commons-lang3.vespa.version}</version> </dependency> <dependency> <groupId>io.jsonwebtoken</groupId> @@ -737,7 +737,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-csv</artifactId> - <version>1.8</version> + <version>${commons-csv.vespa.version}</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -1109,7 +1109,7 @@ <dependency> <groupId>org.xerial.snappy</groupId> <artifactId>snappy-java</artifactId> - <version>1.1.10.1</version> + <version>${snappy.vespa.version}</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> diff --git a/security-utils/src/main/java/com/yahoo/security/SharedKeyGenerator.java b/security-utils/src/main/java/com/yahoo/security/SharedKeyGenerator.java index 22503292413..5582bd4d106 100644 --- a/security-utils/src/main/java/com/yahoo/security/SharedKeyGenerator.java +++ b/security-utils/src/main/java/com/yahoo/security/SharedKeyGenerator.java @@ -105,7 +105,7 @@ public class SharedKeyGenerator { private static AeadCipher makeAesGcmCipher(SecretSharedKey secretSharedKey, boolean forEncryption) { var aeadParams = new AEADParameters(new KeyParameter(secretSharedKey.secretKey().getEncoded()), AES_GCM_AUTH_TAG_BITS, FIXED_96BIT_IV_FOR_SINGLE_USE_KEY); - var cipher = new GCMBlockCipher(new AESEngine()); + var cipher = GCMBlockCipher.newInstance(AESEngine.newInstance()); cipher.init(forEncryption, aeadParams); return AeadCipher.of(cipher); } diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml index b02fc366d07..55fd25f8b99 100644 --- a/vespa-athenz/pom.xml +++ b/vespa-athenz/pom.xml @@ -154,6 +154,10 @@ <artifactId>jakarta.activation-api</artifactId> </exclusion> <exclusion> + <groupId>com.sun.activation</groupId> + <artifactId>jakarta.activation</artifactId> + </exclusion> + <exclusion> <groupId>jakarta.xml.bind</groupId> <artifactId>jakarta.xml.bind-api</artifactId> </exclusion> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index d2fd7c60f13..9dc1b0d2fda 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -13,7 +13,7 @@ com.amazonaws:aws-java-sdk-core:1.12.460 com.amazonaws:aws-java-sdk-ssm:1.12.460 com.amazonaws:aws-java-sdk-sts:1.12.460 com.amazonaws:jmespath-java:1.12.460 -com.auth0:java-jwt:3.10.0 +com.auth0:java-jwt:3.19.4 com.fasterxml.jackson.core:jackson-annotations:2.15.2 com.fasterxml.jackson.core:jackson-core:2.15.2 com.fasterxml.jackson.core:jackson-databind:2.15.2 @@ -38,15 +38,14 @@ com.google.http-client:google-http-client-apache-v2:1.43.3 com.google.http-client:google-http-client-gson:1.42.3 com.google.inject:guice:4.2.3:no_aop com.google.j2objc:j2objc-annotations:2.8 -com.google.protobuf:protobuf-java:3.24.0 -com.ibm.icu:icu4j:70.1 +com.google.protobuf:protobuf-java:3.24.2 +com.ibm.icu:icu4j:73.2 com.intellij:annotations:9.0.4 com.microsoft.onnxruntime:onnxruntime:1.15.1 com.sun.activation:javax.activation:1.2.0 -com.sun.istack:istack-commons-runtime:3.0.8 +com.sun.istack:istack-commons-runtime:3.0.12 com.sun.xml.bind:jaxb-core:2.3.0 com.sun.xml.bind:jaxb-impl:2.3.0 -com.sun.xml.fastinfoset:FastInfoset:1.2.16 com.thaiopensource:jing:20091111 com.yahoo.athenz:athenz-auth-core:1.11.34 com.yahoo.athenz:athenz-client-common:1.11.34 @@ -55,9 +54,9 @@ com.yahoo.athenz:athenz-zpe-java-client:1.11.34 com.yahoo.athenz:athenz-zts-core:1.11.34 com.yahoo.rdl:rdl-java:1.5.4 commons-cli:commons-cli:1.5.0 -commons-codec:commons-codec:1.15 +commons-codec:commons-codec:1.16.0 commons-fileupload:commons-fileupload:1.5 -commons-io:commons-io:2.11.0 +commons-io:commons-io:2.13.0 commons-logging:commons-logging:1.2 io.airlift:airline:0.9 io.dropwizard.metrics:metrics-core:3.2.5 @@ -86,17 +85,17 @@ javax.servlet:javax.servlet-api:3.1.0 javax.validation:validation-api:1.1.0.Final javax.ws.rs:javax.ws.rs-api:2.0.1 javax.xml.bind:jaxb-api:2.3.0 -joda-time:joda-time:2.12.2 +joda-time:joda-time:2.12.5 junit:junit:4.13.2 -net.java.dev.jna:jna:5.11.0 +net.java.dev.jna:jna:5.13.0 net.openhft:zero-allocation-hashing:0.16 org.antlr:antlr-runtime:3.5.3 org.antlr:antlr4-runtime:4.13.0 org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.6 org.apache.commons:commons-compress:1.23.0 -org.apache.commons:commons-csv:1.8 +org.apache.commons:commons-csv:1.10.0 org.apache.commons:commons-exec:1.3 -org.apache.commons:commons-lang3:3.12.0 +org.apache.commons:commons-lang3:3.13.0 org.apache.commons:commons-math3:3.6.1 org.apache.curator:curator-client:5.4.0 org.apache.curator:curator-framework:5.4.0 @@ -133,9 +132,9 @@ org.apache.zookeeper:zookeeper:3.8.1 org.apache.zookeeper:zookeeper-jute:3.8.0 org.apache.zookeeper:zookeeper-jute:3.8.1 org.apiguardian:apiguardian-api:1.1.2 -org.bouncycastle:bcpkix-jdk18on:1.74 -org.bouncycastle:bcprov-jdk18on:1.74 -org.bouncycastle:bcutil-jdk18on:1.74 +org.bouncycastle:bcpkix-jdk18on:1.76 +org.bouncycastle:bcprov-jdk18on:1.76 +org.bouncycastle:bcutil-jdk18on:1.76 org.codehaus.plexus:plexus-archiver:4.8.0 org.codehaus.plexus:plexus-classworlds:2.7.0 org.codehaus.plexus:plexus-component-annotations:1.5.5 @@ -143,8 +142,8 @@ org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1 org.codehaus.plexus:plexus-interpolation:1.26 org.codehaus.plexus:plexus-io:3.4.1 org.codehaus.plexus:plexus-utils:3.5.1 -org.eclipse.collections:eclipse-collections:11.0.0 -org.eclipse.collections:eclipse-collections-api:11.0.0 +org.eclipse.collections:eclipse-collections:11.1.0 +org.eclipse.collections:eclipse-collections-api:11.1.0 org.eclipse.jetty:jetty-alpn-client:11.0.15 org.eclipse.jetty:jetty-alpn-java-client:11.0.15 org.eclipse.jetty:jetty-alpn-java-server:11.0.15 @@ -172,8 +171,8 @@ 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.jaxb:jaxb-runtime:2.3.2 -org.glassfish.jaxb:txw2:2.3.2 +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 @@ -187,17 +186,16 @@ 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:20230227 +org.json:json:20230618 org.junit.jupiter:junit-jupiter-api:5.8.1 org.junit.jupiter:junit-jupiter-engine:5.8.1 org.junit.platform:junit-platform-commons:1.8.1 org.junit.platform:junit-platform-engine:1.8.1 org.junit.platform:junit-platform-launcher:1.8.1 org.jvnet.mimepull:mimepull:1.9.6 -org.jvnet.staxex:stax-ex:1.8.1 org.kohsuke:libpam4j:1.11 org.lz4:lz4-java:1.8.0 -org.opentest4j:opentest4j:1.2.0 +org.opentest4j:opentest4j:1.3.0 org.osgi:org.osgi.compendium:4.1.0 org.osgi:org.osgi.core:4.1.0 org.ow2.asm:asm:9.3 @@ -212,7 +210,7 @@ org.slf4j:slf4j-api:1.7.32 org.slf4j:slf4j-jdk14:1.7.32 org.slf4j:slf4j-simple:1.7.32 org.tukaani:xz:1.9 -org.xerial.snappy:snappy-java:1.1.10.1 +org.xerial.snappy:snappy-java:1.1.10.3 software.amazon.ion:ion-java:1.0.2 xerces:xercesImpl:2.12.2 xml-apis:xml-apis:1.4.01 |