From 6a689a2473f50710e03eeda070b5ce0734875b20 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 29 Oct 2020 10:12:23 +0100 Subject: [PATCH] #156 - Add 2021.0 release train (Codename: Pascal). --- .../springframework/data/release/model/Iteration.java | 8 ++++---- .../data/release/model/ReleaseTrains.java | 10 +++++++--- .../org/springframework/data/release/model/Train.java | 3 ++- 3 files changed, 13 insertions(+), 8 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 f0c6225..d48c473 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 @@ -62,12 +62,12 @@ public class Iteration implements Comparable { public static final Iteration RC4 = new Iteration("RC4", GA); public static final Iteration RC3 = new Iteration("RC3", GA); public static final Iteration RC2 = new Iteration("RC2", GA); - public static final Iteration RC1 = new Iteration("RC1", GA); + public static final Iteration RC1 = new Iteration("RC1", RC2); public static final Iteration M5 = new Iteration("M5", RC1); public static final Iteration M4 = new Iteration("M4", RC1); public static final Iteration M3 = new Iteration("M3", RC1); - public static final Iteration M2 = new Iteration("M2", RC1); - public static final Iteration M1 = new Iteration("M1", RC1); + public static final Iteration M2 = new Iteration("M2", M3); + public static final Iteration M1 = new Iteration("M1", M2); private static final int GREATER_THAN = 1; private static final int LESS_THAN = -GREATER_THAN; @@ -89,7 +89,7 @@ public class Iteration implements Comparable { /** * Lookup {@link Iteration} by its string value. - * + * * @param iteration * @return * @throws IllegalArgumentException if iteration cannot be resolved. 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 0318e9b..0e1d8ab 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 @@ -29,7 +29,7 @@ public class ReleaseTrains { public static final List TRAINS; public static final Train CODD, DIJKSTRA, EVANS, FOWLER, GOSLING, HOPPER, INGALLS, KAY, LOVELACE, MOORE, NEUMANN, - OCKHAM; + OCKHAM, PASCAL; static { @@ -68,12 +68,16 @@ public class ReleaseTrains { OCKHAM = NEUMANN.next("Ockham", Transition.MINOR, // new Module(BOM, "2020.0.0"), // new Module(NEO4J, "6.0") // - ).withCalver("2020.0.0").withIterations(new Train.Iterations(M1, M2, RC1, RC2, GA, SR1, SR2, SR3, SR4, SR5)); + ).withCalver("2020.0"); + + PASCAL = OCKHAM.next("Pascal", Transition.MINOR) // + .withCalver("2021.0") // + .withIterations(new Train.Iterations(M1, M2, RC1, RC2, GA, SR1, SR2, SR3, SR4, SR5)); // Trains TRAINS = Arrays.asList(CODD, DIJKSTRA, EVANS, FOWLER, GOSLING, HOPPER, INGALLS, KAY, LOVELACE, MOORE, NEUMANN, - OCKHAM); + OCKHAM, PASCAL); } private static Train codd() { 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 1fb6551..8c344da 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 @@ -216,7 +216,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, SR10, + public static Iterations DEFAULT = new Iterations(M1, M2, M3, RC1, RC2, GA, SR1, SR2, SR3, SR4, SR5, SR6, SR7, SR8, + SR9, SR10, SR11, SR12, SR13, SR14, SR15, SR16, SR17, SR18, SR19, SR20, SR21, SR22, SR23, SR24); private final List iterations;