Skip to content

Commit

Permalink
Merge pull request #181 from zalando/upgrade-to-3.2
Browse files Browse the repository at this point in the history
Upgrade to Spring-Cloud-AWS 3.2
  • Loading branch information
oussewa authored Dec 22, 2024
2 parents f4fe974 + 4734ce5 commit 1da27df
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 21 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,4 @@ hs_err_pid*
.factorypath


.vscode/
20 changes: 11 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# 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)
[![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)

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.
Expand All @@ -11,15 +8,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 ||
| 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.

Expand All @@ -30,6 +28,10 @@ Development
### Run Test Suite

mvn clean test

### Coverage Report

open coverage/target/site/jacoco/index.html

Releases
--------
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.1.0</version>
<version>4.1.4</version>
<relativePath/><!-- lookup parent from repository -->
</parent>

<groupId>org.zalando.awspring.cloud</groupId>
<artifactId>zalando-cloud-aws</artifactId>
<version>3.1.2-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Zalando Cloud AWS</name>
Expand All @@ -27,7 +27,7 @@
</organization>

<properties>
<spring-cloud-aws.version>3.1.1</spring-cloud-aws.version>
<spring-cloud-aws.version>3.2.1</spring-cloud-aws.version>
<testcontainers.version>1.19.8</testcontainers.version>
</properties>

Expand Down
6 changes: 3 additions & 3 deletions zalando-cloud-aws-autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<parent>
<groupId>org.zalando.awspring.cloud</groupId>
<artifactId>zalando-cloud-aws</artifactId>
<version>3.1.2-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>zalando-cloud-aws-autoconfigure</artifactId>
<version>3.1.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Zalando Cloud AWS Autoconfigure</name>
<name>Zalando Cloud AWS KMS Autoconfigure</name>

<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions zalando-cloud-aws-kms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<parent>
<groupId>org.zalando.awspring.cloud</groupId>
<artifactId>zalando-cloud-aws</artifactId>
<version>3.1.2-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>zalando-cloud-aws-kms</artifactId>
<version>3.1.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Zalando Cloud AWS KMS Integration</name>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@

<groupId>org.zalando.awspring.cloud</groupId>
<artifactId>zalando-cloud-aws-kms-sample</artifactId>
<version>3.1.2-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Zalando Cloud AWS KMS Sample</name>

<properties>
<java.version>17</java.version>
<spring-cloud.version>2023.0.2</spring-cloud.version>
<awsspring.version>3.1.1</awsspring.version>
<spring-cloud.version>2023.0.4</spring-cloud.version>
<awsspring.version>3.2.1</awsspring.version>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>zalando-cloud-aws</artifactId>
<groupId>org.zalando.awspring.cloud</groupId>
<version>3.1.2-SNAPSHOT</version>
<version>3.2.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit 1da27df

Please sign in to comment.