Skip to content

Commit 72ada49

Browse files
committed
Polishing.
1 parent 5c12d7f commit 72ada49

4 files changed

Lines changed: 28 additions & 9 deletions

File tree

src/main/java/org/springframework/data/release/infra/Dependencies.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ public class Dependencies {
173173

174174
public static final Dependency POSTGRES_R2DBC = Dependency.of("Postgres R2DBC Driver", "org.postgresql:r2dbc-postgresql");
175175

176+
public static final Dependency R2DBC_POOL = Dependency.of("R2DBC Pool", "io.r2dbc:r2dbc-pool");
177+
176178
public static final Dependency ORACLE_JDBC = Dependency.of("Oracle JDBC Driver", "com.oracle.database.jdbc:ojdbc11");
177179

178180
public static final Dependency ORACLE_R2DBC = Dependency.of("Oracle R2DBC Driver", "com.oracle.database.r2dbc:oracle-r2dbc");

src/main/java/org/springframework/data/release/infra/DependencyCommands.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,14 @@ public class DependencyCommands extends TimedCommand {
6969
@CliCommand(value = "dependency check")
7070
public void check(@CliOption(key = "", mandatory = true) TrainIteration iteration,
7171
@CliOption(key = "all", mandatory = false) Boolean reportAll,
72-
@CliOption(key = "no-git-prepare", unspecifiedDefaultValue = "false",
73-
specifiedDefaultValue = "true") boolean noGitPrepare,
72+
@CliOption(key = "no-git-fetch", unspecifiedDefaultValue = "false",
73+
specifiedDefaultValue = "true") boolean noGitFetch,
7474
@CliOption(key = "project", mandatory = false) Project project) throws IOException {
7575

76-
if (!noGitPrepare) {
76+
if (noGitFetch) {
77+
git.checkout(iteration);
78+
git.reset(iteration);
79+
} else {
7780
git.prepare(iteration);
7881
}
7982

@@ -167,7 +170,8 @@ public void upgrade(@CliOption(key = "", mandatory = true) TrainIteration iterat
167170
Thread.sleep(1500);
168171

169172
operations.closeUpgradeTickets(module, tickets);
170-
logger.log(module, "Upgraded %d dependencies", upgradesToApply.getDependencies().size());
173+
int count = upgradesToApply.getDependencies().size();
174+
logger.log(module, "Upgraded %d %s", count, count == 1 ? "dependency" : "dependencies");
171175
});
172176
}
173177

src/main/java/org/springframework/data/release/infra/ProjectDependencies.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ public class ProjectDependencies implements Streamable<ProjectDependencies.Proje
136136
config.add(Projects.RELATIONAL, ProjectDependency.managedProperty("r2dbc-mysql.version", Dependencies.MYSQL_R2DBC));
137137
config.add(Projects.RELATIONAL,
138138
ProjectDependency.managedProperty("oracle-r2dbc.version", Dependencies.ORACLE_R2DBC));
139+
config.add(Projects.RELATIONAL, ProjectDependency.managedProperty("r2dbc-pool.version", Dependencies.R2DBC_POOL));
139140
}
140141

141142
private final List<ProjectDependency> dependencies;

src/main/java/org/springframework/data/release/issues/github/GitHubCommands.java

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,24 @@ public void triggerDownstreamWorkflow(@CliOption(key = "source-repository") Stri
197197
}
198198

199199
@CliCommand(value = "github trigger snapshots")
200-
public void triggerSnapshots(@CliOption(key = "", mandatory = true) TrainIteration trainIteration) {
200+
public void triggerSnapshots(@CliOption(key = "", mandatory = false) TrainIteration trainIteration) {
201201

202-
ExecutionUtils.run(executor, trainIteration, it -> {
203-
GitHubWorkflows.GitHubWorkflow workflow = gitHub.getWorkflow(it.getSupportedProject(), "snapshots.yml");
204-
gitHub.triggerDownstreamWorkflow(workflow, it);
205-
});
202+
if (trainIteration == null) {
203+
204+
List<Train> latest = new ArrayList<>(ReleaseTrains.latest(3));
205+
Collections.reverse(latest);
206+
207+
for (int i = 0; i < latest.size(); i++) {
208+
Train train = latest.get(i);
209+
triggerSnapshots(train.getIteration(i == 0 ? Iteration.M1 : Iteration.SR1));
210+
}
211+
} else {
212+
213+
ExecutionUtils.run(executor, trainIteration, it -> {
214+
GitHubWorkflows.GitHubWorkflow workflow = gitHub.getWorkflow(it.getSupportedProject(), "snapshots.yml");
215+
gitHub.triggerDownstreamWorkflow(workflow, it);
216+
});
217+
}
206218
}
207219

208220
public void triggerAntoraWorkflow(SupportedProject project) {

0 commit comments

Comments
 (0)