Skip to content

Commit 1b8bb11

Browse files
Fix
1 parent dcf12ec commit 1b8bb11

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

src/e2eTest/java/io/micrometer/release/train/MetaTrainGithubActionsE2eTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ void should_verify_generic_milestone(String branch) throws JsonProcessingExcepti
6767
private static void runTrainPostReleaseWorkflow() {
6868
log.info("Running meta train release from main");
6969
GithubActions.runWorkflow("meta-release-train-workflow.yml", "main",
70-
List.of("gh", "workflow", "run", "release-train-workflow.yml", "--ref", "main", "-f",
71-
"micrometer_versions=0.1.1", "-f", "tracing_versions=2.0.0"));
70+
List.of("gh", "workflow", "run", "meta-release-train-workflow.yml", "--ref", "main", "-f",
71+
"micrometer_versions=1.1.0", "-f", "tracing_versions=2.0.0"));
7272
}
7373

7474
}

src/main/java/io/micrometer/release/common/ProcessRunner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ Process startProcess(String... processedCommand) throws IOException, Interrupted
157157
if (directory != null) {
158158
processBuilder.directory(directory);
159159
}
160+
log.info("Starting process from folder [{}]",
161+
directory != null ? directory.getAbsolutePath() : new File(".").getAbsolutePath());
160162
return doStartProcess(processBuilder);
161163
}
162164

@@ -166,8 +168,6 @@ Process doStartProcess(ProcessBuilder processBuilder) throws IOException {
166168
processBuilder.environment().put("JAVA_HOME", JAVA_PATH_FOR_ECLIPSE_DOCKER_IMAGE);
167169
}
168170
processBuilder.environment().putAll(this.envVars);
169-
log.info("Starting process from folder [{}]",
170-
directory != null ? directory.getAbsolutePath() : new File(".").getAbsolutePath());
171171
return processBuilder.start();
172172
}
173173

src/test/java/io/micrometer/release/train/TrainOptionsTests.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,19 @@
1313
*/
1414
package io.micrometer.release.train;
1515

16+
import io.micrometer.release.common.Dependency;
17+
import io.micrometer.release.train.TrainOptions.Project;
18+
import io.micrometer.release.train.TrainOptions.ProjectDefinition;
1619
import io.micrometer.release.train.TrainOptions.ProjectSetup;
20+
import io.micrometer.release.train.TrainOptions.ProjectWithDependencies;
1721
import org.junit.jupiter.api.Test;
1822
import org.junit.jupiter.params.ParameterizedTest;
1923
import org.junit.jupiter.params.provider.Arguments;
2024
import org.junit.jupiter.params.provider.CsvSource;
2125
import org.junit.jupiter.params.provider.MethodSource;
2226

2327
import java.util.List;
28+
import java.util.Set;
2429
import java.util.stream.Stream;
2530

2631
import static io.micrometer.release.train.TrainOptions.Project.*;
@@ -38,6 +43,21 @@ void should_throw_exception_for_no_versions() {
3843
.hasMessage("At least one of the versions must be set...");
3944
}
4045

46+
@Test
47+
void should_return_list_of_dependencies() {
48+
ProjectSetup projectSetup = new ProjectSetup(
49+
List.of(new ProjectWithDependencies(new Project(ProjectDefinition.TRACING, "2.0.0"), List.of(new TrainOptions.Dependency(ProjectDefinition.MICROMETER, "1.0.0")))),
50+
"micrometer-metrics/tracing");
51+
52+
Set<Dependency> dependencies = projectSetup.expectedDependencies();
53+
54+
then(dependencies).hasSize(1);
55+
Dependency dependency = dependencies.stream().toList().get(0);
56+
then(dependency.version()).isEqualTo("1.0.0");
57+
then(dependency.artifact()).isEqualTo("micrometer-bom");
58+
then(dependency.group()).isEqualTo("io.micrometer");
59+
}
60+
4161
@ParameterizedTest(name = "contextProp <{0}>, microm <{1}>, tracing <{2}>, docsGen <{3}>")
4262
@CsvSource(textBlock = """
4363
1;2,3;4,5,6;7,8,9,0

0 commit comments

Comments
 (0)