diff --git a/examples/pom.xml b/examples/pom.xml index 61ca5bef..01645e44 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -53,7 +53,6 @@ com.google.code.gson gson - 2.11.0 org.apache.logging.log4j diff --git a/pom.xml b/pom.xml index 6a121d5d..26b55ba6 100644 --- a/pom.xml +++ b/pom.xml @@ -14,8 +14,8 @@ UTF-8 11 2.20.0 - 1.75.0 - 4.29.2 + 1.78.0 + 4.36.2 1.84 2.1.2 @@ -90,12 +90,12 @@ com.google.errorprone error_prone_annotations - 2.30.0 + 2.50.0 com.google.guava guava - 33.3.1-android + 33.7.1-jre com.google.protobuf @@ -161,6 +161,16 @@ byte-buddy-agent ${bytebuddy.version} + + com.google.code.gson + gson + 2.14.0 + + + org.jspecify + jspecify + 1.0.1 + @@ -306,15 +316,20 @@ org.apache.maven.plugins maven-enforcer-plugin true + 3.6.3 false + + true + true + 3.6.0 ERROR - ${maven.compiler.target} + ${maven.compiler.release} WARN @@ -325,6 +340,13 @@ + + + org.codehaus.mojo + extra-enforcer-rules + 1.12.1 + + enforce-maven diff --git a/sdk/pom.xml b/sdk/pom.xml index 66f461c1..b1fbf506 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -39,7 +39,6 @@ com.google.code.gson gson - 2.11.0 com.vdurmont @@ -59,7 +58,7 @@ build.buf protovalidate - 0.1.9 + 1.3.0 compile diff --git a/sdk/src/test/java/io/opentdf/platform/sdk/PemTestUtils.java b/sdk/src/test/java/io/opentdf/platform/sdk/PemTestUtils.java index 0b7bb62c..78c2e6de 100644 --- a/sdk/src/test/java/io/opentdf/platform/sdk/PemTestUtils.java +++ b/sdk/src/test/java/io/opentdf/platform/sdk/PemTestUtils.java @@ -1,7 +1,6 @@ package io.opentdf.platform.sdk; -import org.checkerframework.checker.nullness.qual.NonNull; - +import javax.annotation.Nonnull; import java.io.ByteArrayInputStream; import java.math.BigInteger; import java.nio.charset.StandardCharsets; @@ -107,7 +106,7 @@ private static ECPoint decodePoint(byte[] data, EllipticCurve curve) { + Integer.toHexString(prefix) + ", length=" + data.length); } - private static @NonNull BigInteger getY(EllipticCurve curve, BigInteger x, int prefix) { + private static @Nonnull BigInteger getY(EllipticCurve curve, BigInteger x, int prefix) { BigInteger p = ((ECFieldFp) curve.getField()).getP(); // y^2 = x^3 + a*x + b (mod p); valid for all NIST P-curves we support. BigInteger rhs = x.modPow(BigInteger.valueOf(3), p)