Merge pull request #167 from zalando/release-3.1.1-2

Release 3.1.1

pom.xml

@@ -12,9 +12,9 @@
 		<relativePath/><!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>com.zalando.awspring.cloud</groupId>
+	<groupId>org.zalando.awspring.cloud</groupId>
 	<artifactId>zalando-cloud-aws</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Zalando Cloud AWS</name>
@@ -59,12 +59,13 @@
 
     <distributionManagement>
 		<downloadUrl>https://github.com/zalando/spring-cloud-config-aws-kms</downloadUrl>
+		<!--
 		<repository>
             <id>github</id>
 			<name> GitHub Packages</name>
 			<url>https://maven.pkg.github.com/zalando/spring-cloud-config-aws-kms</url>
 		</repository>
-		<!--
+		 -->
         <repository>
             <id>ossrh</id>
             <name>Nexus Release Repository</name>
@@ -75,7 +76,6 @@
             <name>Sonatype Nexus Snapshots</name>
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
-		-->
 		<site>
 			<id>zalando-cloud-aws-docs</id>
 			<url>https://github.com/zalando/spring-cloud-config-aws-kms</url>
@@ -113,4 +113,40 @@
 		</license>
 	</licenses>
 
+    <profiles>
+		<profile>
+			<id>release</id>
+			<build>
+				<plugins>
+					<plugin>
+      					<groupId>org.apache.maven.plugins</groupId>
+      					<artifactId>maven-gpg-plugin</artifactId>
+      					<version>3.2.2</version>
+      					<executions>
+        					<execution>
+          						<id>sign-artifacts</id>
+          						<phase>verify</phase>
+          						<goals>
+            						<goal>sign</goal>
+          						</goals>
+        					</execution>
+      					</executions>
+    				</plugin>
+
+					<plugin>
+  						<groupId>org.sonatype.plugins</groupId>
+  						<artifactId>nexus-staging-maven-plugin</artifactId>
+  						<version>1.6.13</version>
+  						<extensions>true</extensions>
+  						<configuration>
+     						<serverId>ossrh</serverId>
+     						<nexusUrl>https://oss.sonatype.org</nexusUrl>
+     						<autoReleaseAfterClose>false</autoReleaseAfterClose>
+  						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
 </project>

zalando-cloud-aws-autoconfigure/pom.xml

@@ -6,14 +6,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.zalando.awspring.cloud</groupId>
+		<groupId>org.zalando.awspring.cloud</groupId>
 		<artifactId>zalando-cloud-aws</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.2-SNAPSHOT</version>
 	</parent>
 
-	<groupId>com.zalando.awspring.cloud</groupId>
+	<groupId>org.zalando.awspring.cloud</groupId>
 	<artifactId>zalando-cloud-aws-autoconfigure</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Zalando Cloud AWS Autoconfigure</name>
 
@@ -47,7 +47,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.zalando.awspring.cloud</groupId>
+			<groupId>org.zalando.awspring.cloud</groupId>
 			<artifactId>zalando-cloud-aws-kms</artifactId>
 			<version>${project.version}</version>
 			<optional>true</optional>

zalando-cloud-aws-autoconfigure/src/main/java/com/zalando/awsspring/cloud/autoconfigure/kms/KmsAutoConfiguration.java → zalando-cloud-aws-autoconfigure/src/main/java/org/zalando/awsspring/cloud/autoconfigure/kms/KmsAutoConfiguration.java

@@ -1,4 +1,4 @@
-package com.zalando.awsspring.cloud.autoconfigure.kms;
+package org.zalando.awsspring.cloud.autoconfigure.kms;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

zalando-cloud-aws-autoconfigure/src/main/java/com/zalando/awsspring/cloud/autoconfigure/kms/KmsProperties.java → zalando-cloud-aws-autoconfigure/src/main/java/org/zalando/awsspring/cloud/autoconfigure/kms/KmsProperties.java

@@ -1,4 +1,4 @@
-package com.zalando.awsspring.cloud.autoconfigure.kms;
+package org.zalando.awsspring.cloud.autoconfigure.kms;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

zalando-cloud-aws-autoconfigure/src/main/java/com/zalando/awsspring/cloud/bootstrap/encrypt/KmsEncryptConfiguration.java → zalando-cloud-aws-autoconfigure/src/main/java/org/zalando/awsspring/cloud/bootstrap/encrypt/KmsEncryptConfiguration.java

@@ -1,11 +1,12 @@
-package com.zalando.awsspring.cloud.bootstrap.encrypt;
+package org.zalando.awsspring.cloud.bootstrap.encrypt;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.crypto.encrypt.TextEncryptor;
+import org.zalando.awsspring.cloud.bootstrap.encrypt.KmsTextEncryptor;
 
 import software.amazon.awssdk.services.kms.KmsClient;
 

zalando-cloud-aws-autoconfigure/src/main/java/com/zalando/awsspring/cloud/bootstrap/encrypt/KmsProperties.java → zalando-cloud-aws-autoconfigure/src/main/java/org/zalando/awsspring/cloud/bootstrap/encrypt/KmsProperties.java

@@ -1,4 +1,4 @@
-package com.zalando.awsspring.cloud.bootstrap.encrypt;
+package org.zalando.awsspring.cloud.bootstrap.encrypt;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

zalando-cloud-aws-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -3,5 +3,5 @@ org.springframework.cloud.bootstrap.BootstrapConfiguration=\
 io.awspring.cloud.autoconfigure.core.AwsAutoConfiguration,\
 io.awspring.cloud.autoconfigure.core.CredentialsProviderAutoConfiguration,\
 io.awspring.cloud.autoconfigure.core.RegionProviderAutoConfiguration,\
-com.zalando.awsspring.cloud.autoconfigure.kms.KmsAutoConfiguration,\
-com.zalando.awsspring.cloud.bootstrap.encrypt.KmsEncryptConfiguration
+org.zalando.awsspring.cloud.autoconfigure.kms.KmsAutoConfiguration,\
+org.zalando.awsspring.cloud.bootstrap.encrypt.KmsEncryptConfiguration

zalando-cloud-aws-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1 @@
-com.zalando.awsspring.cloud.autoconfigure.kms.KmsAutoConfiguration
+org.zalando.awsspring.cloud.autoconfigure.kms.KmsAutoConfiguration

zalando-cloud-aws-kms/pom.xml

@@ -6,14 +6,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.zalando.awspring.cloud</groupId>
+		<groupId>org.zalando.awspring.cloud</groupId>
 		<artifactId>zalando-cloud-aws</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.2-SNAPSHOT</version>
 	</parent>
 
-	<groupId>com.zalando.awspring.cloud</groupId>
+	<groupId>org.zalando.awspring.cloud</groupId>
 	<artifactId>zalando-cloud-aws-kms</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Zalando Cloud AWS KMS Integration</name>
 

zalando-cloud-aws-kms/src/main/java/com/zalando/awsspring/cloud/bootstrap/encrypt/EncryptedToken.java → zalando-cloud-aws-kms/src/main/java/org/zalando/awsspring/cloud/bootstrap/encrypt/EncryptedToken.java

@@ -1,4 +1,4 @@
-package com.zalando.awsspring.cloud.bootstrap.encrypt;
+package org.zalando.awsspring.cloud.bootstrap.encrypt;
 
 import java.util.Base64;
 import java.util.HashMap;

zalando-cloud-aws-kms/src/main/java/com/zalando/awsspring/cloud/bootstrap/encrypt/EncryptedTokenOptions.java → zalando-cloud-aws-kms/src/main/java/org/zalando/awsspring/cloud/bootstrap/encrypt/EncryptedTokenOptions.java

@@ -1,4 +1,4 @@
-package com.zalando.awsspring.cloud.bootstrap.encrypt;
+package org.zalando.awsspring.cloud.bootstrap.encrypt;
 
 import java.util.Objects;
 

zalando-cloud-aws-kms/src/main/java/com/zalando/awsspring/cloud/bootstrap/encrypt/KmsTextEncryptor.java → zalando-cloud-aws-kms/src/main/java/org/zalando/awsspring/cloud/bootstrap/encrypt/KmsTextEncryptor.java

@@ -1,4 +1,4 @@
-package com.zalando.awsspring.cloud.bootstrap.encrypt;
+package org.zalando.awsspring.cloud.bootstrap.encrypt;
 
 import java.util.Base64;
 

zalando-cloud-aws-kms/src/main/java/org/zalando/awsspring/cloud/bootstrap/encrypt/OutputMode.java

@@ -0,0 +1,6 @@
+package org.zalando.awsspring.cloud.bootstrap.encrypt;
+
+public enum OutputMode {
+
+	PLAIN, BASE64;
+}

zalando-cloud-aws-kms/src/test/java/com/zalando/awsspring/cloud/bootstrap/encrypt/EncryptedTokenTest.java → zalando-cloud-aws-kms/src/test/java/org/zalando/awsspring/cloud/bootstrap/encrypt/EncryptedTokenTest.java

@@ -1,4 +1,4 @@
-package com.zalando.awsspring.cloud.bootstrap.encrypt;
+package org.zalando.awsspring.cloud.bootstrap.encrypt;
 
 import java.util.Base64;
 import java.util.Collections;
@@ -10,6 +10,9 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.zalando.awsspring.cloud.bootstrap.encrypt.EncryptedToken;
+import org.zalando.awsspring.cloud.bootstrap.encrypt.EncryptedTokenOptions;
+import org.zalando.awsspring.cloud.bootstrap.encrypt.OutputMode;
 
 public class EncryptedTokenTest {
 

zalando-cloud-aws-kms/src/test/java/com/zalando/awsspring/cloud/bootstrap/encrypt/KmsTextEncryptorTest.java → zalando-cloud-aws-kms/src/test/java/org/zalando/awsspring/cloud/bootstrap/encrypt/KmsTextEncryptorTest.java

@@ -1,4 +1,4 @@
-package com.zalando.awsspring.cloud.bootstrap.encrypt;
+package org.zalando.awsspring.cloud.bootstrap.encrypt;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -11,6 +11,7 @@
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.DockerImageName;
+import org.zalando.awsspring.cloud.bootstrap.encrypt.KmsTextEncryptor;
 
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;

zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/README.md

@@ -44,7 +44,7 @@ The application will print out confirmation that the secret was decrypted to the
 ```
 2024-03-14T10:09:23.638+01:00  INFO 1174881 --- [           main] c.z.a.c.b.encrypt.KmsTextEncryptor       : decrypting NGJlZDYyNzEtNjRhOS00OTRhLWJhMGItZjk2MmIyMmIyYWM1rHhX2gJ7okYuE5VvxT0mN0ZkatF+b3AdmNGYdj21/hfd5oFm3DBaTvHHPJppbXTX as part of stack.
 [java.base/java.lang.Thread.getStackTrace(Thread.java:1610), 
-  com.zalando.awsspring.cloud.bootstrap.encrypt.KmsTextEncryptor.decrypt(KmsTextEncryptor.java:70), 
+  org.zalando.awsspring.cloud.bootstrap.encrypt.KmsTextEncryptor.decrypt(KmsTextEncryptor.java:70), 
   org.springframework.cloud.bootstrap.encrypt.AbstractEnvironmentDecrypt.decrypt(AbstractEnvironmentDecrypt.java:143), 
   org.springframework.cloud.bootstrap.encrypt.AbstractEnvironmentDecrypt.lambda$decrypt$0(AbstractEnvironmentDecrypt.java:136),
   java.base/java.util.LinkedHashMap.replaceAll(LinkedHashMap.java:731),
@@ -57,10 +57,10 @@ The application will print out confirmation that the secret was decrypted to the
   org.springframework.boot.SpringApplication.run(SpringApplication.java:333),
   org.springframework.boot.SpringApplication.run(SpringApplication.java:1354),
   org.springframework.boot.SpringApplication.run(SpringApplication.java:1343),
-  com.zalando.awsspring.samples.bootstrap.BootstrapApplication.main(BootstrapApplication.java:10)]
+  org.zalando.awsspring.samples.bootstrap.BootstrapApplication.main(BootstrapApplication.java:10)]
 2024-03-14T10:09:23.801+01:00  INFO 1174881 --- [           main] c.z.a.c.b.encrypt.KmsTextEncryptor       : decrypting NGJlZDYyNzEtNjRhOS00OTRhLWJhMGItZjk2MmIyMmIyYWM1rHhX2gJ7okYuE5VvxT0mN0ZkatF+b3AdmNGYdj21/hfd5oFm3DBaTvHHPJppbXTX as part of stack.
 [java.base/java.lang.Thread.getStackTrace(Thread.java:1610),
-  com.zalando.awsspring.cloud.bootstrap.encrypt.KmsTextEncryptor.decrypt(KmsTextEncryptor.java:70),
+  org.zalando.awsspring.cloud.bootstrap.encrypt.KmsTextEncryptor.decrypt(KmsTextEncryptor.java:70),
   org.springframework.cloud.bootstrap.encrypt.AbstractEnvironmentDecrypt.decrypt(AbstractEnvironmentDecrypt.java:143),
   org.springframework.cloud.bootstrap.encrypt.AbstractEnvironmentDecrypt.lambda$decrypt$0(AbstractEnvironmentDecrypt.java:136),
   java.base/java.util.LinkedHashMap.replaceAll(LinkedHashMap.java:731),
@@ -72,6 +72,6 @@ The application will print out confirmation that the secret was decrypted to the
   org.springframework.boot.SpringApplication.run(SpringApplication.java:333),
   org.springframework.boot.SpringApplication.run(SpringApplication.java:1354),
   org.springframework.boot.SpringApplication.run(SpringApplication.java:1343),
-  com.zalando.awsspring.samples.bootstrap.BootstrapApplication.main(BootstrapApplication.java:10)]
+  org.zalando.awsspring.samples.bootstrap.BootstrapApplication.main(BootstrapApplication.java:10)]
 ```
 

zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/pom.xml

@@ -12,9 +12,9 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>com.zalando.awspring.cloud</groupId>
+	<groupId>org.zalando.awspring.cloud</groupId>
 	<artifactId>zalando-cloud-aws-kms-sample</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.2-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Zalando Cloud AWS KMS Sample</name>
 
@@ -53,12 +53,12 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.zalando.awspring.cloud</groupId>
+			<groupId>org.zalando.awspring.cloud</groupId>
 			<artifactId>zalando-cloud-aws-kms</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.zalando.awspring.cloud</groupId>
+			<groupId>org.zalando.awspring.cloud</groupId>
 			<artifactId>zalando-cloud-aws-autoconfigure</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -108,6 +108,14 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+
+			<plugin>
+  				<groupId>org.apache.maven.plugins</groupId>
+  				<artifactId>maven-deploy-plugin</artifactId>
+  				<configuration>
+    				<skip>true</skip>
+  				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/src/main/java/com/zalando/awsspring/samples/bootstrap/BootstrapApplication.java → zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/src/main/java/org/zalando/awsspring/samples/bootstrap/BootstrapApplication.java

@@ -1,4 +1,4 @@
-package com.zalando.awsspring.samples.bootstrap;
+package org.zalando.awsspring.samples.bootstrap;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/src/main/java/com/zalando/awsspring/samples/bootstrap/api/SampleController.java → zalando-cloud-aws-samples/zalando-cloud-aws-kms-sample/src/main/java/org/zalando/awsspring/samples/bootstrap/api/SampleController.java

@@ -1,4 +1,4 @@
-package com.zalando.awsspring.samples.bootstrap.api;
+package org.zalando.awsspring.samples.bootstrap.api;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

zalando-cloud-aws-starters/zalando-cloud-aws-starter-kms/pom.xml

@@ -6,13 +6,14 @@
 
 	<parent>
 		<artifactId>zalando-cloud-aws</artifactId>
-		<groupId>com.zalando.awspring.cloud</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<groupId>org.zalando.awspring.cloud</groupId>
+		<version>3.1.2-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 
+    <groupId>org.zalando.awspring.cloud</groupId>
 	<artifactId>zalando-cloud-aws-starter-kms</artifactId>
 	<name>Zalando Cloud AWS KMS Starter</name>
 	<description>Zalando Cloud AWS Key Management Service Starter</description>
@@ -23,7 +24,7 @@
 			<artifactId>spring-cloud-aws-starter</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.zalando.awspring.cloud</groupId>
+			<groupId>org.zalando.awspring.cloud</groupId>
 			<artifactId>zalando-cloud-aws-kms</artifactId>
 			<version>${project.version}</version>
 		</dependency>