From d18378892da6b3fe79c27d1d61834d6410320b76 Mon Sep 17 00:00:00 2001
From: Hongxin Liang <honnix@users.noreply.github.com>
Date: Wed, 27 Sep 2023 20:18:00 +0200
Subject: [PATCH 1/5] Add bom module

Signed-off-by: Hongxin Liang <honnix@users.noreply.github.com>
---
 flytekit-bom/pom.xml            | 155 ++++++++++++++++++++++++++++++++
 flytekit-examples-scala/pom.xml |   1 -
 flytekit-examples/pom.xml       |   4 -
 flytekit-scala-tests/pom.xml    |   1 -
 jflyte/pom.xml                  |   1 -
 pom.xml                         |   1 +
 6 files changed, 156 insertions(+), 7 deletions(-)
 create mode 100644 flytekit-bom/pom.xml

diff --git a/flytekit-bom/pom.xml b/flytekit-bom/pom.xml
new file mode 100644
index 000000000..fe8c13fef
--- /dev/null
+++ b/flytekit-bom/pom.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2021 Flyte Authors.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.flyte</groupId>
+  <artifactId>flytekit-bom</artifactId>
+  <version>0.4.24-SNAPSHOT</version>
+
+  <packaging>pom</packaging>
+
+  <name>Flytekit - Bill of Materials</name>
+  <description>Flytekit Java is the Java/Scala SDK built on top of Flyte.</description>
+  <url>https://github.com/flyteorg/flytekit-java</url>
+
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <developers>
+    <developer>
+      <name>flytekit</name>
+      <email>admin@flyte.org</email>
+      <organization>Flyte</organization>
+      <organizationUrl>https://flyte.org</organizationUrl>
+    </developer>
+  </developers>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>flytekit-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>flytekit-jackson</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>flytekit-java</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>flytekit-scala_2.12</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>flytekit-scala_2.13</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>flytekit-scala-tests</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>flytekit-testing</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>flytekit-examples</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>flytekit-examples-scala</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>flytekit-local-engine</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>flyteidl-protos</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>jflyte-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>jflyte-aws</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>jflyte-google-cloud</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>jflyte-utils</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>jflyte</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>integration-tests</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <scm>
+    <connection>scm:git:https://github.com/flyteorg/flytekit-java.git</connection>
+    <developerConnection>scm:git:https://github.com/flyteorg/flytekit-java.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://github.com/flyteorg/flytekit-java</url>
+  </scm>
+
+  <distributionManagement>
+    <repository>
+      <id>ossrh</id>
+      <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>
+    <snapshotRepository>
+      <id>ossrh</id>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+  </distributionManagement>
+</project>
diff --git a/flytekit-examples-scala/pom.xml b/flytekit-examples-scala/pom.xml
index 3d5e807b2..9795a0282 100644
--- a/flytekit-examples-scala/pom.xml
+++ b/flytekit-examples-scala/pom.xml
@@ -33,7 +33,6 @@
     <scala.baseVersion>2.13</scala.baseVersion>
     <scala.version>2.13.10</scala.version>
 
-    <maven.deploy.skip>true</maven.deploy.skip>
     <!-- spotbugs doesn't understand Scala code -->
     <spotbugs.skip>true</spotbugs.skip>
   </properties>
diff --git a/flytekit-examples/pom.xml b/flytekit-examples/pom.xml
index a682f3ecf..6773fb371 100644
--- a/flytekit-examples/pom.xml
+++ b/flytekit-examples/pom.xml
@@ -29,10 +29,6 @@
   <name>Flytekit Java Examples</name>
   <description>Examples of Tasks, Workflows and Launch plans written in Java.</description>
 
-  <properties>
-    <maven.deploy.skip>true</maven.deploy.skip>
-  </properties>
-
   <dependencies>
     <!-- compile -->
     <dependency>
diff --git a/flytekit-scala-tests/pom.xml b/flytekit-scala-tests/pom.xml
index 84e92e936..08b0b4ed2 100644
--- a/flytekit-scala-tests/pom.xml
+++ b/flytekit-scala-tests/pom.xml
@@ -36,7 +36,6 @@
     <scala.baseVersion>2.13</scala.baseVersion>
     <scala.version>2.13.10</scala.version>
 
-    <maven.deploy.skip>true</maven.deploy.skip>
     <!-- spotbugs doesn't understand Scala code -->
     <spotbugs.skip>true</spotbugs.skip>
   </properties>
diff --git a/jflyte/pom.xml b/jflyte/pom.xml
index 6229bf285..d7deef1a7 100644
--- a/jflyte/pom.xml
+++ b/jflyte/pom.xml
@@ -34,7 +34,6 @@
   <properties>
     <docker.image>ghcr.io/flyteorg/flytekit-java</docker.image>
     <docker.tag>${project.version}</docker.tag>
-    <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index c4ae8aca3..1549564a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
   </developers>
 
   <modules>
+    <module>flytekit-bom</module>
     <module>flytekit-api</module>
     <module>flytekit-jackson</module>
     <module>flytekit-java</module>

From 41fa10fe87dcfbeeb5c154bf6924e5924e292147 Mon Sep 17 00:00:00 2001
From: Hongxin Liang <honnix@users.noreply.github.com>
Date: Thu, 28 Sep 2023 09:17:49 +0200
Subject: [PATCH 2/5] Configure spotless for bom as well

Signed-off-by: Hongxin Liang <honnix@users.noreply.github.com>
---
 flytekit-bom/pom.xml | 94 ++++++++++++++++++++++++++++++++++++--------
 pom.xml              |  1 +
 2 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/flytekit-bom/pom.xml b/flytekit-bom/pom.xml
index fe8c13fef..fe1d96e56 100644
--- a/flytekit-bom/pom.xml
+++ b/flytekit-bom/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2021 Flyte Authors.
+  Copyright 2023 Flyte Authors.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -45,6 +45,24 @@
     </developer>
   </developers>
 
+  <scm>
+    <connection>scm:git:https://github.com/flyteorg/flytekit-java.git</connection>
+    <developerConnection>scm:git:https://github.com/flyteorg/flytekit-java.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://github.com/flyteorg/flytekit-java</url>
+  </scm>
+
+  <distributionManagement>
+    <repository>
+      <id>ossrh</id>
+      <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>
+    <snapshotRepository>
+      <id>ossrh</id>
+      <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+  </distributionManagement>
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -135,21 +153,63 @@
     </dependencies>
   </dependencyManagement>
 
-  <scm>
-    <connection>scm:git:https://github.com/flyteorg/flytekit-java.git</connection>
-    <developerConnection>scm:git:https://github.com/flyteorg/flytekit-java.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://github.com/flyteorg/flytekit-java</url>
-  </scm>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>com.diffplug.spotless</groupId>
+          <artifactId>spotless-maven-plugin</artifactId>
+          <version>2.21.0</version>
+          <configuration>
+            <pom>
+              <licenseHeader>
+                <content><![CDATA[<!--
+  Copyright $YEAR Flyte Authors.
 
-  <distributionManagement>
-    <repository>
-      <id>ossrh</id>
-      <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-  </distributionManagement>
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->]]></content>
+                <delimiter><![CDATA[<project]]></delimiter>
+              </licenseHeader>
+
+              <sortPom>
+                <encoding>UTF-8</encoding>
+                <lineSeparator>${line.separator}</lineSeparator>
+                <expandEmptyElements>false</expandEmptyElements>
+                <spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
+                <keepBlankLines>true</keepBlankLines>
+                <nrOfIndentSpace>2</nrOfIndentSpace>
+                <indentBlankLines>false</indentBlankLines>
+                <indentSchemaLocation>false</indentSchemaLocation>
+                <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
+                <sortProperties>false</sortProperties>
+                <sortModules>false</sortModules>
+                <sortExecutions>false</sortExecutions>
+              </sortPom>
+            </pom>
+
+            <formats>
+              <format>
+                <includes>
+                  <include>**/src/**.xml</include>
+                </includes>
+                <!-- Files must end with a newline -->
+                <endWithNewline />
+              </format>
+            </formats>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 1549564a3..9e36aa785 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,7 @@
     <picocli.version>4.7.2</picocli.version>
     <protobuf.version>3.21.12</protobuf.version>
     <sl4j.version>1.7.36</sl4j.version>
+    <!-- also remember to bump the version in flytekit-bom module -->
     <spotless.version>2.21.0</spotless.version>
     <spotbugs.excludeFilterFile>spotbugs-exclude.xml</spotbugs.excludeFilterFile>
     <error_prone.version>2.19.1</error_prone.version>

From 498defc71a62ef062adcd29893edb83544b3e1f0 Mon Sep 17 00:00:00 2001
From: Hongxin Liang <honnix@users.noreply.github.com>
Date: Thu, 28 Sep 2023 09:18:58 +0200
Subject: [PATCH 3/5] Run by default

Signed-off-by: Hongxin Liang <honnix@users.noreply.github.com>
---
 flytekit-bom/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/flytekit-bom/pom.xml b/flytekit-bom/pom.xml
index fe1d96e56..66d3ec25a 100644
--- a/flytekit-bom/pom.xml
+++ b/flytekit-bom/pom.xml
@@ -211,5 +211,12 @@
         </plugin>
       </plugins>
     </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
   </build>
 </project>

From 641aeeebba65a52f65348a2219ae2e2afebfd005 Mon Sep 17 00:00:00 2001
From: Hongxin Liang <honnix@users.noreply.github.com>
Date: Thu, 28 Sep 2023 09:24:15 +0200
Subject: [PATCH 4/5] Set execution

Signed-off-by: Hongxin Liang <honnix@users.noreply.github.com>
---
 flytekit-bom/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/flytekit-bom/pom.xml b/flytekit-bom/pom.xml
index 66d3ec25a..03e688df0 100644
--- a/flytekit-bom/pom.xml
+++ b/flytekit-bom/pom.xml
@@ -208,6 +208,14 @@
               </format>
             </formats>
           </configuration>
+          <executions>
+            <execution>
+              <goals>
+                <goal>check</goal>
+              </goals>
+              <phase>verify</phase>
+            </execution>
+          </executions>
         </plugin>
       </plugins>
     </pluginManagement>

From 348ee433a40cc6eb05e0c0a4d9f7fde1d7589138 Mon Sep 17 00:00:00 2001
From: Hongxin Liang <honnix@users.noreply.github.com>
Date: Thu, 28 Sep 2023 11:55:45 +0200
Subject: [PATCH 5/5] Release plugin

Signed-off-by: Hongxin Liang <honnix@users.noreply.github.com>
---
 flytekit-bom/pom.xml | 73 ++++++++++++++++++++++++++++++++++++++++++++
 pom.xml              |  1 +
 2 files changed, 74 insertions(+)

diff --git a/flytekit-bom/pom.xml b/flytekit-bom/pom.xml
index 03e688df0..27925aee9 100644
--- a/flytekit-bom/pom.xml
+++ b/flytekit-bom/pom.xml
@@ -227,4 +227,77 @@
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>release</id>
+      <!-- Based on: https://central.sonatype.org/pages/apache-maven.html-->
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>3.0.1</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+                <phase>verify</phase>
+                <configuration>
+                  <gpgArguments>
+                    <arg>--batch</arg>
+                    <arg>--pinentry-mode</arg>
+                    <arg>loopback</arg>
+                  </gpgArguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>3.2.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>3.3.1</version>
+            <configuration>
+              <source>8</source>
+              <doclint>all,-missing</doclint>
+            </configuration>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <version>1.6.8</version>
+            <extensions>true</extensions>
+            <configuration>
+              <serverId>ossrh</serverId>
+              <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+              <autoReleaseAfterClose>true</autoReleaseAfterClose>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 9e36aa785..4f6038fad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -751,6 +751,7 @@
     <profile>
       <id>release</id>
       <!-- Based on: https://central.sonatype.org/pages/apache-maven.html-->
+      <!-- Please also update the same profile in flytekit-bom module if needed -->
       <build>
         <plugins>
           <plugin>