From c3b2f586eb6144f2ad966fd57d174515e8b35ffc Mon Sep 17 00:00:00 2001 From: drohe Date: Mon, 16 Dec 2024 15:56:25 +0100 Subject: [PATCH 1/4] upgrade library to Spring Cloud AWS 3.2.1 --- .gitignore | 1 + README.md | 15 ++++++++++----- pom.xml | 6 +++--- zalando-cloud-aws-autoconfigure/pom.xml | 6 +++--- zalando-cloud-aws-kms/pom.xml | 4 ++-- .../zalando-cloud-aws-kms-sample/pom.xml | 6 +++--- .../zalando-cloud-aws-starter-kms/pom.xml | 2 +- 7 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 5a356db..20b9655 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,4 @@ hs_err_pid* .factorypath +.vscode/ diff --git a/README.md b/README.md index 6136d92..155d1e2 100644 --- a/README.md +++ b/README.md @@ -11,15 +11,16 @@ Zalando Cloud AWS is an addition to [Spring Cloud AWS](https://github.com/awspri This project has dependency and transitive dependency on Spring Projects. The table below outlines the version of Spring Cloud AWS, Spring Cloud, Spring Boot and Spring Framework versions that are compatible with certain Zalando Cloud AWS versions. -| Zalando Cloud AWS | Spring Cloud AWS | Spring Boot | Spring Framework | AWS Java SDK | -|-------------------|------------------|-------------|------------------|--------------| -| 3.1.x | 3.1.x | 3.2.x | 6.1.x | 2.x | +| Zalando Cloud AWS | Spring Cloud AWS | Spring Cloud | Spring Boot | Spring Framework | AWS Java SDK | +| ----------------- | ---------------- | ------------ | ------------ | ---------------- | ------------ | +| 3.1.x | 3.1.x | 2023.0.x | 3.2.x | 6.1.x | 2.x | +| 3.2.x | 3.2.x | 2023.0.x | 3.2.x, 3.3.x | 6.1.x | 2.x | ## Supported AWS integrations | AWS Service | Zalando Cloud AWS 3.x | -|-------------|-----------------------| -| KMS | ✅ | +| ----------- | --------------------- | +| KMS | ✅ | Note that Spring Cloud AWS and Spring Cloud provide support for other AWS services in their projects. @@ -30,6 +31,10 @@ Development ### Run Test Suite mvn clean test + +### Coverage Report + + open coverage/target/site/jacoco/index.html Releases -------- diff --git a/pom.xml b/pom.xml index dbdda96..9ca185c 100644 --- a/pom.xml +++ b/pom.xml @@ -8,13 +8,13 @@ org.springframework.cloud spring-cloud-build - 4.1.0 + 4.1.4 org.zalando.awspring.cloud zalando-cloud-aws - 3.1.2-SNAPSHOT + 3.2.1-SNAPSHOT pom Zalando Cloud AWS @@ -27,7 +27,7 @@ - 3.1.1 + 3.2.1 1.19.8 diff --git a/zalando-cloud-aws-autoconfigure/pom.xml b/zalando-cloud-aws-autoconfigure/pom.xml index 3ad4c6c..a3e2e3a 100644 --- a/zalando-cloud-aws-autoconfigure/pom.xml +++ b/zalando-cloud-aws-autoconfigure/pom.xml @@ -8,13 +8,13 @@ org.zalando.awspring.cloud zalando-cloud-aws - 3.1.2-SNAPSHOT + 3.2.1-SNAPSHOT + ../pom.xml zalando-cloud-aws-autoconfigure - 3.1.2-SNAPSHOT jar - Zalando Cloud AWS Autoconfigure + Zalando Cloud AWS KMS Autoconfigure diff --git a/zalando-cloud-aws-kms/pom.xml b/zalando-cloud-aws-kms/pom.xml index e035a10..739940e 100644 --- a/zalando-cloud-aws-kms/pom.xml +++ b/zalando-cloud-aws-kms/pom.xml @@ -8,11 +8,11 @@ org.zalando.awspring.cloud zalando-cloud-aws - 3.1.2-SNAPSHOT + 3.2.1-SNAPSHOT + ../pom.xml zalando-cloud-aws-kms - 3.1.2-SNAPSHOT jar Zalando Cloud AWS KMS Integration diff --git a/zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/pom.xml b/zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/pom.xml index 0280da1..017c6d3 100644 --- a/zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/pom.xml +++ b/zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/pom.xml @@ -14,14 +14,14 @@ org.zalando.awspring.cloud zalando-cloud-aws-kms-sample - 3.1.2-SNAPSHOT + 3.2.1-SNAPSHOT jar Zalando Cloud AWS KMS Sample 17 - 2023.0.2 - 3.1.1 + 2023.0.4 + 3.2.1 diff --git a/zalando-cloud-aws-starters/zalando-cloud-aws-starter-kms/pom.xml b/zalando-cloud-aws-starters/zalando-cloud-aws-starter-kms/pom.xml index b8bf99e..e36d9ad 100644 --- a/zalando-cloud-aws-starters/zalando-cloud-aws-starter-kms/pom.xml +++ b/zalando-cloud-aws-starters/zalando-cloud-aws-starter-kms/pom.xml @@ -7,7 +7,7 @@ zalando-cloud-aws org.zalando.awspring.cloud - 3.1.2-SNAPSHOT + 3.2.1-SNAPSHOT ../../pom.xml From e88007bdd7ccfff1ff726dbc7902de30abff5efb Mon Sep 17 00:00:00 2001 From: drohe Date: Thu, 19 Dec 2024 09:18:18 +0100 Subject: [PATCH 2/4] corrected badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 155d1e2..29eb8dc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Zalando Cloud AWS -[![Build Status](https://github.com/zalando/spring-cloud-config-aws-kms/actions/workflows/maven.yml/badge.svg?branch=master)](https://github.com/zalando/spring-cloud-config-aws-kms/actions/workflows/maven-build.yml) +[![Build Status](https://github.com/zalando/spring-cloud-config-aws-kms/actions/workflows/maven-build.yml/badge.svg?branch=master)](https://github.com/zalando/spring-cloud-config-aws-kms/actions/workflows/maven-build.yml) [![Javadocs](http://javadoc.io/badge/org.zalando/spring-cloud-config-aws-kms.svg?color=blue)](http://javadoc.io/doc/org.zalando/spring-cloud-config-aws-kms) [![Maven Central](https://img.shields.io/maven-central/v/org.zalando/spring-cloud-config-aws-kms.svg)](https://maven-badges.herokuapp.com/maven-central/org.zalando/spring-cloud-config-aws-kms) [![License](https://img.shields.io/badge/license-Apache_2.0-blue.svg)](https://raw.githubusercontent.com/zalando-incubator/aws-support-spring-boot-starter/master/LICENSE) From 2ecec5dd78064963db8f93494029f9d0f662d8eb Mon Sep 17 00:00:00 2001 From: drohe Date: Thu, 19 Dec 2024 09:23:36 +0100 Subject: [PATCH 3/4] corrected badge --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 29eb8dc..c3e1aa5 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Zalando Cloud AWS [![Build Status](https://github.com/zalando/spring-cloud-config-aws-kms/actions/workflows/maven-build.yml/badge.svg?branch=master)](https://github.com/zalando/spring-cloud-config-aws-kms/actions/workflows/maven-build.yml) -[![Javadocs](http://javadoc.io/badge/org.zalando/spring-cloud-config-aws-kms.svg?color=blue)](http://javadoc.io/doc/org.zalando/spring-cloud-config-aws-kms) -[![Maven Central](https://img.shields.io/maven-central/v/org.zalando/spring-cloud-config-aws-kms.svg)](https://maven-badges.herokuapp.com/maven-central/org.zalando/spring-cloud-config-aws-kms) +[![Javadocs](http://javadoc.io/badge/org.zalando.awspring.cloud/zalando-cloud-aws-kms.svg?color=blue)](http://javadoc.io/doc/org.zalando.awspring.cloud/zalando-cloud-aws-kms) +[![Maven Central](https://img.shields.io/maven-central/v/org.zalando.awspring.cloud/zalando-cloud-aws-kms.svg)](https://maven-badges.herokuapp.com/maven-central/org.zalando.awspring.cloud/zalando-cloud-aws-kms) [![License](https://img.shields.io/badge/license-Apache_2.0-blue.svg)](https://raw.githubusercontent.com/zalando-incubator/aws-support-spring-boot-starter/master/LICENSE) Zalando Cloud AWS is an addition to [Spring Cloud AWS](https://github.com/awspring/spring-cloud-aws) that simplifies using AWS managed services in a Spring and Spring boot application. From 4734ce557edc29ecc11c416ca772b0a473410839 Mon Sep 17 00:00:00 2001 From: drohe Date: Thu, 19 Dec 2024 09:26:01 +0100 Subject: [PATCH 4/4] corrected badge --- README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c3e1aa5..9759c27 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,5 @@ # Zalando Cloud AWS -[![Build Status](https://github.com/zalando/spring-cloud-config-aws-kms/actions/workflows/maven-build.yml/badge.svg?branch=master)](https://github.com/zalando/spring-cloud-config-aws-kms/actions/workflows/maven-build.yml) -[![Javadocs](http://javadoc.io/badge/org.zalando.awspring.cloud/zalando-cloud-aws-kms.svg?color=blue)](http://javadoc.io/doc/org.zalando.awspring.cloud/zalando-cloud-aws-kms) -[![Maven Central](https://img.shields.io/maven-central/v/org.zalando.awspring.cloud/zalando-cloud-aws-kms.svg)](https://maven-badges.herokuapp.com/maven-central/org.zalando.awspring.cloud/zalando-cloud-aws-kms) [![License](https://img.shields.io/badge/license-Apache_2.0-blue.svg)](https://raw.githubusercontent.com/zalando-incubator/aws-support-spring-boot-starter/master/LICENSE) Zalando Cloud AWS is an addition to [Spring Cloud AWS](https://github.com/awspring/spring-cloud-aws) that simplifies using AWS managed services in a Spring and Spring boot application. @@ -18,9 +15,9 @@ This project has dependency and transitive dependency on Spring Projects. The ta ## Supported AWS integrations -| AWS Service | Zalando Cloud AWS 3.x | -| ----------- | --------------------- | -| KMS | ✅ | +| AWS Service | Zalando Cloud AWS 3.x | Badges | +| ----------- | --------------------- | ------ | +| KMS | ✅ | [![Build Status](https://github.com/zalando/spring-cloud-config-aws-kms/actions/workflows/maven-build.yml/badge.svg?branch=master)](https://github.com/zalando/spring-cloud-config-aws-kms/actions/workflows/maven-build.yml) [![Javadocs](http://javadoc.io/badge/org.zalando.awspring.cloud/zalando-cloud-aws-kms.svg?color=blue)](http://javadoc.io/doc/org.zalando.awspring.cloud/zalando-cloud-aws-kms) [![Maven Central](https://img.shields.io/maven-central/v/org.zalando.awspring.cloud/zalando-cloud-aws-kms.svg)](https://maven-badges.herokuapp.com/maven-central/org.zalando.awspring.cloud/zalando-cloud-aws-kms) | Note that Spring Cloud AWS and Spring Cloud provide support for other AWS services in their projects.