From 83d614f8794a9783821d5cfdfa9c97a274a7e3b7 Mon Sep 17 00:00:00 2001
From: Elizabeth Worstell <worstell@squareup.com>
Date: Thu, 16 Nov 2023 13:00:00 -0800
Subject: [PATCH] fix: only release generator executable; resolve child POMs

---
 .github/workflows/release.yml        |  3 +-
 kotlin-runtime/ftl-generator/pom.xml | 53 ++++++++++++++++++------
 kotlin-runtime/ftl-runtime/pom.xml   |  4 +-
 pom.xml                              | 62 +++++++++++++++++++++++++++-
 4 files changed, 105 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 05439e64d7..959fd97a08 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -112,8 +112,7 @@ jobs:
       - name: Publish JARs # Snapshots are published first, then the tagged release
         run: |
           mvn -U --batch-mode clean deploy -P release
-          mvn --batch-mode versions:set -DnewVersion=$(git describe --tags --abbrev=0 | cut -c2-) -DprocessAllModules -DgenerateBackupPoms=false
-          mvn -U --batch-mode clean deploy -P release
+#          mvn -Drevision=$(git describe --tags --abbrev=0 | cut -c2-) -U --batch-mode clean deploy -P release
         env:
           SIGN_KEY_PASS: ${{ secrets.GPG_PASSPHRASE }}
           OSSRH_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
diff --git a/kotlin-runtime/ftl-generator/pom.xml b/kotlin-runtime/ftl-generator/pom.xml
index 41bae2619a..d7fc7c2aa0 100644
--- a/kotlin-runtime/ftl-generator/pom.xml
+++ b/kotlin-runtime/ftl-generator/pom.xml
@@ -7,13 +7,15 @@
     <parent>
         <groupId>xyz.block</groupId>
         <artifactId>ftl</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>${revision}</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>ftl-generator</artifactId>
     <packaging>jar</packaging>
 
+    <name>${project.groupId}:${project.artifactId}</name>
+
     <properties>
         <rootDir>${basedir}/../..</rootDir>
         <maven.deploy.skip>false</maven.deploy.skip>
@@ -41,25 +43,27 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.5.1</version>
                 <executions>
                     <execution>
+                        <id>package-jar</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>shade</goal>
                         </goals>
-                        <configuration>
-                            <archive>
-                                <manifest>
-                                    <mainClass>xyz.block.ftl.generator.MainKt</mainClass>
-                                </manifest>
-                            </archive>
-                            <descriptorRefs>
-                                <descriptorRef>jar-with-dependencies</descriptorRef>
-                            </descriptorRefs>
-                        </configuration>
                     </execution>
                 </executions>
+                <configuration>
+                    <shadedArtifactAttached>false</shadedArtifactAttached>
+                    <transformers>
+                        <transformer
+                                implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <mainClass>xyz.block.ftl.generator.MainKt</mainClass>
+                        </transformer>
+                    </transformers>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -89,4 +93,27 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>flatten-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>package-jar</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>flatten</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/kotlin-runtime/ftl-runtime/pom.xml b/kotlin-runtime/ftl-runtime/pom.xml
index 0430f47033..4c012fb8cd 100644
--- a/kotlin-runtime/ftl-runtime/pom.xml
+++ b/kotlin-runtime/ftl-runtime/pom.xml
@@ -7,13 +7,15 @@
     <parent>
         <groupId>xyz.block</groupId>
         <artifactId>ftl</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>${revision}</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>ftl-runtime</artifactId>
     <packaging>jar</packaging>
 
+    <name>${project.groupId}:${project.artifactId}</name>
+
     <properties>
         <rootDir>${basedir}/../..</rootDir>
         <maven.deploy.skip>false</maven.deploy.skip>
diff --git a/pom.xml b/pom.xml
index f035168bea..d0d623b04b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,9 +6,13 @@
 
     <groupId>xyz.block</groupId>
     <artifactId>ftl</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
 
+    <name>FTL</name>
+    <description>Towards a 𝝺-calculus for large-scale systems</description>
+    <url>https://github.com/TBD54566975/ftl</url>
+
     <licenses>
         <license>
             <name>The Apache License, Version 2.0</name>
@@ -16,6 +20,24 @@
         </license>
     </licenses>
 
+    <developers>
+        <developer>
+            <name>Alec Thomas</name>
+            <organization>TBD</organization>
+            <organizationUrl>https://github.com/TBD54566975</organizationUrl>
+        </developer>
+        <developer>
+            <name>Wes Billman</name>
+            <organization>TBD</organization>
+            <organizationUrl>https://github.com/TBD54566975</organizationUrl>
+        </developer>
+        <developer>
+            <name>Elizabeth Worstell</name>
+            <organization>TBD</organization>
+            <organizationUrl>https://github.com/TBD54566975</organizationUrl>
+        </developer>
+    </developers>
+
     <scm>
         <connection>scm:git:git://github.com/TBD54566975/ftl.git</connection>
         <developerConnection>scm:git:ssh://github.com/TBD54566975/ftl.git</developerConnection>
@@ -38,6 +60,7 @@
         <logback.version>1.4.8</logback.version>
         <junit.version>5.10.0</junit.version>
         <logstash.version>7.4</logstash.version>
+        <revision>1.0-SNAPSHOT</revision>
     </properties>
 
     <dependencyManagement>
@@ -293,7 +316,44 @@
                 <module>kotlin-runtime/ftl-generator</module>
             </modules>
             <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.codehaus.mojo</groupId>
+                            <artifactId>flatten-maven-plugin</artifactId>
+                            <version>1.5.0</version>
+                            <executions>
+                                <execution>
+                                    <id>flatten</id>
+                                    <phase>process-resources</phase>
+                                    <goals>
+                                        <goal>flatten</goal>
+                                    </goals>
+                                </execution>
+                                <execution>
+                                    <id>flatten.clean</id>
+                                    <phase>clean</phase>
+                                    <goals>
+                                        <goal>clean</goal>
+                                    </goals>
+                                </execution>
+                            </executions>
+                            <configuration>
+                                <flattenMode>ossrh</flattenMode>
+                                <updatePomFile>true</updatePomFile>
+                                <pomElements>
+                                    <dependencyManagement>expand</dependencyManagement>
+                                    <dependencies>expand</dependencies>
+                                </pomElements>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
                 <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>flatten-maven-plugin</artifactId>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-release-plugin</artifactId>