From 9dcdf20c6e52adc172551d381b378f71529bcbc2 Mon Sep 17 00:00:00 2001 From: Abel Salgado Romero Date: Thu, 22 Dec 2022 09:57:33 +0100 Subject: [PATCH 1/6] Bump Maven plugins --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2afa54c..08765f8 100644 --- a/pom.xml +++ b/pom.xml @@ -38,9 +38,9 @@ 2.3.3.RELEASE - 3.8.1 + 3.10.1 3.2.1 - 2.22.2 + 3.0.0-M7 3.0.1 3.4.1 From 909f3b5e0d02dec638df802bcff2e257a88f9e32 Mon Sep 17 00:00:00 2001 From: Abel Salgado Romero Date: Thu, 22 Dec 2022 09:58:43 +0100 Subject: [PATCH 2/6] Bump r2dbc-mariadb to 1.1.2 (fixes CVEs) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 08765f8..2f9aa08 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 1.8 3.0.2 - 1.0.3 + 1.1.2 2.3.3.RELEASE From 874b54b4b615ea060719599a4a7d6884599d9e8d Mon Sep 17 00:00:00 2001 From: Anthony Dahanne Date: Mon, 13 Feb 2023 14:25:29 -0500 Subject: [PATCH 3/6] Bump to latest 2.5 spring boot release Contains feedback from @Kehrlann Original commit by @abelsromero - amended to keep compatibility with Spring Boot 2 Add integration tests * use Maven modules to do so * spring-cloud-bindings goes one level down * addition of a spring-cloud-bindings parent Inspired by @gregturn and spring-data-rest Integrate PR#94 comments from @Kehrlann * move bindings to src/test/resources * get rid of unused / duplicate annotations * move all dependencies to test scope for test projects Spring Boot 2 support * only in branch 1.x, SB3 support is in main branch --- pom.xml | 187 ++--------------- spring-cloud-bindings-tests/README.md | 23 +++ spring-cloud-bindings-tests/pom.xml | 71 +++++++ .../cloud/IntegrationTest.java | 21 ++ .../cloud/RedisServerTestConfiguration.java | 33 +++ .../cloud/SpringBoot2Application.java | 7 + .../src/test/resources/bindings/redis/host | 1 + .../src/test/resources/bindings/redis/port | 1 + .../src/test/resources/bindings/redis/type | 1 + spring-cloud-bindings/pom.xml | 188 ++++++++++++++++++ .../cloud/bindings/Binding.java | 0 .../cloud/bindings/Bindings.java | 0 .../ArtemisBindingsPropertiesProcessor.java | 0 ...dingFlattenedEnvironmentPostProcessor.java | 4 +- ...ndingSpecificEnvironmentPostProcessor.java | 4 +- .../boot/BindingsPropertiesProcessor.java | 0 .../CassandraBindingsPropertiesProcessor.java | 0 ...nfigServerBindingsPropertiesProcessor.java | 0 .../CouchbaseBindingsPropertiesProcessor.java | 0 .../boot/Db2BindingsPropertiesProcessor.java | 0 ...sticsearchBindingsPropertiesProcessor.java | 0 .../EurekaBindingsPropertiesProcessor.java | 0 .../cloud/bindings/boot/Guards.java | 0 .../KafkaBindingsPropertiesProcessor.java | 0 .../boot/LDAPBindingsPropertiesProcessor.java | 0 .../cloud/bindings/boot/MapMapper.java | 0 .../MongoDbBindingsPropertiesProcessor.java | 0 .../MySqlBindingsPropertiesProcessor.java | 0 .../Neo4JBindingsPropertiesProcessor.java | 0 .../OracleBindingsPropertiesProcessor.java | 0 ...PostgreSqlBindingsPropertiesProcessor.java | 0 .../boot/PropertySourceContributor.java | 0 .../RabbitMqBindingsPropertiesProcessor.java | 0 .../RedisBindingsPropertiesProcessor.java | 0 .../SapHanaBindingsPropertiesProcessor.java | 0 ...rityOAuth2BindingsPropertiesProcessor.java | 0 .../SqlServerBindingsPropertiesProcessor.java | 0 .../VaultBindingsPropertiesProcessor.java | 0 .../WavefrontBindingsPropertiesProcessor.java | 0 .../cloud/bindings/boot/package-info.java | 0 .../boot/pem/PemCertificateParser.java | 0 .../cloud/bindings/boot/pem/PemContent.java | 0 .../boot/pem/PemPrivateKeyParser.java | 0 .../bindings/boot/pem/PemSslStoreHelper.java | 0 .../cloud/bindings/boot/pem/package-info.java | 0 .../cloud/bindings/package-info.java | 0 .../main/resources/META-INF/spring.factories | 0 .../cloud/bindings/BindingTest.java | 0 .../cloud/bindings/BindingsTest.java | 0 .../cloud/bindings/FluentMap.java | 0 ...rtemisBindingsPropertiesProcessorTest.java | 0 ...FlattenedEnvironmentPostProcessorTest.java | 4 +- ...gSpecificEnvironmentPostProcessorTest.java | 4 +- ...sandraBindingsPropertiesProcessorTest.java | 0 ...ServerBindingsPropertiesProcessorTest.java | 0 ...chbaseBindingsPropertiesProcessorTest.java | 0 .../Db2BindingsPropertiesProcessorTest.java | 0 ...searchBindingsPropertiesProcessorTest.java | 0 ...EurekaBindingsPropertiesProcessorTest.java | 0 .../cloud/bindings/boot/GuardsTest.java | 0 .../KafkaBindingsPropertiesProcessorTest.java | 0 .../LDAPBindingsPropertiesProcessorTest.java | 0 .../cloud/bindings/boot/MapMapperTest.java | 0 ...ongoDbBindingsPropertiesProcessorTest.java | 0 .../MySqlBindingsPropertiesProcessorTest.java | 0 .../Neo4JBindingsPropertiesProcessorTest.java | 0 ...OracleBindingsPropertiesProcessorTest.java | 0 ...greSqlBindingsPropertiesProcessorTest.java | 0 .../boot/PropertySourceContributorTest.java | 0 ...bbitMqBindingsPropertiesProcessorTest.java | 0 .../RedisBindingsPropertiesProcessorTest.java | 0 ...apHanaBindingsPropertiesProcessorTest.java | 0 ...OAuth2BindingsPropertiesProcessorTest.java | 0 ...ServerBindingsPropertiesProcessorTest.java | 0 .../cloud/bindings/boot/TestHelper.java | 0 .../VaultBindingsPropertiesProcessorTest.java | 0 ...efrontBindingsPropertiesProcessorTest.java | 0 .../boot/pem/PemCertificateParserTests.java | 0 .../bindings/boot/pem/PemContentTests.java | 0 .../boot/pem/PemPrivateKeyParserTests.java | 0 .../boot/pem/PemSslStoreHelperTests.java | 0 .../cnb/test-k8s/metadata/.hidden-data | 0 .../cnb/test-k8s/metadata/.hidden-data-1/kind | 0 .../test-k8s/metadata/.hidden-data-1/provider | 0 .../metadata/.hidden-data-1/test-metadata-key | 0 .../test/resources/cnb/test-k8s/metadata/kind | 0 .../resources/cnb/test-k8s/metadata/provider | 0 .../cnb/test-k8s/metadata/test-metadata-key | 0 .../cnb/test-k8s/secret/.hidden-data | 0 .../secret/.hidden-data-1/test-secret-key | 0 .../cnb/test-k8s/secret/test-secret-key | 0 .../resources/cnb/test-name-1/metadata/kind | 0 .../cnb/test-name-1/metadata/provider | 0 .../test-name-1/metadata/test-metadata-key | 0 .../cnb/test-name-1/secret/test-secret-key | 0 .../resources/cnb/test-name-2/metadata/kind | 0 .../cnb/test-name-2/metadata/provider | 0 .../test-name-2/metadata/test-metadata-key | 0 .../cnb/test-name-2/secret/test-secret-key | 0 .../test/resources/k8s/test-k8s/.hidden-data | 0 .../k8s/test-k8s/.hidden-data-1/provider | 0 .../test-k8s/.hidden-data-1/test-secret-key | 0 .../k8s/test-k8s/.hidden-data-1/type | 0 .../src}/test/resources/k8s/test-k8s/provider | 0 .../resources/k8s/test-k8s/test-secret-key | 0 .../src}/test/resources/k8s/test-k8s/type | 0 .../test/resources/k8s/test-name-1/provider | 0 .../resources/k8s/test-name-1/test-secret-key | 0 .../src}/test/resources/k8s/test-name-1/type | 0 .../test/resources/k8s/test-name-2/provider | 0 .../resources/k8s/test-name-2/test-secret-key | 0 .../src}/test/resources/k8s/test-name-2/type | 0 .../src}/test/resources/pem/test-banner.txt | 0 .../test/resources/pem/test-cert-chain.pem | 0 .../src}/test/resources/pem/test-cert.pem | 0 .../src}/test/resources/pem/test-ec-key.pem | 0 .../src}/test/resources/pem/test-key.pem | 0 117 files changed, 376 insertions(+), 173 deletions(-) create mode 100644 spring-cloud-bindings-tests/README.md create mode 100644 spring-cloud-bindings-tests/pom.xml create mode 100644 spring-cloud-bindings-tests/src/test/java/org/springframework/cloud/IntegrationTest.java create mode 100644 spring-cloud-bindings-tests/src/test/java/org/springframework/cloud/RedisServerTestConfiguration.java create mode 100644 spring-cloud-bindings-tests/src/test/java/org/springframework/cloud/SpringBoot2Application.java create mode 100644 spring-cloud-bindings-tests/src/test/resources/bindings/redis/host create mode 100644 spring-cloud-bindings-tests/src/test/resources/bindings/redis/port create mode 100644 spring-cloud-bindings-tests/src/test/resources/bindings/redis/type create mode 100644 spring-cloud-bindings/pom.xml rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/Binding.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/Bindings.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/ArtemisBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessor.java (95%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessor.java (96%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/BindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/ConfigServerBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/CouchbaseBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/ElasticsearchBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/EurekaBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/Guards.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/KafkaBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/LDAPBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/MapMapper.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/Neo4JBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/PropertySourceContributor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/RabbitMqBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/SapHanaBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/SpringSecurityOAuth2BindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/VaultBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessor.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/package-info.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/pem/PemCertificateParser.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/pem/PemContent.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/pem/PemPrivateKeyParser.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/pem/PemSslStoreHelper.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/boot/pem/package-info.java (100%) rename {src => spring-cloud-bindings/src}/main/java/org/springframework/cloud/bindings/package-info.java (100%) rename {src => spring-cloud-bindings/src}/main/resources/META-INF/spring.factories (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/BindingTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/BindingsTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/FluentMap.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/ArtemisBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessorTest.java (95%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessorTest.java (96%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/ConfigServerBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/CouchbaseBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/ElasticsearchBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/EurekaBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/GuardsTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/KafkaBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/LDAPBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/MapMapperTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/Neo4JBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/PropertySourceContributorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/RabbitMqBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/SapHanaBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/SpringSecurityOAuth2BindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/TestHelper.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/VaultBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessorTest.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/pem/PemCertificateParserTests.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/pem/PemContentTests.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/pem/PemPrivateKeyParserTests.java (100%) rename {src => spring-cloud-bindings/src}/test/java/org/springframework/cloud/bindings/boot/pem/PemSslStoreHelperTests.java (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-k8s/metadata/.hidden-data (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-k8s/metadata/.hidden-data-1/kind (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-k8s/metadata/.hidden-data-1/provider (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-k8s/metadata/.hidden-data-1/test-metadata-key (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-k8s/metadata/kind (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-k8s/metadata/provider (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-k8s/metadata/test-metadata-key (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-k8s/secret/.hidden-data (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-k8s/secret/.hidden-data-1/test-secret-key (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-k8s/secret/test-secret-key (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-name-1/metadata/kind (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-name-1/metadata/provider (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-name-1/metadata/test-metadata-key (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-name-1/secret/test-secret-key (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-name-2/metadata/kind (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-name-2/metadata/provider (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-name-2/metadata/test-metadata-key (100%) rename {src => spring-cloud-bindings/src}/test/resources/cnb/test-name-2/secret/test-secret-key (100%) rename {src => spring-cloud-bindings/src}/test/resources/k8s/test-k8s/.hidden-data (100%) rename {src => spring-cloud-bindings/src}/test/resources/k8s/test-k8s/.hidden-data-1/provider (100%) rename {src => spring-cloud-bindings/src}/test/resources/k8s/test-k8s/.hidden-data-1/test-secret-key (100%) rename {src => spring-cloud-bindings/src}/test/resources/k8s/test-k8s/.hidden-data-1/type (100%) rename {src => spring-cloud-bindings/src}/test/resources/k8s/test-k8s/provider (100%) rename {src => spring-cloud-bindings/src}/test/resources/k8s/test-k8s/test-secret-key (100%) rename {src => spring-cloud-bindings/src}/test/resources/k8s/test-k8s/type (100%) rename {src => spring-cloud-bindings/src}/test/resources/k8s/test-name-1/provider (100%) rename {src => spring-cloud-bindings/src}/test/resources/k8s/test-name-1/test-secret-key (100%) rename {src => spring-cloud-bindings/src}/test/resources/k8s/test-name-1/type (100%) rename {src => spring-cloud-bindings/src}/test/resources/k8s/test-name-2/provider (100%) rename {src => spring-cloud-bindings/src}/test/resources/k8s/test-name-2/test-secret-key (100%) rename {src => spring-cloud-bindings/src}/test/resources/k8s/test-name-2/type (100%) rename {src => spring-cloud-bindings/src}/test/resources/pem/test-banner.txt (100%) rename {src => spring-cloud-bindings/src}/test/resources/pem/test-cert-chain.pem (100%) rename {src => spring-cloud-bindings/src}/test/resources/pem/test-cert.pem (100%) rename {src => spring-cloud-bindings/src}/test/resources/pem/test-ec-key.pem (100%) rename {src => spring-cloud-bindings/src}/test/resources/pem/test-key.pem (100%) diff --git a/pom.xml b/pom.xml index 2f9aa08..cd68764 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,23 @@ 4.0.0 org.springframework.cloud - spring-cloud-bindings + spring-cloud-bindings-parent 1.13.0-SNAPSHOT + pom - Spring Cloud Cloud Native Buildpacks Bindings + Spring Cloud Cloud Native Buildpacks Bindings Parent Java Library and Auto-configuration for Cloud Native Buildpack Bindings https://github.com/spring-cloud/spring-cloud-bindings + + 1.8 + 2.5.15 + ${java.version} + ${java.version} + UTF-8 + UTF-8 + + Apache License, Version 2.0 @@ -19,173 +29,20 @@ + + spring-cloud-bindings + spring-cloud-bindings-tests + + https://github.com/spring-cloud/spring-cloud-bindings - - scb-team - Spring Cloud Bindings Team - https://github.com/spring-cloud/spring-cloud-bindings/graphs/contributors - + + scb-team + Spring Cloud Bindings Team + https://github.com/spring-cloud/spring-cloud-bindings/graphs/contributors + - - - 1.8 - 3.0.2 - 1.1.2 - 2.3.3.RELEASE - - - 3.10.1 - 3.2.1 - 3.0.0-M7 - 3.0.1 - 3.4.1 - - ${java.version} - ${java.version} - UTF-8 - UTF-8 - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - - - - com.google.code.findbugs - jsr305 - ${jsr305.version} - provided - - - org.springframework.boot - spring-boot-starter - provided - - - - org.mariadb.jdbc - mariadb-java-client - test - - - org.mariadb - r2dbc-mariadb - ${mariadb-r2dbc.version} - test - - - org.mockito - mockito-core - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - - -Werror - -Xlint:all - -Xlint:-options - -Xlint:-processing - -Xlint:-serial - - true - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - true - 1.8 - - - NonNullApi - X - - - - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven-gpg-plugin.version} - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - random - - - - - diff --git a/spring-cloud-bindings-tests/README.md b/spring-cloud-bindings-tests/README.md new file mode 100644 index 0000000..0f1faf3 --- /dev/null +++ b/spring-cloud-bindings-tests/README.md @@ -0,0 +1,23 @@ +# Spring Cloud Bindings Test Boot 2 + +## Purpose of this module + +For several Spring Cloud Bindings integrations, the properties bindings need to be different between Spring Boot 2 and Spring Boot 3. + +For example, we can take some Redis properties bindings; with Spring Boot 2, they need to be mapped this way: + +| Property | Value | +|---------------------|----------| +| `spring.redis.port` | `{port}` | +| `spring.redis.host` | `{host}` | + +But in a Spring Boot 3 application, the mapping needs to be different because of changes with Spring Data Redis: + +| Property | Value | +|--------------------------|----------| +| `spring.data.redis.port` | `{port}` | +| `spring.data.redis.host` | `{host}` | + +This module runs an application, based on Spring Boot 2, and checks whether the `RedisConnectionFactory` properly picked up the `spring.redis.port` and `spring.redis.host` values. + +Pay attention to the 2 environment variables set in the `pom.xml` that set the `JAVA_TOOL_OPTIONS` and `SERVICE_BINDING_ROOT` - they allow Spring Boot Bindings to load the proper configuration in `bindings/redis` \ No newline at end of file diff --git a/spring-cloud-bindings-tests/pom.xml b/spring-cloud-bindings-tests/pom.xml new file mode 100644 index 0000000..329c6db --- /dev/null +++ b/spring-cloud-bindings-tests/pom.xml @@ -0,0 +1,71 @@ + + + 4.0.0 + + org.springframework.cloud + spring-cloud-bindings-parent + 1.13.0-SNAPSHOT + ../pom.xml + + spring-cloud-bindings-tests + Test project to verify Spring Cloud Bindings works properly with Spring Boot 2 + + + org.springframework.boot + spring-boot-starter + ${spring-boot.version} + test + + + org.springframework.boot + spring-boot-starter-data-redis + ${spring-boot.version} + test + + + org.springframework.cloud + spring-cloud-bindings + ${version} + test + + + org.springframework.boot + spring-boot-starter-test + ${spring-boot.version} + test + + + com.github.kstyrc + embedded-redis + 0.6 + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + 1 + false + + -Dorg.springframework.cloud.bindings.boot.enable=true + ${basedir}/src/test/resources/bindings + + -Xmx1024m + + + + + + + diff --git a/spring-cloud-bindings-tests/src/test/java/org/springframework/cloud/IntegrationTest.java b/spring-cloud-bindings-tests/src/test/java/org/springframework/cloud/IntegrationTest.java new file mode 100644 index 0000000..f48f1b7 --- /dev/null +++ b/spring-cloud-bindings-tests/src/test/java/org/springframework/cloud/IntegrationTest.java @@ -0,0 +1,21 @@ +package org.springframework.cloud; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.data.redis.core.RedisTemplate; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +@SpringBootTest(classes = RedisServerTestConfiguration.class) +public class IntegrationTest { + + @Autowired + private RedisTemplate redisTemplate; + + @Test + public void shouldSaveUser_toRedis() { + redisTemplate.opsForValue().set("hello", "world"); + assertTrue(redisTemplate.hasKey("hello")); + } +} diff --git a/spring-cloud-bindings-tests/src/test/java/org/springframework/cloud/RedisServerTestConfiguration.java b/spring-cloud-bindings-tests/src/test/java/org/springframework/cloud/RedisServerTestConfiguration.java new file mode 100644 index 0000000..fe3ba38 --- /dev/null +++ b/spring-cloud-bindings-tests/src/test/java/org/springframework/cloud/RedisServerTestConfiguration.java @@ -0,0 +1,33 @@ +package org.springframework.cloud; + +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.core.io.ClassPathResource; +import redis.embedded.RedisServer; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import java.io.IOException; +import java.util.Scanner; + +@TestConfiguration +public class RedisServerTestConfiguration { + + private final RedisServer redisServer; + + public RedisServerTestConfiguration() throws IOException { + try (Scanner scanner = new Scanner(new ClassPathResource("bindings/redis/port").getInputStream())) { + int port = scanner.nextInt(); + this.redisServer = new RedisServer(port); + } + } + + @PostConstruct + public void postConstruct() { + redisServer.start(); + } + + @PreDestroy + public void preDestroy() { + redisServer.stop(); + } +} \ No newline at end of file diff --git a/spring-cloud-bindings-tests/src/test/java/org/springframework/cloud/SpringBoot2Application.java b/spring-cloud-bindings-tests/src/test/java/org/springframework/cloud/SpringBoot2Application.java new file mode 100644 index 0000000..41e430a --- /dev/null +++ b/spring-cloud-bindings-tests/src/test/java/org/springframework/cloud/SpringBoot2Application.java @@ -0,0 +1,7 @@ +package org.springframework.cloud; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SpringBoot2Application { +} diff --git a/spring-cloud-bindings-tests/src/test/resources/bindings/redis/host b/spring-cloud-bindings-tests/src/test/resources/bindings/redis/host new file mode 100644 index 0000000..d18580b --- /dev/null +++ b/spring-cloud-bindings-tests/src/test/resources/bindings/redis/host @@ -0,0 +1 @@ +localhost \ No newline at end of file diff --git a/spring-cloud-bindings-tests/src/test/resources/bindings/redis/port b/spring-cloud-bindings-tests/src/test/resources/bindings/redis/port new file mode 100644 index 0000000..629d685 --- /dev/null +++ b/spring-cloud-bindings-tests/src/test/resources/bindings/redis/port @@ -0,0 +1 @@ +4242 \ No newline at end of file diff --git a/spring-cloud-bindings-tests/src/test/resources/bindings/redis/type b/spring-cloud-bindings-tests/src/test/resources/bindings/redis/type new file mode 100644 index 0000000..74b362f --- /dev/null +++ b/spring-cloud-bindings-tests/src/test/resources/bindings/redis/type @@ -0,0 +1 @@ +redis \ No newline at end of file diff --git a/spring-cloud-bindings/pom.xml b/spring-cloud-bindings/pom.xml new file mode 100644 index 0000000..80cf7a6 --- /dev/null +++ b/spring-cloud-bindings/pom.xml @@ -0,0 +1,188 @@ + + + + 4.0.0 + + + org.springframework.cloud + spring-cloud-bindings-parent + 1.13.0-SNAPSHOT + ../pom.xml + + + spring-cloud-bindings + Spring Cloud Cloud Native Buildpacks Bindings + Java Library and Auto-configuration for Cloud Native Buildpack Bindings + https://github.com/spring-cloud/spring-cloud-bindings + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + + https://github.com/spring-cloud/spring-cloud-bindings + + + + + scb-team + Spring Cloud Bindings Team + https://github.com/spring-cloud/spring-cloud-bindings/graphs/contributors + + + + + 3.0.2 + 1.1.2 + + + 3.10.1 + 3.2.1 + 3.0.0-M7 + 3.0.1 + 3.4.1 + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + + + + com.google.code.findbugs + jsr305 + ${jsr305.version} + provided + + + org.springframework.boot + spring-boot-starter + provided + + + + org.mariadb.jdbc + mariadb-java-client + test + + + org.mariadb + r2dbc-mariadb + ${mariadb-r2dbc.version} + test + + + org.mockito + mockito-core + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + -Werror + -Xlint:all + -Xlint:-options + -Xlint:-processing + -Xlint:-serial + + true + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + true + 1.8 + + + NonNullApi + X + + + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + random + + + + + diff --git a/src/main/java/org/springframework/cloud/bindings/Binding.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/Binding.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/Binding.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/Binding.java diff --git a/src/main/java/org/springframework/cloud/bindings/Bindings.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/Bindings.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/Bindings.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/Bindings.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/ArtemisBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/ArtemisBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/ArtemisBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/ArtemisBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessor.java similarity index 95% rename from src/main/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessor.java index 7f7d4a9..79399db 100644 --- a/src/main/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessor.java +++ b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessor.java @@ -17,7 +17,7 @@ package org.springframework.cloud.bindings.boot; import org.springframework.boot.SpringApplication; -import org.springframework.boot.context.config.ConfigFileApplicationListener; +import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor; import org.springframework.boot.context.event.ApplicationPreparedEvent; import org.springframework.boot.env.EnvironmentPostProcessor; import org.springframework.boot.logging.DeferredLog; @@ -59,7 +59,7 @@ public final class BindingFlattenedEnvironmentPostProcessor implements Applicati @Override public int getOrder() { // Before ConfigFileApplicationListener so values there can use values from {@link Bindings}. - return ConfigFileApplicationListener.DEFAULT_ORDER - 1; + return ConfigDataEnvironmentPostProcessor.ORDER - 1; } @Override diff --git a/src/main/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessor.java similarity index 96% rename from src/main/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessor.java index f02c588..03340c4 100644 --- a/src/main/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessor.java +++ b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessor.java @@ -17,7 +17,7 @@ package org.springframework.cloud.bindings.boot; import org.springframework.boot.SpringApplication; -import org.springframework.boot.context.config.ConfigFileApplicationListener; +import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor; import org.springframework.boot.context.event.ApplicationPreparedEvent; import org.springframework.boot.env.EnvironmentPostProcessor; import org.springframework.boot.logging.DeferredLog; @@ -77,7 +77,7 @@ public final class BindingSpecificEnvironmentPostProcessor implements Applicatio @Override public int getOrder() { // Before ConfigFileApplicationListener so values there can use values from {@link Bindings}. - return ConfigFileApplicationListener.DEFAULT_ORDER - 1; + return ConfigDataEnvironmentPostProcessor.ORDER - 1; } @Override diff --git a/src/main/java/org/springframework/cloud/bindings/boot/BindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/BindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/BindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/BindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/ConfigServerBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/ConfigServerBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/ConfigServerBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/ConfigServerBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/CouchbaseBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/CouchbaseBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/CouchbaseBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/CouchbaseBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/ElasticsearchBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/ElasticsearchBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/ElasticsearchBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/ElasticsearchBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/EurekaBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/EurekaBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/EurekaBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/EurekaBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/Guards.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/Guards.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/Guards.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/Guards.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/KafkaBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/KafkaBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/KafkaBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/KafkaBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/LDAPBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/LDAPBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/LDAPBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/LDAPBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/MapMapper.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/MapMapper.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/MapMapper.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/MapMapper.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/Neo4JBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/Neo4JBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/Neo4JBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/Neo4JBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/PropertySourceContributor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/PropertySourceContributor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/PropertySourceContributor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/PropertySourceContributor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/RabbitMqBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/RabbitMqBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/RabbitMqBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/RabbitMqBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/SapHanaBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/SapHanaBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/SapHanaBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/SapHanaBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/SpringSecurityOAuth2BindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/SpringSecurityOAuth2BindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/SpringSecurityOAuth2BindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/SpringSecurityOAuth2BindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/VaultBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/VaultBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/VaultBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/VaultBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessor.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessor.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessor.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessor.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/package-info.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/package-info.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/package-info.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/package-info.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/pem/PemCertificateParser.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/pem/PemCertificateParser.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/pem/PemCertificateParser.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/pem/PemCertificateParser.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/pem/PemContent.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/pem/PemContent.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/pem/PemContent.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/pem/PemContent.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/pem/PemPrivateKeyParser.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/pem/PemPrivateKeyParser.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/pem/PemPrivateKeyParser.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/pem/PemPrivateKeyParser.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/pem/PemSslStoreHelper.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/pem/PemSslStoreHelper.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/pem/PemSslStoreHelper.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/pem/PemSslStoreHelper.java diff --git a/src/main/java/org/springframework/cloud/bindings/boot/pem/package-info.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/pem/package-info.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/boot/pem/package-info.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/pem/package-info.java diff --git a/src/main/java/org/springframework/cloud/bindings/package-info.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/package-info.java similarity index 100% rename from src/main/java/org/springframework/cloud/bindings/package-info.java rename to spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/package-info.java diff --git a/src/main/resources/META-INF/spring.factories b/spring-cloud-bindings/src/main/resources/META-INF/spring.factories similarity index 100% rename from src/main/resources/META-INF/spring.factories rename to spring-cloud-bindings/src/main/resources/META-INF/spring.factories diff --git a/src/test/java/org/springframework/cloud/bindings/BindingTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/BindingTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/BindingTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/BindingTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/BindingsTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/BindingsTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/BindingsTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/BindingsTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/FluentMap.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/FluentMap.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/FluentMap.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/FluentMap.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/ArtemisBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ArtemisBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/ArtemisBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ArtemisBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessorTest.java similarity index 95% rename from src/test/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessorTest.java index fe24d04..fc3ef9f 100644 --- a/src/test/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessorTest.java +++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessorTest.java @@ -19,7 +19,7 @@ package org.springframework.cloud.bindings.boot; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.context.config.ConfigFileApplicationListener; +import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor; import org.springframework.cloud.bindings.Binding; import org.springframework.cloud.bindings.Bindings; import org.springframework.cloud.bindings.FluentMap; @@ -82,7 +82,7 @@ final class BindingFlattenedEnvironmentPostProcessorTest { @DisplayName("has order before ConfigFileApplicationListener") void order() { assertThat(new BindingFlattenedEnvironmentPostProcessor(new Bindings()).getOrder()) - .isLessThan(ConfigFileApplicationListener.DEFAULT_ORDER); + .isLessThan(ConfigDataEnvironmentPostProcessor.ORDER); } } diff --git a/src/test/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessorTest.java similarity index 96% rename from src/test/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessorTest.java index 03a6151..85a7d7b 100644 --- a/src/test/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessorTest.java +++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessorTest.java @@ -19,7 +19,7 @@ package org.springframework.cloud.bindings.boot; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.context.config.ConfigFileApplicationListener; +import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor; import org.springframework.cloud.bindings.Binding; import org.springframework.cloud.bindings.Bindings; import org.springframework.cloud.bindings.FluentMap; @@ -98,7 +98,7 @@ final class BindingSpecificEnvironmentPostProcessorTest { @DisplayName("has order before ConfigFileApplicationListener") void order() { assertThat(new BindingSpecificEnvironmentPostProcessor(new Bindings()).getOrder()) - .isLessThan(ConfigFileApplicationListener.DEFAULT_ORDER); + .isLessThan(ConfigDataEnvironmentPostProcessor.ORDER); } @Test diff --git a/src/test/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/ConfigServerBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ConfigServerBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/ConfigServerBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ConfigServerBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/CouchbaseBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/CouchbaseBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/CouchbaseBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/CouchbaseBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/ElasticsearchBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ElasticsearchBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/ElasticsearchBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ElasticsearchBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/EurekaBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/EurekaBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/EurekaBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/EurekaBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/GuardsTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/GuardsTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/GuardsTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/GuardsTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/KafkaBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/KafkaBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/KafkaBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/KafkaBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/LDAPBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/LDAPBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/LDAPBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/LDAPBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/MapMapperTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/MapMapperTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/MapMapperTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/MapMapperTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/Neo4JBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/Neo4JBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/Neo4JBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/Neo4JBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/PropertySourceContributorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/PropertySourceContributorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/PropertySourceContributorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/PropertySourceContributorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/RabbitMqBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/RabbitMqBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/RabbitMqBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/RabbitMqBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/SapHanaBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SapHanaBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/SapHanaBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SapHanaBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/SpringSecurityOAuth2BindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SpringSecurityOAuth2BindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/SpringSecurityOAuth2BindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SpringSecurityOAuth2BindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/TestHelper.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/TestHelper.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/TestHelper.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/TestHelper.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/VaultBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/VaultBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/VaultBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/VaultBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessorTest.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessorTest.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessorTest.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/pem/PemCertificateParserTests.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/pem/PemCertificateParserTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/pem/PemCertificateParserTests.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/pem/PemCertificateParserTests.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/pem/PemContentTests.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/pem/PemContentTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/pem/PemContentTests.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/pem/PemContentTests.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/pem/PemPrivateKeyParserTests.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/pem/PemPrivateKeyParserTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/pem/PemPrivateKeyParserTests.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/pem/PemPrivateKeyParserTests.java diff --git a/src/test/java/org/springframework/cloud/bindings/boot/pem/PemSslStoreHelperTests.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/pem/PemSslStoreHelperTests.java similarity index 100% rename from src/test/java/org/springframework/cloud/bindings/boot/pem/PemSslStoreHelperTests.java rename to spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/pem/PemSslStoreHelperTests.java diff --git a/src/test/resources/cnb/test-k8s/metadata/.hidden-data b/spring-cloud-bindings/src/test/resources/cnb/test-k8s/metadata/.hidden-data similarity index 100% rename from src/test/resources/cnb/test-k8s/metadata/.hidden-data rename to spring-cloud-bindings/src/test/resources/cnb/test-k8s/metadata/.hidden-data diff --git a/src/test/resources/cnb/test-k8s/metadata/.hidden-data-1/kind b/spring-cloud-bindings/src/test/resources/cnb/test-k8s/metadata/.hidden-data-1/kind similarity index 100% rename from src/test/resources/cnb/test-k8s/metadata/.hidden-data-1/kind rename to spring-cloud-bindings/src/test/resources/cnb/test-k8s/metadata/.hidden-data-1/kind diff --git a/src/test/resources/cnb/test-k8s/metadata/.hidden-data-1/provider b/spring-cloud-bindings/src/test/resources/cnb/test-k8s/metadata/.hidden-data-1/provider similarity index 100% rename from src/test/resources/cnb/test-k8s/metadata/.hidden-data-1/provider rename to spring-cloud-bindings/src/test/resources/cnb/test-k8s/metadata/.hidden-data-1/provider diff --git a/src/test/resources/cnb/test-k8s/metadata/.hidden-data-1/test-metadata-key b/spring-cloud-bindings/src/test/resources/cnb/test-k8s/metadata/.hidden-data-1/test-metadata-key similarity index 100% rename from src/test/resources/cnb/test-k8s/metadata/.hidden-data-1/test-metadata-key rename to spring-cloud-bindings/src/test/resources/cnb/test-k8s/metadata/.hidden-data-1/test-metadata-key diff --git a/src/test/resources/cnb/test-k8s/metadata/kind b/spring-cloud-bindings/src/test/resources/cnb/test-k8s/metadata/kind similarity index 100% rename from src/test/resources/cnb/test-k8s/metadata/kind rename to spring-cloud-bindings/src/test/resources/cnb/test-k8s/metadata/kind diff --git a/src/test/resources/cnb/test-k8s/metadata/provider b/spring-cloud-bindings/src/test/resources/cnb/test-k8s/metadata/provider similarity index 100% rename from src/test/resources/cnb/test-k8s/metadata/provider rename to spring-cloud-bindings/src/test/resources/cnb/test-k8s/metadata/provider diff --git a/src/test/resources/cnb/test-k8s/metadata/test-metadata-key b/spring-cloud-bindings/src/test/resources/cnb/test-k8s/metadata/test-metadata-key similarity index 100% rename from src/test/resources/cnb/test-k8s/metadata/test-metadata-key rename to spring-cloud-bindings/src/test/resources/cnb/test-k8s/metadata/test-metadata-key diff --git a/src/test/resources/cnb/test-k8s/secret/.hidden-data b/spring-cloud-bindings/src/test/resources/cnb/test-k8s/secret/.hidden-data similarity index 100% rename from src/test/resources/cnb/test-k8s/secret/.hidden-data rename to spring-cloud-bindings/src/test/resources/cnb/test-k8s/secret/.hidden-data diff --git a/src/test/resources/cnb/test-k8s/secret/.hidden-data-1/test-secret-key b/spring-cloud-bindings/src/test/resources/cnb/test-k8s/secret/.hidden-data-1/test-secret-key similarity index 100% rename from src/test/resources/cnb/test-k8s/secret/.hidden-data-1/test-secret-key rename to spring-cloud-bindings/src/test/resources/cnb/test-k8s/secret/.hidden-data-1/test-secret-key diff --git a/src/test/resources/cnb/test-k8s/secret/test-secret-key b/spring-cloud-bindings/src/test/resources/cnb/test-k8s/secret/test-secret-key similarity index 100% rename from src/test/resources/cnb/test-k8s/secret/test-secret-key rename to spring-cloud-bindings/src/test/resources/cnb/test-k8s/secret/test-secret-key diff --git a/src/test/resources/cnb/test-name-1/metadata/kind b/spring-cloud-bindings/src/test/resources/cnb/test-name-1/metadata/kind similarity index 100% rename from src/test/resources/cnb/test-name-1/metadata/kind rename to spring-cloud-bindings/src/test/resources/cnb/test-name-1/metadata/kind diff --git a/src/test/resources/cnb/test-name-1/metadata/provider b/spring-cloud-bindings/src/test/resources/cnb/test-name-1/metadata/provider similarity index 100% rename from src/test/resources/cnb/test-name-1/metadata/provider rename to spring-cloud-bindings/src/test/resources/cnb/test-name-1/metadata/provider diff --git a/src/test/resources/cnb/test-name-1/metadata/test-metadata-key b/spring-cloud-bindings/src/test/resources/cnb/test-name-1/metadata/test-metadata-key similarity index 100% rename from src/test/resources/cnb/test-name-1/metadata/test-metadata-key rename to spring-cloud-bindings/src/test/resources/cnb/test-name-1/metadata/test-metadata-key diff --git a/src/test/resources/cnb/test-name-1/secret/test-secret-key b/spring-cloud-bindings/src/test/resources/cnb/test-name-1/secret/test-secret-key similarity index 100% rename from src/test/resources/cnb/test-name-1/secret/test-secret-key rename to spring-cloud-bindings/src/test/resources/cnb/test-name-1/secret/test-secret-key diff --git a/src/test/resources/cnb/test-name-2/metadata/kind b/spring-cloud-bindings/src/test/resources/cnb/test-name-2/metadata/kind similarity index 100% rename from src/test/resources/cnb/test-name-2/metadata/kind rename to spring-cloud-bindings/src/test/resources/cnb/test-name-2/metadata/kind diff --git a/src/test/resources/cnb/test-name-2/metadata/provider b/spring-cloud-bindings/src/test/resources/cnb/test-name-2/metadata/provider similarity index 100% rename from src/test/resources/cnb/test-name-2/metadata/provider rename to spring-cloud-bindings/src/test/resources/cnb/test-name-2/metadata/provider diff --git a/src/test/resources/cnb/test-name-2/metadata/test-metadata-key b/spring-cloud-bindings/src/test/resources/cnb/test-name-2/metadata/test-metadata-key similarity index 100% rename from src/test/resources/cnb/test-name-2/metadata/test-metadata-key rename to spring-cloud-bindings/src/test/resources/cnb/test-name-2/metadata/test-metadata-key diff --git a/src/test/resources/cnb/test-name-2/secret/test-secret-key b/spring-cloud-bindings/src/test/resources/cnb/test-name-2/secret/test-secret-key similarity index 100% rename from src/test/resources/cnb/test-name-2/secret/test-secret-key rename to spring-cloud-bindings/src/test/resources/cnb/test-name-2/secret/test-secret-key diff --git a/src/test/resources/k8s/test-k8s/.hidden-data b/spring-cloud-bindings/src/test/resources/k8s/test-k8s/.hidden-data similarity index 100% rename from src/test/resources/k8s/test-k8s/.hidden-data rename to spring-cloud-bindings/src/test/resources/k8s/test-k8s/.hidden-data diff --git a/src/test/resources/k8s/test-k8s/.hidden-data-1/provider b/spring-cloud-bindings/src/test/resources/k8s/test-k8s/.hidden-data-1/provider similarity index 100% rename from src/test/resources/k8s/test-k8s/.hidden-data-1/provider rename to spring-cloud-bindings/src/test/resources/k8s/test-k8s/.hidden-data-1/provider diff --git a/src/test/resources/k8s/test-k8s/.hidden-data-1/test-secret-key b/spring-cloud-bindings/src/test/resources/k8s/test-k8s/.hidden-data-1/test-secret-key similarity index 100% rename from src/test/resources/k8s/test-k8s/.hidden-data-1/test-secret-key rename to spring-cloud-bindings/src/test/resources/k8s/test-k8s/.hidden-data-1/test-secret-key diff --git a/src/test/resources/k8s/test-k8s/.hidden-data-1/type b/spring-cloud-bindings/src/test/resources/k8s/test-k8s/.hidden-data-1/type similarity index 100% rename from src/test/resources/k8s/test-k8s/.hidden-data-1/type rename to spring-cloud-bindings/src/test/resources/k8s/test-k8s/.hidden-data-1/type diff --git a/src/test/resources/k8s/test-k8s/provider b/spring-cloud-bindings/src/test/resources/k8s/test-k8s/provider similarity index 100% rename from src/test/resources/k8s/test-k8s/provider rename to spring-cloud-bindings/src/test/resources/k8s/test-k8s/provider diff --git a/src/test/resources/k8s/test-k8s/test-secret-key b/spring-cloud-bindings/src/test/resources/k8s/test-k8s/test-secret-key similarity index 100% rename from src/test/resources/k8s/test-k8s/test-secret-key rename to spring-cloud-bindings/src/test/resources/k8s/test-k8s/test-secret-key diff --git a/src/test/resources/k8s/test-k8s/type b/spring-cloud-bindings/src/test/resources/k8s/test-k8s/type similarity index 100% rename from src/test/resources/k8s/test-k8s/type rename to spring-cloud-bindings/src/test/resources/k8s/test-k8s/type diff --git a/src/test/resources/k8s/test-name-1/provider b/spring-cloud-bindings/src/test/resources/k8s/test-name-1/provider similarity index 100% rename from src/test/resources/k8s/test-name-1/provider rename to spring-cloud-bindings/src/test/resources/k8s/test-name-1/provider diff --git a/src/test/resources/k8s/test-name-1/test-secret-key b/spring-cloud-bindings/src/test/resources/k8s/test-name-1/test-secret-key similarity index 100% rename from src/test/resources/k8s/test-name-1/test-secret-key rename to spring-cloud-bindings/src/test/resources/k8s/test-name-1/test-secret-key diff --git a/src/test/resources/k8s/test-name-1/type b/spring-cloud-bindings/src/test/resources/k8s/test-name-1/type similarity index 100% rename from src/test/resources/k8s/test-name-1/type rename to spring-cloud-bindings/src/test/resources/k8s/test-name-1/type diff --git a/src/test/resources/k8s/test-name-2/provider b/spring-cloud-bindings/src/test/resources/k8s/test-name-2/provider similarity index 100% rename from src/test/resources/k8s/test-name-2/provider rename to spring-cloud-bindings/src/test/resources/k8s/test-name-2/provider diff --git a/src/test/resources/k8s/test-name-2/test-secret-key b/spring-cloud-bindings/src/test/resources/k8s/test-name-2/test-secret-key similarity index 100% rename from src/test/resources/k8s/test-name-2/test-secret-key rename to spring-cloud-bindings/src/test/resources/k8s/test-name-2/test-secret-key diff --git a/src/test/resources/k8s/test-name-2/type b/spring-cloud-bindings/src/test/resources/k8s/test-name-2/type similarity index 100% rename from src/test/resources/k8s/test-name-2/type rename to spring-cloud-bindings/src/test/resources/k8s/test-name-2/type diff --git a/src/test/resources/pem/test-banner.txt b/spring-cloud-bindings/src/test/resources/pem/test-banner.txt similarity index 100% rename from src/test/resources/pem/test-banner.txt rename to spring-cloud-bindings/src/test/resources/pem/test-banner.txt diff --git a/src/test/resources/pem/test-cert-chain.pem b/spring-cloud-bindings/src/test/resources/pem/test-cert-chain.pem similarity index 100% rename from src/test/resources/pem/test-cert-chain.pem rename to spring-cloud-bindings/src/test/resources/pem/test-cert-chain.pem diff --git a/src/test/resources/pem/test-cert.pem b/spring-cloud-bindings/src/test/resources/pem/test-cert.pem similarity index 100% rename from src/test/resources/pem/test-cert.pem rename to spring-cloud-bindings/src/test/resources/pem/test-cert.pem diff --git a/src/test/resources/pem/test-ec-key.pem b/spring-cloud-bindings/src/test/resources/pem/test-ec-key.pem similarity index 100% rename from src/test/resources/pem/test-ec-key.pem rename to spring-cloud-bindings/src/test/resources/pem/test-ec-key.pem diff --git a/src/test/resources/pem/test-key.pem b/spring-cloud-bindings/src/test/resources/pem/test-key.pem similarity index 100% rename from src/test/resources/pem/test-key.pem rename to spring-cloud-bindings/src/test/resources/pem/test-key.pem From 8c0fe7682b304446bf4f7b4a927f7a5c021bb16b Mon Sep 17 00:00:00 2001 From: Anthony Dahanne Date: Fri, 11 Aug 2023 23:07:44 -0400 Subject: [PATCH 4/6] Fix unclosed streams * make sure Files.path() properly closes its directory, using try-with-resources * missing one, found by @violetagg * cherry pick from 1abd51645620c8591a99223232aaf41e74840677 and ec894cb82fdc5f038b595e886cb54ed7aa869606 --- spring-cloud-bindings-tests/pom.xml | 2 +- .../java/org/springframework/cloud/bindings/Binding.java | 8 ++++---- .../java/org/springframework/cloud/bindings/Bindings.java | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/spring-cloud-bindings-tests/pom.xml b/spring-cloud-bindings-tests/pom.xml index 329c6db..aa45260 100644 --- a/spring-cloud-bindings-tests/pom.xml +++ b/spring-cloud-bindings-tests/pom.xml @@ -26,7 +26,7 @@ org.springframework.cloud spring-cloud-bindings - ${version} + ${project.version} test diff --git a/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/Binding.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/Binding.java index ebd707b..0901388 100644 --- a/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/Binding.java +++ b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/Binding.java @@ -23,6 +23,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * A representation of a binding as defined by the @@ -114,13 +115,12 @@ public final class Binding { return Collections.emptyMap(); } - try { - return Files.list(path) - .filter(p -> { + try (Stream paths = Files.list(path)) { + return paths.filter(p -> { try { return !Files.isHidden(p); } catch (IOException e) { - throw new IllegalStateException(String.format("unable to determine id file '%s' is hidden", p), e); + throw new IllegalStateException(String.format("unable to determine if file '%s' is hidden", p), e); } }) .filter(p -> !Files.isDirectory(p)) diff --git a/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/Bindings.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/Bindings.java index 4f59dd8..6e1a541 100644 --- a/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/Bindings.java +++ b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/Bindings.java @@ -26,6 +26,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import java.util.stream.Stream; /** @@ -81,8 +82,8 @@ public final class Bindings { throw new IllegalArgumentException(String.format("%s is not a directory", p)); } - try { - this.bindings = Files.list(p) + try (Stream paths = Files.list(p)) { + this.bindings = paths .map(Binding::new) .collect(Collectors.toList()); } catch (IOException e) { From a77d20e10560c1e89913ea3a4b29922cfd855d1d Mon Sep 17 00:00:00 2001 From: Anthony Dahanne Date: Tue, 15 Aug 2023 15:57:17 -0400 Subject: [PATCH 5/6] Adapt to CI * now using springio/concourse-release-scripts --- scripts/Dockerfile | 2 -- scripts/bump-version.sh | 3 +++ scripts/deploy.sh | 1 - scripts/promote-to-maven-central.sh | 2 +- scripts/release-version.sh | 3 +++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 61c4962..cf2be97 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -1,8 +1,6 @@ ARG base_image=ubuntu:bionic FROM ${base_image} -ADD https://repo.spring.io/libs-release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.2/concourse-release-scripts-0.3.2.jar /opt/concourse-release-scripts.jar - RUN apt-get update && apt-get install --no-install-recommends -y \ git gnupg \ && rm -rf /var/lib/apt/lists/* diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index 67b4b35..9df2b2f 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -34,6 +34,9 @@ cd source VERSION=$(./mvnw --quiet help:evaluate -DforceStdout -Dexpression=project.version) git add pom.xml +git add spring-cloud-bindings/pom.xml +git add spring-cloud-bindings-tests/pom.xml + git checkout -- . git \ diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 7a85306..d27fe76 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -30,5 +30,4 @@ EOF REPOSITORY="${PWD}"/repository cd source - ./mvnw deploy -Dmaven.test.skip=true -DaltDeploymentRepository="local::default::file://${REPOSITORY}" diff --git a/scripts/promote-to-maven-central.sh b/scripts/promote-to-maven-central.sh index 5d38b82..639f0ad 100755 --- a/scripts/promote-to-maven-central.sh +++ b/scripts/promote-to-maven-central.sh @@ -4,6 +4,6 @@ set -euo pipefail export BUILD_INFO_LOCATION=$(pwd)/repository/build-info.json -java -jar /opt/concourse-release-scripts.jar publishToCentral 'RELEASE' "$BUILD_INFO_LOCATION" repository +java -jar /concourse-release-scripts.jar publishToCentral 'RELEASE' "$BUILD_INFO_LOCATION" repository echo "Sync complete" \ No newline at end of file diff --git a/scripts/release-version.sh b/scripts/release-version.sh index 304b3cf..aaf98ae 100755 --- a/scripts/release-version.sh +++ b/scripts/release-version.sh @@ -10,6 +10,9 @@ cd source VERSION=$(./mvnw --quiet help:evaluate -DforceStdout -Dexpression=project.version) git add pom.xml +git add spring-cloud-bindings/pom.xml +git add spring-cloud-bindings-tests/pom.xml + git checkout -- . git \ From 0a0af88de8403579fd1736b136d9c92e21ce4bf2 Mon Sep 17 00:00:00 2001 From: Anthony Dahanne Date: Tue, 15 Aug 2023 16:16:14 -0400 Subject: [PATCH 6/6] Bump minor version --- pom.xml | 4 ++-- spring-cloud-bindings-tests/pom.xml | 2 +- spring-cloud-bindings/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index cd68764..965f066 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-bindings-parent - 1.13.0-SNAPSHOT + 1.14.0-SNAPSHOT pom Spring Cloud Cloud Native Buildpacks Bindings Parent @@ -15,7 +15,7 @@ 1.8 - 2.5.15 + 2.6.15 ${java.version} ${java.version} UTF-8 diff --git a/spring-cloud-bindings-tests/pom.xml b/spring-cloud-bindings-tests/pom.xml index aa45260..17e15b3 100644 --- a/spring-cloud-bindings-tests/pom.xml +++ b/spring-cloud-bindings-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-bindings-parent - 1.13.0-SNAPSHOT + 1.14.0-SNAPSHOT ../pom.xml spring-cloud-bindings-tests diff --git a/spring-cloud-bindings/pom.xml b/spring-cloud-bindings/pom.xml index 80cf7a6..4fc7bbf 100644 --- a/spring-cloud-bindings/pom.xml +++ b/spring-cloud-bindings/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-bindings-parent - 1.13.0-SNAPSHOT + 1.14.0-SNAPSHOT ../pom.xml