diff --git a/pom.xml b/pom.xml index 3da4cfb6..6767ff0e 100644 --- a/pom.xml +++ b/pom.xml @@ -24,11 +24,11 @@ UTF-8 3.23.1 2.5.0 - 5.8.2 - 1.7.10 - 1.6.2 - 1.12.4 - 4.6.1 + 5.9.1 + 1.7.21 + 1.6.4 + 1.13.2 + 4.9.0 6.0.0 2022.0.0-RC1 6.0.0-M6 @@ -225,7 +225,7 @@ io.mockk - mockk + mockk-jvm ${mockk.version} test @@ -444,7 +444,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.1.1 + 3.3.0 @@ -486,7 +486,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.0 + 3.4.1 en_US true @@ -535,7 +535,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + 3.0.0 @@ -577,7 +577,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.4.1 + 3.4.2 @@ -595,7 +595,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.2.7 + 1.3.0 diff --git a/spring-vault-core/pom.xml b/spring-vault-core/pom.xml index edfa5855..cf9d909e 100644 --- a/spring-vault-core/pom.xml +++ b/spring-vault-core/pom.xml @@ -286,7 +286,7 @@ io.mockk - mockk + mockk-jvm test diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpIamAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpIamAuthentication.java index 3958774c..33447cf7 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpIamAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpIamAuthentication.java @@ -21,11 +21,9 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import com.google.api.client.googleapis.apache.GoogleApacheHttpTransport; import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; import com.google.api.client.http.HttpTransport; import com.google.api.client.http.javanet.NetHttpTransport; -import com.google.api.client.json.JsonFactory; import com.google.api.services.iam.v1.Iam; import com.google.api.services.iam.v1.Iam.Builder; import com.google.api.services.iam.v1.Iam.Projects.ServiceAccounts.SignJwt; @@ -33,9 +31,7 @@ import com.google.api.services.iam.v1.model.SignJwtRequest; import com.google.api.services.iam.v1.model.SignJwtResponse; import com.google.auth.oauth2.GoogleCredentials; -import org.springframework.beans.BeanUtils; import org.springframework.util.Assert; -import org.springframework.util.ClassUtils; import org.springframework.vault.VaultException; import org.springframework.vault.support.VaultToken; import org.springframework.web.client.RestOperations; @@ -82,7 +78,7 @@ public class GcpIamAuthentication extends GcpJwtAuthenticationSupport implements /** * Create a new instance of {@link GcpIamAuthentication} given * {@link GcpIamAuthenticationOptions} and {@link RestOperations}. This constructor - * initializes {@link GoogleApacheHttpTransport} for Google API usage. + * initializes {@link NetHttpTransport} for Google API usage. * @param options must not be {@literal null}. * @param restOperations HTTP client for Vault login, must not be {@literal null}. */ diff --git a/spring-vault-dependencies/pom.xml b/spring-vault-dependencies/pom.xml index f893d32f..65c9df1b 100644 --- a/spring-vault-dependencies/pom.xml +++ b/spring-vault-dependencies/pom.xml @@ -59,14 +59,14 @@ 5.1.3 5.1.4 - 3.0.6 - 4.1.79.Final + 3.0.7 + 4.1.85.Final 3.14.9 - 2.13.4.2 - 2.17.232 - v1-rev20220526-1.32.1 - 2.3.0 - 1.8.1 + 2.14.0 + 2.18.18 + v1-rev20221013-2.0.0 + 2.6.0 + 1.13.0 1.70 @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.0 + 3.4.1 @@ -196,7 +196,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.2.7 + 1.3.0 false