From 47494aaee1affcf26e6e31f5ef0ad22609e0d688 Mon Sep 17 00:00:00 2001 From: Elizabeth Worstell 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 | 51 ++++++++++++--- kotlin-runtime/ftl-runtime/pom.xml | 21 ++++++- pom.xml | 93 +++++++++++++++++++++++----- 4 files changed, 138 insertions(+), 30 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ac69050050..5179e2c5b9 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 dec27fe35c..eaba96dffa 100644 --- a/kotlin-runtime/ftl-generator/pom.xml +++ b/kotlin-runtime/ftl-generator/pom.xml @@ -7,16 +7,19 @@ xyz.block ftl - 1.0-SNAPSHOT + ${revision} ../../pom.xml ftl-generator jar + ${project.groupId}:${project.artifactId} + ${basedir}/../.. false + 1.0-SNAPSHOT @@ -35,32 +38,60 @@ 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.apache.maven.plugins - maven-assembly-plugin + maven-shade-plugin package - single + shade - - + false + + xyz.block.ftl.generator.MainKt - - - - jar-with-dependencies - + + + + org.codehaus.mojo + flatten-maven-plugin + + + + flatten + package + + flatten + + + + org.apache.maven.plugins maven-surefire-plugin diff --git a/kotlin-runtime/ftl-runtime/pom.xml b/kotlin-runtime/ftl-runtime/pom.xml index 198ea7bf83..4c285b2ca5 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,19 @@ 2.10.1 + + com.squareup.wire + wire-runtime-jvm + + + com.squareup.wire + wire-grpc-server + + + com.squareup.wire + wire-grpc-client-jvm + + io.gitlab.arturbosch.detekt @@ -72,6 +87,10 @@ + + org.codehaus.mojo + flatten-maven-plugin + org.codehaus.mojo build-helper-maven-plugin diff --git a/pom.xml b/pom.xml index a437087514..f65faf50f7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,9 +6,13 @@ 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,6 +72,21 @@ 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} + @@ -111,22 +149,6 @@ 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 @@ -280,6 +302,36 @@ + + 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 + + + + + resolveCiFriendliesOnly + true + + @@ -294,6 +346,13 @@ + + org.codehaus.mojo + flatten-maven-plugin + + ossrh + + org.apache.maven.plugins maven-release-plugin