From f01a5e538af04b3d39a65d72b1579b287c8c962e Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Tue, 25 Jul 2017 18:24:52 +0200
Subject: [PATCH] #47 - Added Spring Data for Apache Geode to release modules.

---
 .../data/release/model/Projects.java          | 21 +++++++++++++------
 .../data/release/model/ReleaseTrains.java     |  7 +++++--
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/release-tools/src/main/java/org/springframework/data/release/model/Projects.java b/release-tools/src/main/java/org/springframework/data/release/model/Projects.java
index 2bae12d..d6a16c8 100644
--- a/release-tools/src/main/java/org/springframework/data/release/model/Projects.java
+++ b/release-tools/src/main/java/org/springframework/data/release/model/Projects.java
@@ -32,7 +32,7 @@ import org.jgrapht.traverse.TopologicalOrderIterator;
 public class Projects {
 
 	public static final Project COMMONS, BUILD, REST, JPA, MONGO_DB, NEO4J, SOLR, COUCHBASE, CASSANDRA, ELASTICSEARCH,
-			REDIS, GEMFIRE, KEY_VALUE, ENVERS, LDAP;
+			REDIS, GEMFIRE, KEY_VALUE, ENVERS, LDAP, GEODE;
 	public static final List<Project> PROJECTS;
 
 	static {
@@ -44,17 +44,26 @@ public class Projects {
 		COMMONS = new Project("DATACMNS", "Commons", Arrays.asList(BUILD));
 		JPA = new Project("DATAJPA", "JPA", Arrays.asList(COMMONS));
 		MONGO_DB = new Project("DATAMONGO", "MongoDB", Arrays.asList(COMMONS),
-				ArtifactCoordinates.NONE.artifacts("spring-data-mongodb-cross-store", "spring-data-mongodb-log4j"));
+				ArtifactCoordinates.NONE.artifacts("spring-data-mongodb-cross-store"));
 		NEO4J = new Project("DATAGRAPH", "Neo4j", Arrays.asList(COMMONS));
-		SOLR = new Project("DATASOLR", "Solr", Arrays.asList(COMMONS)).withFullName("Spring Data for Apache Solr");
+
+		SOLR = new Project("DATASOLR", "Solr", Arrays.asList(COMMONS))//
+				.withFullName("Spring Data for Apache Solr");
+
 		COUCHBASE = new Project("DATACOUCH", "Couchbase", Arrays.asList(COMMONS));
-		CASSANDRA = new Project("DATACASS", "Cassandra", Arrays.asList(COMMONS),
-				ArtifactCoordinates.NONE.artifacts("spring-cql")).withFullName("Spring Data for Apache Cassandra");
+
+		CASSANDRA = new Project("DATACASS", "Cassandra", Arrays.asList(COMMONS)) //
+				.withFullName("Spring Data for Apache Cassandra");
+
 		ELASTICSEARCH = new Project("DATAES", "Elasticsearch", Arrays.asList(COMMONS));
 		KEY_VALUE = new Project("DATAKV", "KeyValue", Arrays.asList(COMMONS));
 		REDIS = new Project("DATAREDIS", "Redis", Arrays.asList(COMMONS, KEY_VALUE));
 		GEMFIRE = new Project("SGF", "Gemfire", Arrays.asList(COMMONS)).withSkipTests(true);
 
+		GEODE = new Project("DATAGEODE", "Geode", Arrays.asList(COMMONS)) //
+				.withFullName("Spring Data for Apache Geode") //
+				.withSkipTests(true);
+
 		REST = new Project("DATAREST", "REST",
 				Arrays.asList(COMMONS, JPA, MONGO_DB, NEO4J, GEMFIRE, SOLR, CASSANDRA, KEY_VALUE), ArtifactCoordinates.NONE
 						.artifacts("spring-data-rest-core", "spring-data-rest-core", "spring-data-rest-hal-browser"));
@@ -63,7 +72,7 @@ public class Projects {
 		LDAP = new Project("DATALDAP", "LDAP", Arrays.asList(COMMONS));
 
 		List<Project> projects = Arrays.asList(BUILD, COMMONS, JPA, MONGO_DB, NEO4J, SOLR, COUCHBASE, CASSANDRA,
-				ELASTICSEARCH, REDIS, GEMFIRE, REST, KEY_VALUE, ENVERS, LDAP);
+				ELASTICSEARCH, REDIS, GEMFIRE, REST, KEY_VALUE, ENVERS, LDAP, GEODE);
 
 		DefaultDirectedGraph<Project, DefaultEdge> graph = new DefaultDirectedGraph<>(DefaultEdge.class);
 
diff --git a/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java b/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java
index 6b6c39b..71a63e8 100644
--- a/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java
+++ b/release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java
@@ -43,14 +43,17 @@ public class ReleaseTrains {
 				new Module(NEO4J, "4.1"), new Module(COUCHBASE, "2.1"), new Module(ELASTICSEARCH, "2.0"));
 		INGALLS = HOPPER.next("Ingalls", Transition.MINOR, new Module(LDAP, "1.0"));
 
+		Iteration RC3 = new Iteration("RC3", GA);
+		Iteration RC2 = new Iteration("RC2", RC3);
+		Iteration RC1 = new Iteration("RC1", RC2);
 		Iteration M4 = new Iteration("M4", RC1);
 		Iteration M3 = new Iteration("M3", M4);
 		Iteration M2 = new Iteration("M2", M3);
 		Iteration M1 = new Iteration("M1", M2);
 
-		Iterations iterations = new Iterations(M1, M2, M3, M4, RC1, GA, SR1, SR2, SR3, SR4, SR5, SR6, SR7);
+		Iterations iterations = new Iterations(M1, M2, M3, M4, RC1, RC2, RC3, GA, SR1, SR2, SR3, SR4, SR5, SR6, SR7);
 
-		KAY = INGALLS.next("Kay", Transition.MAJOR).withIterations(iterations);
+		KAY = INGALLS.next("Kay", Transition.MAJOR, new Module(GEODE, "2.0")).withIterations(iterations);
 
 		// Trains