Spring/spring-data-dev-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Mark Paluch
2021-05-14 12:20:01 +02:00
parent 57082ee57d
commit 27a89a75f0
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
release-tools/readme.md
View File

@@ -53,8 +53,6 @@ $ release prepare $trainIteration
$ release build $trainIteration
$ release conclude $trainIteration
$ github push $trainIteration
# After GitHub issues migration:
# github push $trainIteration
$ git backport changelog $trainIteration --target $targets
$ foreach $target -> git push $target
```
@@ -74,7 +72,6 @@ $ release distribute $trainIteration
$ tracker close $trainIteration
$ tracker create releaseversions $trainIteration.next
$ tracker create releasetickets $trainIteration.next
$ tracker archive $trainIteration.previous
```
* Update versions in Sagan with `$ sagan update $releasetrains`.

2
release-tools/src/main/java/org/springframework/data/release/cli/TrainIterationConverter.java
View File

@@ -35,7 +35,7 @@ import org.springframework.stereotype.Component;
@Component
public class TrainIterationConverter implements Converter<TrainIteration> {
private static final Pattern CALVER = Pattern.compile("(\\d{4})(\\.(\\d))+(-M(\\d)|-RC(\\d))?");
private static final Pattern CALVER = Pattern.compile("(\\d{4})(\\.(\\d+))+(-M(\\d)|-RC(\\d))?");
/*
* (non-Javadoc)

4
release-tools/src/main/java/org/springframework/data/release/model/ReleaseTrains.java
View File

@@ -68,14 +68,14 @@ public class ReleaseTrains {
OCKHAM = NEUMANN.next("Ockham", Transition.MINOR, //
new Module(BOM, "2020.0.0"), //
new Module(NEO4J, "6.0") //
).withCalver("2020.0");
).withIterations(Train.Iterations.DEFAULT).withCalver("2020.0");
PASCAL = OCKHAM.next("Pascal", Transition.MINOR) //
.filterModules(module -> !module.getProject().equals(SOLR))
.withCalver("2021.0") //
.withIterations(new Train.Iterations(M1, M2, M3, M4, M5, RC1, RC2, GA, SR1, SR2, SR3, SR4, SR5));
Q = PASCAL.next("R", Transition.MINOR) //
Q = PASCAL.next("Q", Transition.MINOR) //
.withCalver("2021.1") //
.withIterations(new Train.Iterations(M1, M2, M3, M4, M5, RC1, RC2, GA, SR1, SR2, SR3, SR4, SR5));