Spring/spring-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade infrastructure dependencies.

Browse Source 
See gh-733
This commit is contained in:
Mark Paluch
2022-11-16 16:00:32 +01:00
parent 0b442cfe32
commit d50b7c683b
4 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pom.xml
View File

@@ -24,11 +24,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<assertj-core.version>3.23.1</assertj-core.version>
<json-path.version>2.5.0</json-path.version>
<junit.version>5.8.2</junit.version>
<kotlin.version>1.7.10</kotlin.version>
<kotlin-coroutines.version>1.6.2</kotlin-coroutines.version>
<mockk.version>1.12.4</mockk.version>
<mockito-core.version>4.6.1</mockito-core.version>
<junit.version>5.9.1</junit.version>
<kotlin.version>1.7.21</kotlin.version>
<kotlin-coroutines.version>1.6.4</kotlin-coroutines.version>
<mockk.version>1.13.2</mockk.version>
<mockito-core.version>4.9.0</mockito-core.version>
<spring.version>6.0.0</spring.version>
<spring-data-bom.version>2022.0.0-RC1</spring-data-bom.version>
<spring-security-bom.version>6.0.0-M6</spring-security-bom.version>
@@ -225,7 +225,7 @@
<dependency>
<groupId>io.mockk</groupId>
<artifactId>mockk</artifactId>
<artifactId>mockk-jvm</artifactId>
<version>${mockk.version}</version>
<scope>test</scope>
</dependency>
@@ -444,7 +444,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.1</version>
<version>3.3.0</version>
<configuration>
<archive>
<manifestEntries>
@@ -486,7 +486,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<version>3.4.1</version>
<configuration>
<locale>en_US</locale>
<breakiterator>true</breakiterator>
@@ -535,7 +535,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<version>3.0.0</version>
</plugin>
<plugin>
@@ -577,7 +577,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
</plugin>
<plugin>
@@ -595,7 +595,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.7</version>
<version>1.3.0</version>
</plugin>
</plugins>

2
spring-vault-core/pom.xml
View File

@@ -286,7 +286,7 @@
<dependency>
<groupId>io.mockk</groupId>
<artifactId>mockk</artifactId>
<artifactId>mockk-jvm</artifactId>
<scope>test</scope>
</dependency>

6
spring-vault-core/src/main/java/org/springframework/vault/authentication/GcpIamAuthentication.java
View File

@@ -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}.
*/

18
spring-vault-dependencies/pom.xml
View File

@@ -59,14 +59,14 @@
<properties>
<httpclient.version>5.1.3</httpclient.version>
<httpcore.version>5.1.4</httpcore.version>
<jetty-reactive-httpclient.version>3.0.6</jetty-reactive-httpclient.version>
<netty.version>4.1.79.Final</netty.version>
<jetty-reactive-httpclient.version>3.0.7</jetty-reactive-httpclient.version>
<netty.version>4.1.85.Final</netty.version>
<okhttp3.version>3.14.9</okhttp3.version>
<jackson-databind.version>2.13.4.2</jackson-databind.version>
<aws-java-sdk.version>2.17.232</aws-java-sdk.version>
<google-api-services-iam.version>v1-rev20220526-1.32.1</google-api-services-iam.version>
<google-cloud-iamcredentials.version>2.3.0</google-cloud-iamcredentials.version>
<google-auth-library-oauth2-http.version>1.8.1</google-auth-library-oauth2-http.version>
<jackson-databind.version>2.14.0</jackson-databind.version>
<aws-java-sdk.version>2.18.18</aws-java-sdk.version>
<google-api-services-iam.version>v1-rev20221013-2.0.0</google-api-services-iam.version>
<google-cloud-iamcredentials.version>2.6.0</google-cloud-iamcredentials.version>
<google-auth-library-oauth2-http.version>1.13.0</google-auth-library-oauth2-http.version>
<bcpkix-jdk15on.version>1.70</bcpkix-jdk15on.version>
</properties>
@@ -183,7 +183,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<version>3.4.1</version>
<executions>
<execution>
<goals>
@@ -196,7 +196,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.7</version>
<version>1.3.0</version>
<inherited>false</inherited>
<executions>
<execution>