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 8a9e2c7..4b0dc8e 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 @@ -28,7 +28,10 @@ import org.springframework.util.Assert; @Value public class Iteration { - public static final Iteration SR9 = new Iteration("SR9", null); + public static final Iteration SR12 = new Iteration("SR12", null); + public static final Iteration SR11 = new Iteration("SR11", SR12); + public static final Iteration SR10 = new Iteration("SR10", SR11); + public static final Iteration SR9 = new Iteration("SR9", SR10); public static final Iteration SR8 = new Iteration("SR8", SR9); public static final Iteration SR7 = new Iteration("SR7", SR8); public static final Iteration SR6 = new Iteration("SR6", SR7); 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 11832d4..6b6c39b 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,13 +43,14 @@ 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 M2 = new Iteration("M2", RC1); + 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(new Iteration("M1", M2), M2, RC1, GA, SR1, SR2, SR3, SR4, SR5, SR6, SR7); + Iterations iterations = new Iterations(M1, M2, M3, M4, RC1, GA, SR1, SR2, SR3, SR4, SR5, SR6, SR7); - KAY = INGALLS.next("Kay", Transition.MAJOR)// - .withAlwaysUseBranch(true)// - .withIterations(iterations); + KAY = INGALLS.next("Kay", Transition.MAJOR).withIterations(iterations); // Trains 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 e1d128c..79a6b81 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 @@ -184,7 +184,8 @@ public class Train implements Streamable { @ToString public static class Iterations implements Iterable { - public static Iterations DEFAULT = new Iterations(M1, RC1, GA, SR1, SR2, SR3, SR4, SR5, SR6, SR7, SR8, SR9); + public static Iterations DEFAULT = new Iterations(M1, RC1, GA, SR1, SR2, SR3, SR4, SR5, SR6, SR7, SR8, SR9, SR10, + SR11, SR12); private final List iterations;