From 879d2c905d623d77c6278330ca7723869da73913 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Wed, 1 Aug 2018 12:03:36 +0200
Subject: [PATCH] [maven-release-plugin] prepare release 2.1.0.M1

---
 pom.xml                           | 98 ++++++++++---------------------
 spring-vault-core/pom.xml         |  2 +-
 spring-vault-dependencies/pom.xml | 13 ++--
 spring-vault-distribution/pom.xml |  2 +-
 src/main/resources/notice.txt     |  2 +-
 5 files changed, 40 insertions(+), 77 deletions(-)

diff --git a/pom.xml b/pom.xml
index 620f6c77..f077e294 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.springframework.vault</groupId>
 	<artifactId>spring-vault-parent</artifactId>
-	<version>2.1.0.BUILD-SNAPSHOT</version>
+	<version>2.1.0.M1</version>
 
 	<name>Spring Vault</name>
 	<description>Parent project for Spring Vault</description>
@@ -47,7 +47,7 @@
 		<developerConnection>
 			scm:git:ssh://git@github.com/spring-projects/spring-vault.git
 		</developerConnection>
-		<tag>HEAD</tag>
+		<tag>2.1.0.M1</tag>
 	</scm>
 
 	<issueManagement>
@@ -100,7 +100,7 @@
 			<dependency>
 				<groupId>org.springframework.vault</groupId>
 				<artifactId>spring-vault-dependencies</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.1.0.M1</version>
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>
@@ -384,11 +384,8 @@
 
 	<repositories>
 		<repository>
-			<id>spring-libs-snapshot</id>
-			<url>https://repo.spring.io/libs-snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
+			<id>spring-libs-milestone</id>
+			<url>https://repo.spring.io/libs-milestone</url>
 		</repository>
 	</repositories>
 
@@ -654,14 +651,12 @@
 									<configuration>
 										<target>
 											<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>
@@ -676,12 +671,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>
@@ -695,32 +688,17 @@
 									<phase>generate-resources</phase>
 									<configuration>
 										<target>
-											<copy failonerror="false"
-												  file="${project.build.directory}/doc-resources/stylesheets/spring.css"
-												  tofile="${project.build.directory}/working/stylesheets/spring.css"/>
-											<copy failonerror="false"
-												  file="${project.build.directory}/doc-resources/html/docinfo.html"
-												  tofile="${project.build.directory}/working/docinfo.html"/>
-											<copy failonerror="false"
-												  file="${project.build.directory}/doc-resources/html/docinfo-footer.html"
-												  tofile="${project.build.directory}/working/docinfo-footer.html"/>
-											<copy failonerror="false"
-												  todir="${project.build.directory}/working/tocbot-3.0.2">
-												<fileset
-														dir="${project.build.directory}/doc-resources/javascript/tocbot-3.0.2"
-														includes="**"/>
+											<copy failonerror="false" file="${project.build.directory}/doc-resources/stylesheets/spring.css" tofile="${project.build.directory}/working/stylesheets/spring.css" />
+											<copy failonerror="false" file="${project.build.directory}/doc-resources/html/docinfo.html" tofile="${project.build.directory}/working/docinfo.html" />
+											<copy failonerror="false" file="${project.build.directory}/doc-resources/html/docinfo-footer.html" tofile="${project.build.directory}/working/docinfo-footer.html" />
+											<copy failonerror="false" todir="${project.build.directory}/working/tocbot-3.0.2">
+												<fileset dir="${project.build.directory}/doc-resources/javascript/tocbot-3.0.2" includes="**" />
 											</copy>
-											<copy failonerror="false"
-												  todir="${project.build.directory}/working">
-												<fileset
-														dir="${project.root}/src/main/asciidoc"
-														includes="**"/>
+											<copy failonerror="false" todir="${project.build.directory}/working">
+												<fileset dir="${project.root}/src/main/asciidoc" includes="**" />
 											</copy>
-											<copy failonerror="false"
-												  todir="${project.build.directory}/working/images">
-												<fileset
-														dir="${project.root}/src/main/asciidoc/images"
-														includes="**"/>
+											<copy failonerror="false" todir="${project.build.directory}/working/images">
+												<fileset dir="${project.root}/src/main/asciidoc/images" includes="**" />
 											</copy>
 										</target>
 									</configuration>
@@ -735,34 +713,22 @@
 									<configuration>
 										<target>
 											<!-- Copy files for the single-file HTML version -->
-											<copy failonerror="false"
-												  file="${project.build.directory}/generated-docs/index.html"
-												  tofile="${project.root}/target/site/reference/html/index.html"/>
-											<copy failonerror="false"
-												  todir="${project.root}/target/site/reference/html/images">
-												<fileset
-														dir="${project.build.directory}/generated-docs/images">
-													<include name="*.*"/>
+											<copy failonerror="false" file="${project.build.directory}/generated-docs/index.html" tofile="${project.root}/target/site/reference/html/index.html" />
+											<copy failonerror="false" todir="${project.root}/target/site/reference/html/images">
+												<fileset dir="${project.build.directory}/generated-docs/images">
+													<include name="*.*" />
 												</fileset>
 											</copy>
-											<copy failonerror="false"
-												  todir="${project.root}/target/site/reference/html/tocbot-3.0.2">
-												<fileset
-														dir="${project.build.directory}/generated-docs/tocbot-3.0.2">
-													<include name="*.*"/>
+											<copy failonerror="false" todir="${project.root}/target/site/reference/html/tocbot-3.0.2">
+												<fileset dir="${project.build.directory}/generated-docs/tocbot-3.0.2">
+													<include name="*.*" />
 												</fileset>
 											</copy>
-											<copy failonerror="false"
-												  file="${project.build.directory}/generated-docs/stylesheets/spring.css"
-												  tofile="${project.root}/target/site/reference/html/stylesheets/spring.css"/>
+											<copy failonerror="false" file="${project.build.directory}/generated-docs/stylesheets/spring.css" tofile="${project.root}/target/site/reference/html/stylesheets/spring.css" />
 											<!-- Copy and rename the Epub file -->
-											<copy failonerror="false"
-												  file="${project.build.directory}/generated-docs/index.pdf"
-												  tofile="${project.root}/target/site/reference/pdf/${dist.id}-reference.pdf"/>
+											<copy failonerror="false" file="${project.build.directory}/generated-docs/index.pdf" tofile="${project.root}/target/site/reference/pdf/${dist.id}-reference.pdf" />
 											<!-- Copy and rename the PDF file -->
-											<copy failonerror="false"
-												  file="${project.build.directory}/generated-docs/index.epub"
-												  tofile="${project.root}/target/site/reference/epub/${dist.id}-reference.epub"/>
+											<copy failonerror="false" file="${project.build.directory}/generated-docs/index.epub" tofile="${project.root}/target/site/reference/epub/${dist.id}-reference.epub" />
 
 										</target>
 									</configuration>
diff --git a/spring-vault-core/pom.xml b/spring-vault-core/pom.xml
index df4377f7..42a8c550 100644
--- a/spring-vault-core/pom.xml
+++ b/spring-vault-core/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.vault</groupId>
 		<artifactId>spring-vault-parent</artifactId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.1.0.M1</version>
 	</parent>
 
 	<artifactId>spring-vault-core</artifactId>
diff --git a/spring-vault-dependencies/pom.xml b/spring-vault-dependencies/pom.xml
index 8db7f027..be26f664 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.1.0.BUILD-SNAPSHOT</version>
+	<version>2.1.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.1.0.M1</tag>
 	</scm>
 
 	<issueManagement>
@@ -75,7 +75,7 @@
 			<dependency>
 				<groupId>org.springframework.vault</groupId>
 				<artifactId>spring-vault-core</artifactId>
-				<version>2.1.0.BUILD-SNAPSHOT</version>
+				<version>2.1.0.M1</version>
 			</dependency>
 
 			<dependency>
@@ -165,11 +165,8 @@
 
 	<repositories>
 		<repository>
-			<id>spring-libs-snapshot</id>
-			<url>https://repo.spring.io/libs-snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
+			<id>spring-libs-milestone</id>
+			<url>https://repo.spring.io/libs-milestone</url>
 		</repository>
 	</repositories>
 
diff --git a/spring-vault-distribution/pom.xml b/spring-vault-distribution/pom.xml
index a83f21ca..4abcfa20 100644
--- a/spring-vault-distribution/pom.xml
+++ b/spring-vault-distribution/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.vault</groupId>
 		<artifactId>spring-vault-parent</artifactId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.1.0.M1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt
index 2fd40bea..7899bd23 100644
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,4 +1,4 @@
-Spring Vault 2.1.0.BUILD-SNAPSHOT
+Spring Vault 2.1.0.M1
 Copyright (c) [2016-2018] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").