From af5c531d20c5fcc1d04d00cd3266e60a85fb2d78 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Tue, 31 Jan 2023 13:49:00 +0100
Subject: [PATCH] Inline dependencies artifact.

Closes gh-749
---
 pom.xml | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 106 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index a32ce826..d1c5126c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,25 +15,38 @@
 	<url>https://projects.spring.io/spring-vault/</url>
 
 	<modules>
-		<module>spring-vault-dependencies</module>
 		<module>spring-vault-core</module>
 		<module>spring-vault-distribution</module>
 	</modules>
 
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<assertj-core.version>3.23.1</assertj-core.version>
+		<aws-java-sdk.version>2.18.24</aws-java-sdk.version>
+		<bcpkix-jdk15on.version>1.70</bcpkix-jdk15on.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>
+		<httpclient.version>5.1.3</httpclient.version>
+		<httpcore.version>5.1.4</httpcore.version>
+		<jackson-databind.version>2.14.2</jackson-databind.version>
+		<jetty-reactive-httpclient.version>3.0.7</jetty-reactive-httpclient.version>
 		<json-path.version>2.7.0</json-path.version>
 		<junit.version>5.9.2</junit.version>
 		<kotlin.version>1.7.21</kotlin.version>
 		<kotlin-coroutines.version>1.6.4</kotlin-coroutines.version>
 		<mockk.version>1.13.4</mockk.version>
 		<mockito-core.version>4.9.0</mockito-core.version>
+		<netty.version>4.1.87.Final</netty.version>
+		<okhttp3.version>3.14.9</okhttp3.version>
 		<spring.version>6.0.4</spring.version>
 		<spring-asciidoctor-backends.version>0.0.4</spring-asciidoctor-backends.version>
 		<spring-data-bom.version>2022.0.1</spring-data-bom.version>
 		<spring-security-bom.version>6.0.1</spring-security-bom.version>
 		<reactor.version>2022.0.2</reactor.version>
+
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>17</java.version>
 		<project.type>multi</project.type>
 		<dist.id>spring-vault</dist.id>
@@ -66,11 +79,6 @@
 		<url>https://github.com/spring-projects/spring-vault/issues</url>
 	</issueManagement>
 
-	<ciManagement>
-		<system>Bamboo</system>
-		<url>https://build.spring.io/browse/SPRINGVAULT-VAULT</url>
-	</ciManagement>
-
 	<developers>
 		<developer>
 			<id>sgibb</id>
@@ -109,11 +117,9 @@
 		<dependencies>
 
 			<dependency>
-				<groupId>org.springframework.vault</groupId>
-				<artifactId>spring-vault-dependencies</artifactId>
-				<version>3.1.0-SNAPSHOT</version>
-				<scope>import</scope>
-				<type>pom</type>
+				<groupId>com.fasterxml.jackson.core</groupId>
+				<artifactId>jackson-databind</artifactId>
+				<version>${jackson-databind.version}</version>
 			</dependency>
 
 			<dependency>
@@ -172,6 +178,94 @@
 				<scope>import</scope>
 			</dependency>
 
+			<!-- HTTP Client Libraries -->
+			<dependency>
+				<groupId>org.apache.httpcomponents.client5</groupId>
+				<artifactId>httpclient5</artifactId>
+				<version>${httpclient.version}</version>
+				<optional>true</optional>
+				<exclusions>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.httpcomponents.core5</groupId>
+				<artifactId>httpcore5</artifactId>
+				<version>${httpcore.version}</version>
+				<optional>true</optional>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.httpcomponents.core5</groupId>
+				<artifactId>httpcore5-reactive</artifactId>
+				<version>${httpcore.version}</version>
+				<optional>true</optional>
+			</dependency>
+
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-reactive-httpclient</artifactId>
+				<version>${jetty-reactive-httpclient.version}</version>
+				<optional>true</optional>
+			</dependency>
+
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>${netty.version}</version>
+				<optional>true</optional>
+			</dependency>
+
+			<dependency>
+				<groupId>com.squareup.okhttp3</groupId>
+				<artifactId>okhttp</artifactId>
+				<version>${okhttp3.version}</version>
+				<optional>true</optional>
+			</dependency>
+
+			<!-- AWS SDK -->
+			<dependency>
+				<groupId>software.amazon.awssdk</groupId>
+				<artifactId>auth</artifactId>
+				<version>${aws-java-sdk.version}</version>
+				<optional>true</optional>
+			</dependency>
+
+			<!-- GCP SDK -->
+			<dependency>
+				<groupId>com.google.apis</groupId>
+				<artifactId>google-api-services-iam</artifactId>
+				<version>${google-api-services-iam.version}</version>
+				<optional>true</optional>
+			</dependency>
+
+			<dependency>
+				<groupId>com.google.cloud</groupId>
+				<artifactId>google-cloud-iamcredentials</artifactId>
+				<version>${google-cloud-iamcredentials.version}</version>
+				<optional>true</optional>
+			</dependency>
+
+			<dependency>
+				<groupId>com.google.auth</groupId>
+				<artifactId>google-auth-library-oauth2-http</artifactId>
+				<version>${google-auth-library-oauth2-http.version}</version>
+				<optional>true</optional>
+			</dependency>
+
+			<!-- BouncyCastle -->
+
+			<dependency>
+				<groupId>org.bouncycastle</groupId>
+				<artifactId>bcpkix-jdk15on</artifactId>
+				<version>${bcpkix-jdk15on.version}</version>
+				<optional>true</optional>
+			</dependency>
+
 			<!-- Testing -->
 
 			<dependency>