From be856ca44dfc81197ee2cba762f0131a44bd876e Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Thu, 5 Oct 2017 15:17:45 +0200
Subject: [PATCH] [maven-release-plugin] prepare release 1.1.0.RELEASE

See gh-153.
---
 pom.xml                           | 46 ++++++++++---------------------
 spring-vault-core/pom.xml         |  5 ++--
 spring-vault-dependencies/pom.xml | 17 ++----------
 spring-vault-distribution/pom.xml |  2 +-
 src/main/resources/notice.txt     |  2 +-
 5 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1e384c0e..23905598 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +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 http://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 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.vault</groupId>
 	<artifactId>spring-vault-parent</artifactId>
-	<version>1.1.0.BUILD-SNAPSHOT</version>
+	<version>1.1.0.RELEASE</version>
 
 	<name>Spring Vault</name>
 	<description>Parent project for Spring Vault</description>
@@ -28,7 +27,7 @@
 		<project.root>${basedir}</project.root>
 
 		<!-- To be overridden by individual modules -->
-		<java-module-name></java-module-name>
+		<java-module-name />
 	</properties>
 
 	<inceptionYear>2016</inceptionYear>
@@ -42,7 +41,7 @@
 		<url>https://github.com/spring-projects/spring-vault</url>
 		<connection>scm:git:git://github.com/spring-projects/spring-vault.git</connection>
 		<developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-vault.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>1.1.0.RELEASE</tag>
 	</scm>
 
 	<issueManagement>
@@ -95,7 +94,7 @@
 			<dependency>
 				<groupId>org.springframework.vault</groupId>
 				<artifactId>spring-vault-dependencies</artifactId>
-				<version>1.1.0.BUILD-SNAPSHOT</version>
+				<version>1.1.0.RELEASE</version>
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>
@@ -341,17 +340,6 @@
 		</pluginManagement>
 	</build>
 
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/libs-snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-
 	<profiles>
 		<profile>
 
@@ -589,17 +577,17 @@
 									<target>
 										<copy todir="${project.root}/target/site/reference/html">
 											<fileset dir="${shared.resources}/asciidoc" erroronmissingdir="false">
-												<include name="**/*.css"/>
+												<include name="**/*.css" />
 											</fileset>
-											<flattenmapper/>
+											<flattenmapper />
 										</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"/>
+												<include name="**/*.png" />
+												<include name="**/*.gif" />
+												<include name="**/*.jpg" />
 											</fileset>
-											<flattenmapper/>
+											<flattenmapper />
 										</copy>
 									</target>
 								</configuration>
@@ -615,9 +603,9 @@
 									<target>
 										<copy todir="${project.build.directory}/schemas">
 											<fileset dir="${basedir}" erroronmissingdir="false">
-												<include name="**/src/main/resources/**/config/spring-*.xsd"/>
+												<include name="**/src/main/resources/**/config/spring-*.xsd" />
 											</fileset>
-											<flattenmapper/>
+											<flattenmapper />
 										</copy>
 									</target>
 								</configuration>
@@ -631,12 +619,8 @@
 								<phase>process-resources</phase>
 								<configuration>
 									<target>
-										<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.epub"
-											  tofile="${project.root}/target/site/reference/epub/${dist.id}-reference.epub"/>
+										<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.epub" tofile="${project.root}/target/site/reference/epub/${dist.id}-reference.epub" />
 									</target>
 								</configuration>
 								<goals>
diff --git a/spring-vault-core/pom.xml b/spring-vault-core/pom.xml
index fbffb0c9..e78ea0d5 100644
--- a/spring-vault-core/pom.xml
+++ b/spring-vault-core/pom.xml
@@ -1,12 +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 http://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 http://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>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.RELEASE</version>
 	</parent>
 
 	<artifactId>spring-vault-core</artifactId>
diff --git a/spring-vault-dependencies/pom.xml b/spring-vault-dependencies/pom.xml
index 3deb9bfc..a6c33eb1 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>1.1.0.BUILD-SNAPSHOT</version>
+	<version>1.1.0.RELEASE</version>
 	<packaging>pom</packaging>
 
 	<name>spring-vault-dependencies</name>
@@ -23,7 +23,7 @@
 		<url>https://github.com/spring-projects/spring-vault</url>
 		<connection>scm:git:git://github.com/spring-projects/spring-vault.git</connection>
 		<developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-vault.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>1.1.0.RELEASE</tag>
 	</scm>
 
 	<issueManagement>
@@ -71,7 +71,7 @@
 			<dependency>
 				<groupId>org.springframework.vault</groupId>
 				<artifactId>spring-vault-core</artifactId>
-				<version>1.1.0.BUILD-SNAPSHOT</version>
+				<version>1.1.0.RELEASE</version>
 			</dependency>
 
 			<dependency>
@@ -151,17 +151,6 @@
 		</plugins>
 	</build>
 
-	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/libs-snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-
 	<profiles>
 		<profile>
 
diff --git a/spring-vault-distribution/pom.xml b/spring-vault-distribution/pom.xml
index 9d242470..f55126ea 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>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt
index 6fb7d67f..cfcc3c7f 100644
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,4 +1,4 @@
-Spring Vault 1.1.0.BUILD-SNAPSHOT
+Spring Vault 1.1.0.RELEASE
 Copyright (c) [2016-2017] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").