include ConfigurationValueProvider in native image; delete Substitute…

…EnvironmentValueProvider
quarkusio · Jul 24, 2024 · c818ffa · c818ffa
1 parent 7ab7002
commit c818ffa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 26 deletions.
diff --git a/...iquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/LiquibaseProcessor.java b/...iquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/LiquibaseProcessor.java
@@ -97,9 +97,6 @@ class LiquibaseProcessor {
     private static final String LIQUIBASE_PROPERTIES_PATH = "";
     private static final String LIQUIBASE_DB_CHANGELOG_XSD_PATH = "www.liquibase.org/xml/ns/dbchangelog";
     private static final String LIQUIBASE_SERVICE_PATH = "META-INF/services/";
-    // see: https://github.com/quarkusio/quarkus/pull/41928#issuecomment-2242353134
-    private static final Set<String> EXCLUDED_SERVICES = Set.of(
-            liquibase.configuration.ConfigurationValueProvider.class.getName());
 
     private static final DotName DATABASE_CHANGE_PROPERTY = DotName.createSimple(DatabaseChangeProperty.class.getName());
 
@@ -116,7 +113,7 @@ IndexDependencyBuildItem indexLiquibase() {
     @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class)
     @Record(STATIC_INIT)
     void nativeImageConfiguration(
-            LiquibaseRecorder recorder,
+            LiquibaseRecorder ignored,
             LiquibaseBuildTimeConfig liquibaseBuildConfig,
             List<JdbcDataSourceBuildItem> jdbcDataSourceBuildItems,
             CombinedIndexBuildItem combinedIndex,
@@ -296,8 +293,7 @@ private void loadLiquibaseServiceProviderConfig(
             BuildProducer<ServiceProviderBuildItem> services,
             BuildProducer<ReflectiveClassBuildItem> reflective) {
 
-        getResourceNames(tree, LIQUIBASE_SERVICE_PATH, "", true).stream()
-                .filter(not(EXCLUDED_SERVICES::contains))
+        getResourceNames(tree, LIQUIBASE_SERVICE_PATH, "", true)
                 .forEach(t -> consumeService(t, (serviceClassName, implementations) -> {
                     services.produce(new ServiceProviderBuildItem(
                             serviceClassName,

diff --git a/.../src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteEnvironmentValueProvider.java b/.../src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteEnvironmentValueProvider.java