Merge pull request #40908 from manofthepeace/removeDeprecatedVineflower

Remove deprecated vineflower properties support
quarkusio · Jun 4, 2024 · aad3d22 · aad3d22
2 parents 6f0aebc + 0a2b5fd
commit aad3d22
Showing 1 changed file with 2 additions and 16 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigCompatibility.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigCompatibility.java
@@ -61,12 +61,6 @@ public final class ConfigCompatibility {
                     ConfigCompatibility::quarkusPackageDecompilerEnabled),
             entry(List.of("quarkus", "package", "decompiler", "jar-directory"),
                     ConfigCompatibility::quarkusPackageDecompilerJarDirectory),
-            entry(List.of("quarkus", "package", "vineflower", "version"),
-                    ConfigCompatibility::quarkusPackageDecompilerVersion),
-            entry(List.of("quarkus", "package", "vineflower", "enabled"),
-                    ConfigCompatibility::quarkusPackageDecompilerEnabled),
-            entry(List.of("quarkus", "package", "vineflower", "jar-directory"),
-                    ConfigCompatibility::quarkusPackageDecompilerJarDirectory),
             entry(List.of("quarkus", "package", "manifest", "attributes", "*"),
                     ConfigCompatibility::quarkusPackageManifestAttributes),
             entry(List.of("quarkus", "package", "manifest", "sections", "*", "*"),
@@ -510,11 +504,7 @@ private static ConfigValue quarkusPackageJarManifestAddImplementationEntries(Con
     private static ConfigValue quarkusPackageJarDecompilerEnabled(ConfigSourceInterceptorContext ctxt, NameIterator ni) {
         ConfigValue oldVal = ctxt.restart("quarkus.package.decompiler.enabled");
         if (oldVal == null) {
-            oldVal = ctxt.restart("quarkus.package.vineflower.enabled");
-            if (oldVal == null) {
-                // on to the default value
-                return ctxt.proceed(ni.getName());
-            }
+            return ctxt.proceed(ni.getName());
         }
         // map old name to new name
         return oldVal.withName(ni.getName());
@@ -523,11 +513,7 @@ private static ConfigValue quarkusPackageJarDecompilerEnabled(ConfigSourceInterc
     private static ConfigValue quarkusPackageJarDecompilerJarDirectory(ConfigSourceInterceptorContext ctxt, NameIterator ni) {
         ConfigValue oldVal = ctxt.restart("quarkus.package.decompiler.jar-directory");
         if (oldVal == null) {
-            oldVal = ctxt.restart("quarkus.package.vineflower.jar-directory");
-            if (oldVal == null) {
-                // on to the default value
-                return ctxt.proceed(ni.getName());
-            }
+            return ctxt.proceed(ni.getName());
         }
         // map old name to new name
         return oldVal.withName(ni.getName());