From 82252be5d7c11a137a68c7fe985b53e04d91cb18 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 27 Nov 2018 15:09:03 +0100 Subject: [PATCH] #88 - Extend trainiterations for Ingalls. --- .../springframework/data/release/model/Iteration.java | 8 +++++++- .../data/release/model/ReleaseTrains.java | 9 ++------- .../org/springframework/data/release/model/Train.java | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/release-tools/src/main/java/org/springframework/data/release/model/Iteration.java b/release-tools/src/main/java/org/springframework/data/release/model/Iteration.java index e475c1b..807dac5 100644 --- a/release-tools/src/main/java/org/springframework/data/release/model/Iteration.java +++ b/release-tools/src/main/java/org/springframework/data/release/model/Iteration.java @@ -29,7 +29,13 @@ import org.springframework.util.Assert; @Value public class Iteration { - public static final Iteration SR18 = new Iteration("SR18", null); + public static final Iteration SR24 = new Iteration("SR23", null); + public static final Iteration SR23 = new Iteration("SR23", SR24); + public static final Iteration SR22 = new Iteration("SR22", SR23); + public static final Iteration SR21 = new Iteration("SR21", SR22); + public static final Iteration SR20 = new Iteration("SR20", SR21); + public static final Iteration SR19 = new Iteration("SR19", SR20); + public static final Iteration SR18 = new Iteration("SR18", SR19); public static final Iteration SR17 = new Iteration("SR17", SR18); public static final Iteration SR16 = new Iteration("SR16", SR17); public static final Iteration SR15 = new Iteration("SR15", SR16); 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 0b08c42..194d8e1 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 @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.springframework.data.release.model.Train.Iterations; - /** * @author Oliver Gierke * @author Mark Paluch @@ -52,12 +50,9 @@ public class ReleaseTrains { Iteration M2 = new Iteration("M2", M3); Iteration M1 = new Iteration("M1", M2); - Iterations kayIterations = new Iterations(M1, M2, M3, M4, RC1, RC2, RC3, GA, SR1, SR2, SR3, SR4, SR5, SR6, SR7, SR8, SR9, SR10, SR11, SR12, SR13, SR14, SR15); - KAY = INGALLS.next("Kay", Transition.MAJOR, new Module(GEODE, "2.0")).withIterations(kayIterations); + KAY = INGALLS.next("Kay", Transition.MAJOR, new Module(GEODE, "2.0")); - Iterations lovelaceIterations = new Iterations(M1, M2, M3, RC1, RC2, GA, SR1, SR2, SR3, SR4, SR5, SR6, SR7, SR8, SR9, SR10); - LOVELACE = KAY.next("Lovelace", Transition.MINOR, new Module(JDBC, "1.0"), new Module(SOLR, "4.0")) - .withIterations(lovelaceIterations); + LOVELACE = KAY.next("Lovelace", Transition.MINOR, new Module(JDBC, "1.0"), new Module(SOLR, "4.0")); MOORE = LOVELACE.next("Moore", Transition.MINOR); diff --git a/release-tools/src/main/java/org/springframework/data/release/model/Train.java b/release-tools/src/main/java/org/springframework/data/release/model/Train.java index 2ef03bd..92d24f9 100644 --- a/release-tools/src/main/java/org/springframework/data/release/model/Train.java +++ b/release-tools/src/main/java/org/springframework/data/release/model/Train.java @@ -186,7 +186,7 @@ public class Train implements Streamable { public static class Iterations implements Iterable { public static Iterations DEFAULT = new Iterations(M1, RC1, GA, SR1, SR2, SR3, SR4, SR5, SR6, SR7, SR8, SR9, SR10, - SR11, SR12, SR13, SR14, SR15, SR16, SR17, SR18); + SR11, SR12, SR13, SR14, SR15, SR16, SR17, SR18, SR19, SR20, SR21, SR22, SR23, SR24); private final List iterations;