fix: use Maven to output the correct classpath for user code (#487)

Then extend `ftl.toml` to use it. This fixes issues where older versions of JARs were shadowing newer versions because we were just file-system globbing the classpath.
block · Oct 12, 2023 · cb0495e · cb0495e
1 parent c931fa1
commit cb0495e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/examples/echo-kotlin/pom.xml b/examples/echo-kotlin/pom.xml
@@ -97,6 +97,17 @@
                             <includeScope>runtime</includeScope>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>build-classpath</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>build-classpath</goal>
+                        </goals>
+                        <configuration>
+                            <outputFile>${project.build.directory}/classpath.txt</outputFile>
+                            <prefix>dependency</prefix>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <!-- Run the Wire compiler -->

diff --git a/kotlin-runtime/ftl-generator/src/main/kotlin/xyz/block/ftl/generator/ModuleGenerator.kt b/kotlin-runtime/ftl-generator/src/main/kotlin/xyz/block/ftl/generator/ModuleGenerator.kt
@@ -175,15 +175,15 @@ class ModuleGenerator() {
       """
       module = "${module}"
       language = "kotlin"
-      deploy = ["main", "classes", "dependency"]
+      deploy = ["main", "classes", "dependency", "classpath.txt"]
       """.trimIndent()
     )
 
     val mainFile = Path.of(buildDir, "main")
     mainFile.writeText(
       """
       #!/bin/bash
-      exec java -cp "classes:$(printf %s: dependency/*.jar)" xyz.block.ftl.main.MainKt
+      exec java -cp "classes:$(cat classpath.txt)" xyz.block.ftl.main.MainKt
       """.trimIndent(),
     )
     mainFile.setPosixFilePermissions(

diff --git a/pom.xml b/pom.xml
@@ -192,7 +192,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.6.0</version>
                     <executions>
                         <execution>
                             <phase>initialize</phase>