From 073d0bddc2259da18d78f2500b2e59c59b61a58e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Thu, 12 Sep 2019 15:08:07 +0200
Subject: [PATCH] [maven-release-plugin] prepare release 2.2.0.M1

---
 pom.xml                           | 12 ++---
 spring-vault-core/pom.xml         |  6 +--
 spring-vault-dependencies/pom.xml |  6 +--
 spring-vault-distribution/pom.xml | 81 +++++++++++--------------------
 4 files changed, 39 insertions(+), 66 deletions(-)

diff --git a/pom.xml b/pom.xml
index 55894c2e..92279cf5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.vault</groupId>
 	<artifactId>spring-vault-parent</artifactId>
-	<version>2.2.0.BUILD-SNAPSHOT</version>
+	<version>2.2.0.M1</version>
 
 	<name>Spring Vault</name>
 	<description>Parent project for Spring Vault</description>
@@ -41,7 +39,7 @@
 		<doc.resources>${project.build.directory}/doc-resources</doc.resources>
 
 		<!-- To be overridden by individual modules -->
-		<java-module-name/>
+		<java-module-name />
 	</properties>
 
 	<inceptionYear>2016</inceptionYear>
@@ -57,7 +55,7 @@
 		<developerConnection>
 			scm:git:ssh://git@github.com/spring-projects/spring-vault.git
 		</developerConnection>
-		<tag>HEAD</tag>
+		<tag>2.2.0.M1</tag>
 	</scm>
 
 	<issueManagement>
@@ -110,7 +108,7 @@
 			<dependency>
 				<groupId>org.springframework.vault</groupId>
 				<artifactId>spring-vault-dependencies</artifactId>
-				<version>2.2.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.M1</version>
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>
diff --git a/spring-vault-core/pom.xml b/spring-vault-core/pom.xml
index e6059029..479adf77 100644
--- a/spring-vault-core/pom.xml
+++ b/spring-vault-core/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>org.springframework.vault</groupId>
 		<artifactId>spring-vault-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>2.2.0.M1</version>
 	</parent>
 
 	<artifactId>spring-vault-core</artifactId>
diff --git a/spring-vault-dependencies/pom.xml b/spring-vault-dependencies/pom.xml
index 3ed67390..714938db 100644
--- a/spring-vault-dependencies/pom.xml
+++ b/spring-vault-dependencies/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.springframework.vault</groupId>
 	<artifactId>spring-vault-dependencies</artifactId>
-	<version>2.2.0.BUILD-SNAPSHOT</version>
+	<version>2.2.0.M1</version>
 	<packaging>pom</packaging>
 
 	<name>spring-vault-dependencies</name>
@@ -25,7 +25,7 @@
 		<developerConnection>
 			scm:git:ssh://git@github.com/spring-projects/spring-vault.git
 		</developerConnection>
-		<tag>HEAD</tag>
+		<tag>2.2.0.M1</tag>
 	</scm>
 
 	<issueManagement>
@@ -77,7 +77,7 @@
 			<dependency>
 				<groupId>org.springframework.vault</groupId>
 				<artifactId>spring-vault-core</artifactId>
-				<version>2.2.0.BUILD-SNAPSHOT</version>
+				<version>2.2.0.M1</version>
 			</dependency>
 
 			<dependency>
diff --git a/spring-vault-distribution/pom.xml b/spring-vault-distribution/pom.xml
index 800945e0..5bcd649c 100644
--- a/spring-vault-distribution/pom.xml
+++ b/spring-vault-distribution/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.vault</groupId>
 		<artifactId>spring-vault-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>2.2.0.M1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -149,20 +147,17 @@
 									<configuration>
 										<target>
 											<copy todir="${generated-asciidoc-sources.directory}">
-												<fileset
-														dir="${basedir}/../src/main/asciidoc">
-													<include name="**/*.adoc"/>
+												<fileset dir="${basedir}/../src/main/asciidoc">
+													<include name="**/*.adoc" />
 												</fileset>
 											</copy>
 											<copy todir="${project.root}/target/site/reference/html/images">
-												<fileset
-														dir="${basedir}/src/main/asciidoc"
-														erroronmissingdir="false">
-													<include name="**/*.png"/>
-													<include name="**/*.gif"/>
-													<include name="**/*.jpg"/>
+												<fileset dir="${basedir}/src/main/asciidoc" erroronmissingdir="false">
+													<include name="**/*.png" />
+													<include name="**/*.gif" />
+													<include name="**/*.jpg" />
 												</fileset>
-												<flattenmapper/>
+												<flattenmapper />
 											</copy>
 										</target>
 									</configuration>
@@ -177,12 +172,10 @@
 									<configuration>
 										<target>
 											<copy todir="${project.build.directory}/schemas">
-												<fileset dir="${basedir}"
-														 erroronmissingdir="false">
-													<include
-															name="**/src/main/resources/**/config/spring-*.xsd"/>
+												<fileset dir="${basedir}" erroronmissingdir="false">
+													<include name="**/src/main/resources/**/config/spring-*.xsd" />
 												</fileset>
-												<flattenmapper/>
+												<flattenmapper />
 											</copy>
 										</target>
 									</configuration>
@@ -196,23 +189,17 @@
 									<phase>process-resources</phase>
 									<configuration>
 										<target>
-											<copy failonerror="false"
-												  todir="${project.build.directory}/working">
-												<fileset
-														dir="${project.build.directory}/doc-resources"
-														includes="**"/>
+											<copy failonerror="false" todir="${project.build.directory}/working">
+												<fileset dir="${project.build.directory}/doc-resources" includes="**" />
 											</copy>
-											<copy failonerror="false"
-												  todir="${generated-asciidoc-sources.directory}/images/">
-												<fileset
-														dir="${project.root}/src/main/asciidoc/images"/>
+											<copy failonerror="false" todir="${generated-asciidoc-sources.directory}/images/">
+												<fileset dir="${project.root}/src/main/asciidoc/images" />
 											</copy>
 
 											<copy todir="${generated-docs.directory}">
-												<fileset
-														dir="${generated-asciidoc-sources.directory}">
-													<include name="css/**"/>
-													<include name="js/**"/>
+												<fileset dir="${generated-asciidoc-sources.directory}">
+													<include name="css/**" />
+													<include name="js/**" />
 												</fileset>
 											</copy>
 										</target>
@@ -229,33 +216,23 @@
 										<target>
 
 											<!-- Copy files for the single-file HTML version -->
-											<copy failonerror="false"
-												  todir="${project.root}/target/site/reference/html/images">
-												<fileset
-														dir="${generated-docs.directory}/images"/>
+											<copy failonerror="false" todir="${project.root}/target/site/reference/html/images">
+												<fileset dir="${generated-docs.directory}/images" />
 											</copy>
 
-											<copy
-													todir="${project.root}/target/site/reference/html/">
-												<fileset
-														dir="${generated-asciidoc-sources.directory}">
-													<include name="css/**"/>
-													<include name="js/**"/>
-													<include name="*.ico"/>
+											<copy todir="${project.root}/target/site/reference/html/">
+												<fileset dir="${generated-asciidoc-sources.directory}">
+													<include name="css/**" />
+													<include name="js/**" />
+													<include name="*.ico" />
 												</fileset>
 											</copy>
 
-											<copy
-													file="${project.build.directory}/generated-docs/index.html"
-													todir="${project.root}/target/site/reference/html/"/>
+											<copy file="${project.build.directory}/generated-docs/index.html" todir="${project.root}/target/site/reference/html/" />
 											<!-- Copy and rename the Epub file -->
-											<copy
-													file="${generated-docs.directory}/index.pdf"
-													tofile="${project.root}/target/site/reference/pdf/${dist.id}-reference.pdf"/>
+											<copy file="${generated-docs.directory}/index.pdf" tofile="${project.root}/target/site/reference/pdf/${dist.id}-reference.pdf" />
 											<!-- Copy and rename the PDF file -->
-											<copy
-													file="${generated-docs.directory}/index.epub"
-													tofile="${project.root}/target/site/reference/epub/${dist.id}-reference.epub"/>
+											<copy file="${generated-docs.directory}/index.epub" tofile="${project.root}/target/site/reference/epub/${dist.id}-reference.epub" />
 										</target>
 									</configuration>
 									<goals>