From 7bdbe11eec6a7666cba3206acf5705f099ef6460 Mon Sep 17 00:00:00 2001
From: Vedran Pavic <vedran.pavic@gmail.com>
Date: Sun, 28 Jan 2018 10:56:01 +0100
Subject: [PATCH] Revert to Gradle generated POM

---
 Jenkinsfile                         |  2 +-
 build.gradle                        | 64 +++++++++++++--------
 gradle/dependency-management.gradle | 17 ++++++
 src/pom.xml                         | 88 -----------------------------
 4 files changed, 60 insertions(+), 111 deletions(-)
 create mode 100644 gradle/dependency-management.gradle
 delete mode 100644 src/pom.xml

diff --git a/Jenkinsfile b/Jenkinsfile
index 093ada7..5f0826a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@ try {
 		node {
 			checkout scm
 			try {
-				sh "./gradlew clean check --no-daemon --stacktrace"
+				sh "./gradlew clean check --refresh-dependencies --no-daemon --stacktrace"
 			}
 			catch (Exception e) {
 				currentBuild.result = 'FAILED: check'
diff --git a/build.gradle b/build.gradle
index 0a161e7..c22c312 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,3 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
 buildscript {
 	dependencies {
 		classpath 'io.spring.gradle:spring-build-conventions:0.0.10.RELEASE'
@@ -15,38 +13,60 @@ apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'io.spring.convention.artifactory'
 apply plugin: 'io.spring.convention.root'
+apply plugin: 'io.spring.convention.springdependencymangement'
 
-description = 'Spring Session Maven Bill of Materials (BOM)'
 group = 'org.springframework.session'
+description = 'Spring Session Maven Bill of Materials (BOM)'
 
 configurations.archives.artifacts.clear()
 
-def txt = file('spring-session-bom.txt')
-def pom = file("$buildDir/poms/pom.xml")
-
 artifacts {
-	archives txt
-	archives(pom) {
-		type 'pom'
-	}
+	archives file('spring-session-bom.txt')
 }
 
-task generatePom() {
-	def srcDir = 'src'
-	def pomsDir = "$buildDir/poms"
+install {
+	repositories.mavenInstaller {
+		pom.whenConfigured { pom ->
+			pom.project {
+				packaging = 'pom'
+				name = project.description
+				description = project.description
+				url = 'https://projects.spring.io/spring-session/'
 
-	inputs.files fileTree(srcDir)
-	outputs.dir pomsDir
+				organization {
+					name = 'Pivotal Software, Inc.'
+					url = 'https://spring.io/'
+				}
 
-	doLast {
-		copy {
-			from srcDir
-			into pomsDir
-			filter(ReplaceTokens, tokens: [version: project.version])
+				licenses {
+					license {
+						name = 'Apache License, Version 2.0'
+						url = 'https://www.apache.org/licenses/LICENSE-2.0'
+						distribution = 'repo'
+					}
+				}
+
+				developers {
+					developer {
+						id = 'rwinch'
+						name = 'Rob Winch'
+						email = 'rwinch@pivotal.io'
+					}
+				}
+
+				scm {
+					url = 'https://github.com/spring-projects/spring-session-bom'
+					connection = 'scm:git:git@github.com/spring-projects/spring-session-bom.git'
+					developerConnection = 'scm:git:git@github.com/spring-projects/spring-session-bom.git'
+				}
+
+				issueManagement {
+					system = 'GitHub'
+					url = 'https://github.com/spring-projects/spring-session/issues'
+				}
+			}
 		}
 	}
 }
 
-install.dependsOn generatePom
-
 sonarqube.skipProject = true
diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
new file mode 100644
index 0000000..57e20a7
--- /dev/null
+++ b/gradle/dependency-management.gradle
@@ -0,0 +1,17 @@
+ext {
+	coreVersion = '2.0.1.RELEASE'
+	dataMongoDbVersion = '2.0.0.RELEASE'
+	dataRedisVersion = coreVersion
+	hazelcastVersion = coreVersion
+	jdbcVersion = coreVersion
+}
+
+dependencyManagement {
+	dependencies {
+		dependency "org.springframework.session:spring-session-core:$coreVersion"
+		dependency "org.springframework.session:spring-session-data-mongodb:$dataMongoDbVersion"
+		dependency "org.springframework.session:spring-session-data-redis:$dataRedisVersion"
+		dependency "org.springframework.session:spring-session-hazelcast:$hazelcastVersion"
+		dependency "org.springframework.session:spring-session-jdbc:$jdbcVersion"
+	}
+}
diff --git a/src/pom.xml b/src/pom.xml
deleted file mode 100644
index ab9637d..0000000
--- a/src/pom.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.session</groupId>
-	<artifactId>spring-session-bom</artifactId>
-	<version>@version@</version>
-	<packaging>pom</packaging>
-
-	<name>Spring Session Maven Bill of Materials (BOM)</name>
-	<description>Spring Session Maven Bill of Materials (BOM)</description>
-	<url>https://projects.spring.io/spring-session/</url>
-
-	<organization>
-		<name>Pivotal Software, Inc.</name>
-		<url>https://spring.io/</url>
-	</organization>
-
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>https://www.apache.org/licenses/LICENSE-2.0</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-
-	<developers>
-		<developer>
-			<id>rwinch</id>
-			<name>Rob Winch</name>
-			<email>rwinch@pivotal.io</email>
-		</developer>
-	</developers>
-
-	<scm>
-		<url>https://github.com/spring-projects/spring-session-bom</url>
-		<connection>scm:git:git@github.com/spring-projects/spring-session-bom.git</connection>
-		<developerConnection>scm:git:git@github.com/spring-projects/spring-session-bom.git</developerConnection>
-	</scm>
-
-	<issueManagement>
-		<system>GitHub</system>
-		<url>https://github.com/spring-projects/spring-session/issues</url>
-	</issueManagement>
-
-	<properties>
-		<spring-session.version>2.0.1.RELEASE</spring-session.version>
-		<spring-session-data-mongodb.version>2.0.0.RELEASE</spring-session-data-mongodb.version>
-	</properties>
-
-	<dependencyManagement>
-		<dependencies>
-			<!-- Spring Session Core -->
-			<dependency>
-				<groupId>org.springframework.session</groupId>
-				<artifactId>spring-session-core</artifactId>
-				<version>${spring-session.version}</version>
-			</dependency>
-			<!-- Spring Session Data MongoDB -->
-			<dependency>
-				<groupId>org.springframework.session</groupId>
-				<artifactId>spring-session-data-mongodb</artifactId>
-				<version>${spring-session-data-mongodb.version}</version>
-			</dependency>
-			<!-- Spring Session Data Redis -->
-			<dependency>
-				<groupId>org.springframework.session</groupId>
-				<artifactId>spring-session-data-redis</artifactId>
-				<version>${spring-session.version}</version>
-			</dependency>
-			<!-- Spring Session Hazelcast -->
-			<dependency>
-				<groupId>org.springframework.session</groupId>
-				<artifactId>spring-session-hazelcast</artifactId>
-				<version>${spring-session.version}</version>
-			</dependency>
-			<!-- Spring Session JDBC -->
-			<dependency>
-				<groupId>org.springframework.session</groupId>
-				<artifactId>spring-session-jdbc</artifactId>
-				<version>${spring-session.version}</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-</project>