diff --git a/pom.xml b/pom.xml index c41bfacd..48bdfc46 100644 --- a/pom.xml +++ b/pom.xml @@ -4,9 +4,9 @@ 4.0.0 org.springframework.cloud - spring-cloud-vault-config + spring-cloud-vault-config-parent 1.0.0.BUILD-SNAPSHOT - jar + pom spring-cloud-vault-config Configuration Integration with Hashicorp Vault @@ -19,110 +19,10 @@ - - UTF-8 - 1.7 - 4.5.2 - 4.4.4 - 4.1.0.Final - 2.7.5 - - - - - org.springframework.boot - spring-boot-starter-actuator - true - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.cloud - spring-cloud-context - 1.1.0.BUILD-SNAPSHOT - - - org.projectlombok - lombok - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-starter-jdbc - test - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - true - - - commons-logging - commons-logging - - - - - - org.apache.httpcomponents - httpcore - ${httpcore.version} - true - - - - io.netty - netty-all - ${netty.version} - true - - - - com.squareup.okhttp - okhttp - ${okhttp.version} - true - - - - com.h2database - h2 - test - - - org.assertj - assertj-core - 3.3.0 - test - - - mysql - mysql-connector-java - 5.1.38 - test - - - org.postgresql - postgresql - 9.4.1208.jre7 - test - - - com.datastax.cassandra - cassandra-driver-core - 2.1.10 - test - - + + spring-cloud-vault-config + docs + diff --git a/spring-cloud-vault-config/pom.xml b/spring-cloud-vault-config/pom.xml new file mode 100644 index 00000000..68cc9505 --- /dev/null +++ b/spring-cloud-vault-config/pom.xml @@ -0,0 +1,145 @@ + + + 4.0.0 + + org.springframework.cloud + spring-cloud-vault-config + 1.0.0.BUILD-SNAPSHOT + jar + + spring-cloud-vault-config + Configuration Integration with Hashicorp Vault + + + org.springframework.cloud + spring-cloud-vault-config-parent + 1.0.1.BUILD-SNAPSHOT + .. + + + + UTF-8 + 1.7 + 4.5.2 + 4.4.4 + 4.1.0.Final + 2.7.5 + + + + + org.springframework.boot + spring-boot-starter-actuator + true + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.cloud + spring-cloud-context + 1.1.0.BUILD-SNAPSHOT + + + org.projectlombok + lombok + provided + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-jdbc + test + + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + true + + + commons-logging + commons-logging + + + + + + org.apache.httpcomponents + httpcore + ${httpcore.version} + true + + + + io.netty + netty-all + ${netty.version} + true + + + + com.squareup.okhttp + okhttp + ${okhttp.version} + true + + + + com.h2database + h2 + test + + + org.assertj + assertj-core + 3.3.0 + test + + + mysql + mysql-connector-java + 5.1.38 + test + + + org.postgresql + postgresql + 9.4.1208.jre7 + test + + + com.datastax.cassandra + cassandra-driver-core + 2.1.10 + test + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + diff --git a/src/main/java/org/springframework/cloud/vault/AppIdUserIdMechanism.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/AppIdUserIdMechanism.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/AppIdUserIdMechanism.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/AppIdUserIdMechanism.java diff --git a/src/main/java/org/springframework/cloud/vault/ClientHttpRequestFactoryFactory.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/ClientHttpRequestFactoryFactory.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/ClientHttpRequestFactoryFactory.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/ClientHttpRequestFactoryFactory.java diff --git a/src/main/java/org/springframework/cloud/vault/IpAddressUserId.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/IpAddressUserId.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/IpAddressUserId.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/IpAddressUserId.java diff --git a/src/main/java/org/springframework/cloud/vault/MacAddressUserId.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/MacAddressUserId.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/MacAddressUserId.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/MacAddressUserId.java diff --git a/src/main/java/org/springframework/cloud/vault/MyUserIdMechanism.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/MyUserIdMechanism.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/MyUserIdMechanism.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/MyUserIdMechanism.java diff --git a/src/main/java/org/springframework/cloud/vault/SecureBackendAccessor.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/SecureBackendAccessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/SecureBackendAccessor.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/SecureBackendAccessor.java diff --git a/src/main/java/org/springframework/cloud/vault/SecureBackendAccessors.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/SecureBackendAccessors.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/SecureBackendAccessors.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/SecureBackendAccessors.java diff --git a/src/main/java/org/springframework/cloud/vault/Sha256.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/Sha256.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/Sha256.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/Sha256.java diff --git a/src/main/java/org/springframework/cloud/vault/StaticUserId.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/StaticUserId.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/StaticUserId.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/StaticUserId.java diff --git a/src/main/java/org/springframework/cloud/vault/VaultBootstrapConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultBootstrapConfiguration.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/VaultBootstrapConfiguration.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultBootstrapConfiguration.java diff --git a/src/main/java/org/springframework/cloud/vault/VaultClient.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultClient.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/VaultClient.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultClient.java diff --git a/src/main/java/org/springframework/cloud/vault/VaultProperties.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultProperties.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/VaultProperties.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultProperties.java diff --git a/src/main/java/org/springframework/cloud/vault/VaultPropertySource.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultPropertySource.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/VaultPropertySource.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultPropertySource.java diff --git a/src/main/java/org/springframework/cloud/vault/VaultPropertySourceLocator.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultPropertySourceLocator.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/VaultPropertySourceLocator.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultPropertySourceLocator.java diff --git a/src/main/java/org/springframework/cloud/vault/VaultResponse.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultResponse.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/VaultResponse.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultResponse.java diff --git a/src/main/java/org/springframework/cloud/vault/VaultState.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultState.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/VaultState.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultState.java diff --git a/src/main/java/org/springframework/cloud/vault/VaultToken.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultToken.java similarity index 100% rename from src/main/java/org/springframework/cloud/vault/VaultToken.java rename to spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/VaultToken.java diff --git a/src/main/resources/META-INF/spring.factories b/spring-cloud-vault-config/src/main/resources/META-INF/spring.factories similarity index 100% rename from src/main/resources/META-INF/spring.factories rename to spring-cloud-vault-config/src/main/resources/META-INF/spring.factories diff --git a/src/test/bash/create_certificates.sh b/spring-cloud-vault-config/src/test/bash/create_certificates.sh similarity index 100% rename from src/test/bash/create_certificates.sh rename to spring-cloud-vault-config/src/test/bash/create_certificates.sh diff --git a/src/test/bash/env.sh b/spring-cloud-vault-config/src/test/bash/env.sh similarity index 100% rename from src/test/bash/env.sh rename to spring-cloud-vault-config/src/test/bash/env.sh diff --git a/src/test/bash/install_vault.sh b/spring-cloud-vault-config/src/test/bash/install_vault.sh similarity index 100% rename from src/test/bash/install_vault.sh rename to spring-cloud-vault-config/src/test/bash/install_vault.sh diff --git a/src/test/bash/local_run_vault.sh b/spring-cloud-vault-config/src/test/bash/local_run_vault.sh similarity index 100% rename from src/test/bash/local_run_vault.sh rename to spring-cloud-vault-config/src/test/bash/local_run_vault.sh diff --git a/src/test/bash/openssl.cnf b/spring-cloud-vault-config/src/test/bash/openssl.cnf similarity index 100% rename from src/test/bash/openssl.cnf rename to spring-cloud-vault-config/src/test/bash/openssl.cnf diff --git a/src/test/java/org/springframework/cloud/vault/AbstractIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/AbstractIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/AbstractIntegrationTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/AbstractIntegrationTests.java diff --git a/src/test/java/org/springframework/cloud/vault/AppIdAuthenticationIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/AppIdAuthenticationIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/AppIdAuthenticationIntegrationTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/AppIdAuthenticationIntegrationTests.java diff --git a/src/test/java/org/springframework/cloud/vault/AppIdAuthenticationMethodsIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/AppIdAuthenticationMethodsIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/AppIdAuthenticationMethodsIntegrationTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/AppIdAuthenticationMethodsIntegrationTests.java diff --git a/src/test/java/org/springframework/cloud/vault/CassandraSecretIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/CassandraSecretIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/CassandraSecretIntegrationTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/CassandraSecretIntegrationTests.java diff --git a/src/test/java/org/springframework/cloud/vault/ClientHttpRequestFactoryFactoryIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/ClientHttpRequestFactoryFactoryIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/ClientHttpRequestFactoryFactoryIntegrationTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/ClientHttpRequestFactoryFactoryIntegrationTests.java diff --git a/src/test/java/org/springframework/cloud/vault/GenericSecretIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/GenericSecretIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/GenericSecretIntegrationTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/GenericSecretIntegrationTests.java diff --git a/src/test/java/org/springframework/cloud/vault/MySqlSecretIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/MySqlSecretIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/MySqlSecretIntegrationTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/MySqlSecretIntegrationTests.java diff --git a/src/test/java/org/springframework/cloud/vault/PostgreSqlSecretIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/PostgreSqlSecretIntegrationTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/PostgreSqlSecretIntegrationTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/PostgreSqlSecretIntegrationTests.java diff --git a/src/test/java/org/springframework/cloud/vault/PrepareVaultTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/PrepareVaultTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/PrepareVaultTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/PrepareVaultTests.java diff --git a/src/test/java/org/springframework/cloud/vault/TestRestTemplateFactory.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/TestRestTemplateFactory.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/TestRestTemplateFactory.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/TestRestTemplateFactory.java diff --git a/src/test/java/org/springframework/cloud/vault/VaultAppIdCustomMechanismTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/VaultAppIdCustomMechanismTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/VaultAppIdCustomMechanismTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/VaultAppIdCustomMechanismTests.java diff --git a/src/test/java/org/springframework/cloud/vault/configclient/ApplicationFailFastTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/configclient/ApplicationFailFastTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/configclient/ApplicationFailFastTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/configclient/ApplicationFailFastTests.java diff --git a/src/test/java/org/springframework/cloud/vault/configclient/VaultAppIdTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/configclient/VaultAppIdTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/configclient/VaultAppIdTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/configclient/VaultAppIdTests.java diff --git a/src/test/java/org/springframework/cloud/vault/configclient/VaultCassandraTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/configclient/VaultCassandraTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/configclient/VaultCassandraTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/configclient/VaultCassandraTests.java diff --git a/src/test/java/org/springframework/cloud/vault/configclient/VaultMySqlTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/configclient/VaultMySqlTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/configclient/VaultMySqlTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/configclient/VaultMySqlTests.java diff --git a/src/test/java/org/springframework/cloud/vault/configclient/VaultPostgreSqlTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/configclient/VaultPostgreSqlTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/configclient/VaultPostgreSqlTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/configclient/VaultPostgreSqlTests.java diff --git a/src/test/java/org/springframework/cloud/vault/configclient/VaultTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/configclient/VaultTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/configclient/VaultTests.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/configclient/VaultTests.java diff --git a/src/test/java/org/springframework/cloud/vault/util/CanConnect.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/CanConnect.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/util/CanConnect.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/CanConnect.java diff --git a/src/test/java/org/springframework/cloud/vault/util/PrepareVault.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/PrepareVault.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/util/PrepareVault.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/PrepareVault.java diff --git a/src/test/java/org/springframework/cloud/vault/util/Settings.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/util/Settings.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java diff --git a/src/test/java/org/springframework/cloud/vault/util/VaultRule.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java similarity index 100% rename from src/test/java/org/springframework/cloud/vault/util/VaultRule.java rename to spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java diff --git a/src/test/resources/META-INF/spring.factories b/spring-cloud-vault-config/src/test/resources/META-INF/spring.factories similarity index 100% rename from src/test/resources/META-INF/spring.factories rename to spring-cloud-vault-config/src/test/resources/META-INF/spring.factories diff --git a/src/test/resources/bootstrap.yml b/spring-cloud-vault-config/src/test/resources/bootstrap.yml similarity index 100% rename from src/test/resources/bootstrap.yml rename to spring-cloud-vault-config/src/test/resources/bootstrap.yml diff --git a/src/test/resources/cassandra.yaml b/spring-cloud-vault-config/src/test/resources/cassandra.yaml similarity index 100% rename from src/test/resources/cassandra.yaml rename to spring-cloud-vault-config/src/test/resources/cassandra.yaml diff --git a/src/test/resources/vault.conf b/spring-cloud-vault-config/src/test/resources/vault.conf similarity index 100% rename from src/test/resources/vault.conf rename to spring-cloud-vault-config/src/test/resources/vault.conf