Skip to content

Commit f8e2adf

Browse files
authored
Merge pull request wildfly#19393 from rhusar/WFLY-21184
WFLY-21184 Micrometer SubsystemParsingTestCase does not correctly det…
2 parents bdd6e5c + d1fb19f commit f8e2adf

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

observability/micrometer/src/main/java/org/wildfly/extension/micrometer/MicrometerSubsystemSchema.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
public enum MicrometerSubsystemSchema implements PersistentSubsystemSchema<MicrometerSubsystemSchema> {
2525
VERSION_1_0(1, 0, Stability.DEFAULT), // WildFly 28
26-
VERSION_1_1(1, 1, Stability.DEFAULT), // WildFly 29.0.0.Alpha1
27-
VERSION_2_0_COMMUNITY(2, 0, Stability.COMMUNITY) // WildFly 36
26+
VERSION_1_1(1, 1, Stability.DEFAULT), // WildFly 29 - present
27+
VERSION_2_0_COMMUNITY(2, 0, Stability.COMMUNITY) // WildFly 36 - present
2828
;
2929

3030
public static final Set<MicrometerSubsystemSchema> CURRENT = EnumSet.of(VERSION_1_1, VERSION_2_0_COMMUNITY);

observability/micrometer/src/test/java/org/wildfly/extension/micrometer/SubsystemParsingTestCase.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import java.util.EnumSet;
99

10+
import org.jboss.as.controller.Feature;
1011
import org.jboss.as.subsystem.test.AbstractSubsystemSchemaTest;
1112
import org.junit.runner.RunWith;
1213
import org.junit.runners.Parameterized;
@@ -23,7 +24,7 @@ public static Iterable<MicrometerSubsystemSchema> parameters() {
2324
}
2425

2526
public SubsystemParsingTestCase(MicrometerSubsystemSchema schema) {
26-
super(MicrometerConfigurationConstants.NAME, new MicrometerExtension(), schema,
27-
MicrometerSubsystemSchema.VERSION_2_0_COMMUNITY);
27+
// TODO WFCORE-7416 Eventually simplify by using this constructor AbstractSubsystemSchemaTest(String, Extension, S, Set<S>)
28+
super(MicrometerConfigurationConstants.NAME, new MicrometerExtension(), schema, Feature.map(MicrometerSubsystemSchema.CURRENT).get(schema.getStability()));
2829
}
2930
}

0 commit comments

Comments
 (0)