Merge pull request #35610 from manofthepeace/vineflower

Change decompiler from quiltflower to vineflower

core/deployment/src/main/java/io/quarkus/deployment/pkg/PackageConfig.java

@@ -248,10 +248,10 @@ public static BuiltInType fromString(String value) {
     public boolean includeDependencyList;
 
     /**
-     * Quiltflower Decompiler configuration
+     * Vineflower Decompiler configuration
      */
     @ConfigItem
-    public QuiltFlowerConfig quiltflower;
+    public VineFlowerConfig vineflower;
 
     /**
      * If set to {@code true}, it will result in the Quarkus writing the transformed application bytecode
@@ -302,7 +302,7 @@ public String getRunnerSuffix() {
     }
 
     @ConfigGroup
-    public static class QuiltFlowerConfig {
+    public static class VineFlowerConfig {
         /**
          * An advanced option that will decompile generated and transformed bytecode into the 'decompiled' directory.
          * This is only taken into account when fast-jar is used.
@@ -311,13 +311,13 @@ public static class QuiltFlowerConfig {
         public boolean enabled;
 
         /**
-         * The version of Quiltflower to use
+         * The version of Vineflower to use
          */
-        @ConfigItem(defaultValue = "1.8.1")
+        @ConfigItem(defaultValue = "1.9.3")
         public String version;
 
         /**
-         * The directory into which to save the Quiltflower tool if it doesn't exist
+         * The directory into which to save the Vineflower tool if it doesn't exist
          */
         @ConfigItem(defaultValue = "${user.home}/.quarkus")
         public String jarDirectory;

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/JarResultBuildStep.java

@@ -603,17 +603,17 @@ private JarBuildItem buildThinJar(CurateOutcomeBuildItem curateOutcomeBuildItem,
         Path decompiledOutputDir = null;
         boolean wasDecompiledSuccessfully = true;
         Decompiler decompiler = null;
-        if (packageConfig.quiltflower.enabled) {
+        if (packageConfig.vineflower.enabled) {
             decompiledOutputDir = buildDir.getParent().resolve("decompiled");
             FileUtil.deleteDirectory(decompiledOutputDir);
             Files.createDirectory(decompiledOutputDir);
-            if (packageConfig.quiltflower.enabled) {
-                decompiler = new Decompiler.QuiltflowerDecompiler();
-                Path jarDirectory = Paths.get(packageConfig.quiltflower.jarDirectory);
+            if (packageConfig.vineflower.enabled) {
+                decompiler = new Decompiler.VineflowerDecompiler();
+                Path jarDirectory = Paths.get(packageConfig.vineflower.jarDirectory);
                 if (!Files.exists(jarDirectory)) {
                     Files.createDirectory(jarDirectory);
                 }
-                decompiler.init(new Decompiler.Context(packageConfig.quiltflower.version, jarDirectory, decompiledOutputDir));
+                decompiler.init(new Decompiler.Context(packageConfig.vineflower.version, jarDirectory, decompiledOutputDir));
                 decompiler.downloadIfNecessary();
             }
         }
@@ -1576,15 +1576,15 @@ public Context(String versionStr, Path jarLocation, Path decompiledOutputDir) {
 
         }
 
-        class QuiltflowerDecompiler implements Decompiler {
+        class VineflowerDecompiler implements Decompiler {
 
             private Context context;
             private Path decompilerJar;
 
             @Override
             public void init(Context context) {
                 this.context = context;
-                this.decompilerJar = context.jarLocation.resolve(String.format("quiltflower-%s.jar", context.versionStr));
+                this.decompilerJar = context.jarLocation.resolve(String.format("vineflower-%s.jar", context.versionStr));
             }
 
             @Override
@@ -1593,7 +1593,7 @@ public boolean downloadIfNecessary() {
                     return true;
                 }
                 String downloadURL = String.format(
-                        "https://github.com/QuiltMC/quiltflower/releases/download/%s/quiltflower-%s.jar",
+                        "https://repo.maven.apache.org/maven2/org/vineflower/vineflower/%s/vineflower-%s.jar",
                         context.versionStr, context.versionStr);
                 try (BufferedInputStream in = new BufferedInputStream(new URL(downloadURL).openStream());
                         FileOutputStream fileOutputStream = new FileOutputStream(decompilerJar.toFile())) {
@@ -1604,7 +1604,7 @@ public boolean downloadIfNecessary() {
                     }
                     return true;
                 } catch (IOException e) {
-                    log.error("Unable to download Quiltflower from " + downloadURL, e);
+                    log.error("Unable to download Vineflower from " + downloadURL, e);
                     return false;
                 }
             }
@@ -1637,7 +1637,7 @@ public boolean decompile(Path jarToDecompile) {
                 }
 
                 if (exitCode != 0) {
-                    log.errorf("Quiltflower decompiler exited with error code: %d.", exitCode);
+                    log.errorf("Vineflower decompiler exited with error code: %d.", exitCode);
                     return false;
                 }
 

docs/.vale/fixtures/Quarkus/Headings/testvalid.adoc

@@ -10,7 +10,7 @@
 == Proof Key for Code Exchange
 == Kogito updates
 == IBM Cloud is a valid product name
-== Spotify, GraphQL, and Quiltflower are proper nouns so uppercase in headings is OK.
+== Spotify, GraphQL, and Vineflower are proper nouns so uppercase in headings is OK.
 == Use xDS gRPC
 == Use JBoss Logging for application logging
 == JBoss Logging API

docs/.vale/fixtures/Quarkus/Spelling/testvalid.adoc

@@ -270,7 +270,6 @@ Pytorch
 qeth
 Quarkiverse
 Quarkus
-Quiltflower
 Qute
 Readonly
 Rebalance
@@ -376,6 +375,7 @@ Valgrind
 validator
 Velero
 Vert.x
+Vineflower
 vsix
 WebAuthn
 WebSocket

docs/.vale/styles/Quarkus/Headings.yml

@@ -194,7 +194,6 @@ exceptions:
   - Qt
   - Quarkiverse
   - Quarkus
-  - Quiltflower
   - Qute
   - RESTEasy
   - Red Hat
@@ -233,6 +232,7 @@ exceptions:
   - Valgrind
   - Velero
   - Vert.x
+  - Vineflower
   - WebAuthn
   - WebSocket
   - Webview

docs/.vale/styles/Quarkus/Spelling.yml

@@ -379,7 +379,6 @@ filters:
   - QLogic
   - Quarkiverse
   - Quarkus
-  - Quiltflower
   - Qute
   - Realtime
   - Redis
@@ -425,6 +424,7 @@ filters:
   - Velero
   - Vert.x
   - vHost
+  - Vineflower
   - VMs
   - VMware
   - vsix

docs/src/main/asciidoc/writing-extensions.adoc

@@ -2251,7 +2251,7 @@ The only particular aspect of writing Quarkus extensions in Eclipse is that APT
 Quarkus generates a lot of classes during the build phase and in many cases also transforms existing classes.
 It is often extremely useful to see the generated bytecode and transformed classes during the development of an extension.
 
-If you set the `quarkus.package.quiltflower.enabled` property to `true` then Quarkus will download and invoke the https://github.com/QuiltMC/quiltflower[Quiltflower decompiler] and dump the result in the `decompiled` directory of the build tool output (`target/decompiled` for Maven for example).
+If you set the `quarkus.package.vineflower.enabled` property to `true` then Quarkus will download and invoke the https://github.com/Vineflower/vineflower[Vineflower decompiler] and dump the result in the `decompiled` directory of the build tool output (`target/decompiled` for Maven for example).
 
 NOTE: This property only works during a normal production build (i.e. not for dev mode/tests) and when `fast-jar` packaging type is used (the default behavior).
 

integration-tests/hibernate-orm-panache/src/main/resources/application.properties

@@ -7,4 +7,4 @@ quarkus.hibernate-orm.database.generation=drop-and-create
 quarkus.hibernate-orm.statistics=true
 quarkus.hibernate-orm.metrics.enabled=true
 
-quarkus.package.quiltflower.enabled=true
+quarkus.package.vineflower.enabled=true

integration-tests/resteasy-reactive-kotlin/standard/src/main/resources/application.properties

@@ -21,6 +21,6 @@ mp.messaging.incoming.countries-t2-in.connector=smallrye-kafka
 mp.messaging.incoming.countries-t2-in.topic=countries-t2
 mp.messaging.incoming.countries-t2-in.auto.offset.reset=earliest
 
-quarkus.package.quiltflower.enabled=true
+quarkus.package.vineflower.enabled=true
 
 test.prop=test