diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ac6905005..5179e2c5b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -113,8 +113,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 dec27fe35..bd8717961 100644
--- a/kotlin-runtime/ftl-generator/pom.xml
+++ b/kotlin-runtime/ftl-generator/pom.xml
@@ -1,19 +1,21 @@
+ 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">
4.0.0
xyz.block
ftl
- 1.0-SNAPSHOT
+ ${revision}
../../pom.xml
ftl-generator
jar
+ ${project.groupId}:${project.artifactId}
+
${basedir}/../..
false
@@ -28,35 +30,80 @@
${project.groupId}
ftl-runtime
- ${project.parent.version}
+ ${project.version}
com.github.ajalt.clikt
clikt-jvm
4.2.1
+
+ com.squareup.wire
+ wire-runtime-jvm
+
+
+ com.squareup.wire
+ wire-grpc-server
+
+
+ com.squareup.wire
+ wire-grpc-client-jvm
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib
+
+
+ net.logstash.logback
+ logstash-logback-encoder
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ ch.qos.logback
+ logback-core
+
+
+ io.grpc
+ grpc-netty
+
+
+ io.grpc
+ grpc-protobuf
+
+
+ io.grpc
+ grpc-stub
+
+
+ org.hotswapagent
+ hotswap-agent-core
+
org.apache.maven.plugins
- maven-assembly-plugin
+ maven-shade-plugin
+ shade-jar
package
- single
+ shade
-
-
+ false
+
+
xyz.block.ftl.generator.MainKt
-
-
-
- jar-with-dependencies
-
+
+
+ false
@@ -89,4 +136,36 @@
+
+
+
+ release
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+
+
+ shade-jar
+
+ true
+
+
+
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+
+
+ flatten
+ package
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/kotlin-runtime/ftl-runtime/pom.xml b/kotlin-runtime/ftl-runtime/pom.xml
index 198ea7bf8..f997b4d07 100644
--- a/kotlin-runtime/ftl-runtime/pom.xml
+++ b/kotlin-runtime/ftl-runtime/pom.xml
@@ -7,13 +7,15 @@
xyz.block
ftl
- 1.0-SNAPSHOT
+ ${revision}
../../pom.xml
ftl-runtime
jar
+ ${project.groupId}:${project.artifactId}
+
${basedir}/../..
false
@@ -53,6 +55,51 @@
2.10.1
+
+ com.squareup.wire
+ wire-runtime-jvm
+
+
+ com.squareup.wire
+ wire-grpc-server
+
+
+ com.squareup.wire
+ wire-grpc-client-jvm
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib
+
+
+ net.logstash.logback
+ logstash-logback-encoder
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ ch.qos.logback
+ logback-core
+
+
+ io.grpc
+ grpc-netty
+
+
+ io.grpc
+ grpc-protobuf
+
+
+ io.grpc
+ grpc-stub
+
+
+ org.hotswapagent
+ hotswap-agent-core
+
+
io.gitlab.arturbosch.detekt
diff --git a/pom.xml b/pom.xml
index a43708751..94ebc253b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,14 +1,18 @@
+ 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">
4.0.0
xyz.block
ftl
- 1.0-SNAPSHOT
+ ${revision}
pom
+ FTL
+ Towards a 𝝺-calculus for large-scale systems
+ https://github.com/TBD54566975/ftl
+
The Apache License, Version 2.0
@@ -16,6 +20,24 @@
+
+
+ Alec Thomas
+ TBD
+ https://github.com/TBD54566975
+
+
+ Wes Billman
+ TBD
+ https://github.com/TBD54566975
+
+
+ Elizabeth Worstell
+ TBD
+ https://github.com/TBD54566975
+
+
+
scm:git:git://github.com/TBD54566975/ftl.git
scm:git:ssh://github.com/TBD54566975/ftl.git
@@ -38,6 +60,7 @@
1.4.11
5.10.1
7.4
+ 1.0-SNAPSHOT
@@ -49,34 +72,68 @@
pom
import
+
+ com.squareup.wire
+ wire-runtime-jvm
+ ${wire.version}
+
+
+ com.squareup.wire
+ wire-grpc-server
+ ${wire.version}
+
+
+ com.squareup.wire
+ wire-grpc-client-jvm
+ ${wire.version}
+
+
+ org.jetbrains.kotlin
+ kotlin-stdlib
+ ${kotlin.version}
+
+
+
+
+ net.logstash.logback
+ logstash-logback-encoder
+ ${logstash.version}
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback.version}
+
+
+ ch.qos.logback
+ logback-core
+ ${logback.version}
+
+
+
+ io.grpc
+ grpc-netty
+ ${grpc.version}
+
+
+ io.grpc
+ grpc-protobuf
+ ${grpc.version}
+
+
+ io.grpc
+ grpc-stub
+ ${grpc.version}
+
+
+ org.hotswapagent
+ hotswap-agent-core
+ 1.4.1
+
-
- org.jetbrains.kotlin
- kotlin-stdlib
- ${kotlin.version}
-
-
-
-
- net.logstash.logback
- logstash-logback-encoder
- ${logstash.version}
-
-
- ch.qos.logback
- logback-classic
- ${logback.version}
-
-
- ch.qos.logback
- logback-core
- ${logback.version}
-
-
-
org.junit.jupiter
@@ -94,44 +151,6 @@
junit-jupiter-params
test
-
-
-
- io.grpc
- grpc-netty
- ${grpc.version}
-
-
- io.grpc
- grpc-protobuf
- ${grpc.version}
-
-
- io.grpc
- grpc-stub
- ${grpc.version}
-
-
-
- com.squareup.wire
- wire-runtime-jvm
- ${wire.version}
-
-
- com.squareup.wire
- wire-grpc-server
- ${wire.version}
-
-
- com.squareup.wire
- wire-grpc-client-jvm
- ${wire.version}
-
-
- org.hotswapagent
- hotswap-agent-core
- 1.4.1
-
@@ -280,6 +299,32 @@
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.5.1
+
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+ 1.5.0
+
+
+ flatten
+ process-resources
+
+ flatten
+
+
+
+ flatten.clean
+ clean
+
+ clean
+
+
+
+
@@ -294,6 +339,15 @@
+
+ org.codehaus.mojo
+ flatten-maven-plugin
+ 1.5.0
+
+ ossrh
+ true
+
+
org.apache.maven.plugins
maven-release-plugin