From b9d48d8ae17e493a8d8673fd5ad4cb7a350f4187 Mon Sep 17 00:00:00 2001 From: Moe Jangda Date: Mon, 9 Sep 2024 22:59:53 -0500 Subject: [PATCH 01/19] WIP Co-Authored-By: Tom Daffurn --- jvm-runtime/ftl-runtime/pom.xml | 39 +++++++++++++++++++++++++++++++++ jvm-runtime/notes.txt | 1 + 2 files changed, 40 insertions(+) create mode 100644 jvm-runtime/notes.txt diff --git a/jvm-runtime/ftl-runtime/pom.xml b/jvm-runtime/ftl-runtime/pom.xml index cdfd931ac6..8a44743068 100644 --- a/jvm-runtime/ftl-runtime/pom.xml +++ b/jvm-runtime/ftl-runtime/pom.xml @@ -294,4 +294,43 @@ + + + + tbd-oss-thirdparty + tbd-oss-thirdparty + + true + + + false + + https://blockxyz.jfrog.io/artifactory/tbd-oss-thirdparty-maven2/ + + + tbd-oss-snapshots + tbd-oss-snapshots + + false + + + true + + https://blockxyz.jfrog.io/artifactory/tbd-oss-snapshots-maven2/ + + + + + + tbd-oss-thirdparty + tbd-oss-thirdparty + + true + + + false + + https://blockxyz.jfrog.io/artifactory/tbd-oss-thirdparty-maven2/ + + diff --git a/jvm-runtime/notes.txt b/jvm-runtime/notes.txt new file mode 100644 index 0000000000..44409a531f --- /dev/null +++ b/jvm-runtime/notes.txt @@ -0,0 +1 @@ +* ask ALR about tbd-oss-thirdparty. Specifically, what process or mechanism mirrors the web5 kt dependencies into this maven repository? From 6357e06e0b0b41814af5dfc1de6423af02b39414 Mon Sep 17 00:00:00 2001 From: Tom Daffurn Date: Tue, 10 Sep 2024 16:09:33 +1000 Subject: [PATCH 02/19] Try to do mvn release --- .github/workflows/release.yml | 40 +++++++++++++++++++-- jvm-runtime/ftl-runtime/.maven_settings.xml | 24 +++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 jvm-runtime/ftl-runtime/.maven_settings.xml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 610e5a28a2..f98d7e5eb0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -114,7 +114,7 @@ jobs: docker tag ftl0/ftl-box:latest ftl0/ftl-box:"$GITHUB_SHA" docker tag ftl0/ftl-box:latest ftl0/ftl-box:"$version" docker push -a ftl0/ftl-box - create-release: + create-go-release: name: Release Go Binaries runs-on: ubuntu-latest steps: @@ -136,10 +136,46 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} FTL_HOMEBREW_TOKEN: ${{ secrets.FTL_HOMEBREW_TOKEN }} + create-jvm-releases: + name: Release JVM Artifacts + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Init Hermit + uses: cashapp/activate-hermit@v1 + + - uses: actions/cache@v3 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + + - name: Set Version + run: mvn versions:set -DnewVersion=${{ github.ref_name }} + + - name: Build, Test, and Deploy to Maven Central + run: | + echo $(git describe --tags) + # Maven deploy lifecycle will build, run tests, verify, sign, and deploy + mvn \ + deploy \ + -P ossrh,sign-artifacts \ + --batch-mode \ + --settings .maven_settings.xml + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SIGN_KEY_PASS: ${{ secrets.GPG_SECRET_PASSPHRASE }} + SIGN_KEY: ${{ secrets.GPG_SECRET_KEY }} + hermit-release: name: Release Hermit runs-on: ubuntu-latest - needs: [create-release] + needs: [create-go-release] steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/jvm-runtime/ftl-runtime/.maven_settings.xml b/jvm-runtime/ftl-runtime/.maven_settings.xml new file mode 100644 index 0000000000..ac48809de6 --- /dev/null +++ b/jvm-runtime/ftl-runtime/.maven_settings.xml @@ -0,0 +1,24 @@ + + + + tbd-oss-releases + ${env.ARTIFACTORY_USERNAME} + ${env.ARTIFACTORY_PASSWORD} + + + tbd-oss-snapshots + ${env.ARTIFACTORY_USERNAME} + ${env.ARTIFACTORY_PASSWORD} + + + ossrh-snapshots + ${env.SONATYPE_USERNAME} + ${env.SONATYPE_PASSWORD} + + + ossrh-releases + ${env.SONATYPE_USERNAME} + ${env.SONATYPE_PASSWORD} + + + \ No newline at end of file From 1c223d2b131041ff88ae199625bed2fd0a0e40fa Mon Sep 17 00:00:00 2001 From: Tom Daffurn Date: Tue, 10 Sep 2024 16:26:57 +1000 Subject: [PATCH 03/19] move mvn stuff to a temp release for testing --- .github/workflows/temp-mvn-release.yml | 42 ++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/temp-mvn-release.yml diff --git a/.github/workflows/temp-mvn-release.yml b/.github/workflows/temp-mvn-release.yml new file mode 100644 index 0000000000..34022d5527 --- /dev/null +++ b/.github/workflows/temp-mvn-release.yml @@ -0,0 +1,42 @@ +on: + push: + tags: + - "v[0-9]+.[0-9]+.[0-9]+" + workflow_dispatch: +name: Release +jobs: + create-jvm-releases: + name: Release JVM Artifacts + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Init Hermit + uses: cashapp/activate-hermit@v1 + + - uses: actions/cache@v3 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + + - name: Set Version + run: mvn versions:set -DnewVersion=${{ github.ref_name }} + + - name: Build, Test, and Deploy to Maven Central + run: | + echo $(git describe --tags) + # Maven deploy lifecycle will build, run tests, verify, sign, and deploy + mvn \ + deploy \ + -P ossrh,sign-artifacts \ + --batch-mode \ + --settings .maven_settings.xml + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SIGN_KEY_PASS: ${{ secrets.GPG_SECRET_PASSPHRASE }} + SIGN_KEY: ${{ secrets.GPG_SECRET_KEY }} From cdf7141af54f0402baf4a2110f7daaa7d2fee282 Mon Sep 17 00:00:00 2001 From: Tom Daffurn Date: Tue, 10 Sep 2024 16:30:43 +1000 Subject: [PATCH 04/19] trigger it --- .github/workflows/temp-mvn-release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/temp-mvn-release.yml b/.github/workflows/temp-mvn-release.yml index 34022d5527..64bf8425dd 100644 --- a/.github/workflows/temp-mvn-release.yml +++ b/.github/workflows/temp-mvn-release.yml @@ -1,9 +1,9 @@ +name: Temp JVM Publish Workflow + on: push: - tags: - - "v[0-9]+.[0-9]+.[0-9]+" - workflow_dispatch: -name: Release + branches: + - jvm-publish jobs: create-jvm-releases: name: Release JVM Artifacts From 83d0783178263b82f285afbf27d69dd8553905ba Mon Sep 17 00:00:00 2001 From: Tom Daffurn Date: Tue, 10 Sep 2024 16:35:11 +1000 Subject: [PATCH 05/19] werking dir --- .github/workflows/temp-mvn-release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/temp-mvn-release.yml b/.github/workflows/temp-mvn-release.yml index 64bf8425dd..07319e2340 100644 --- a/.github/workflows/temp-mvn-release.yml +++ b/.github/workflows/temp-mvn-release.yml @@ -25,6 +25,7 @@ jobs: - name: Set Version run: mvn versions:set -DnewVersion=${{ github.ref_name }} + working-directory: ./jvm-runtime/ftl-runtime - name: Build, Test, and Deploy to Maven Central run: | @@ -35,6 +36,7 @@ jobs: -P ossrh,sign-artifacts \ --batch-mode \ --settings .maven_settings.xml + working-directory: ./jvm-runtime/ftl-runtime env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} From a0f9b4c4f77adb2d6a0c3df274efa5dd70af377e Mon Sep 17 00:00:00 2001 From: Tom Daffurn Date: Tue, 10 Sep 2024 16:43:00 +1000 Subject: [PATCH 06/19] add profiles and distro mgmt for mvn release --- jvm-runtime/ftl-runtime/pom.xml | 106 ++++++++++++++++++++++++-------- 1 file changed, 82 insertions(+), 24 deletions(-) diff --git a/jvm-runtime/ftl-runtime/pom.xml b/jvm-runtime/ftl-runtime/pom.xml index 8a44743068..fa30b8e569 100644 --- a/jvm-runtime/ftl-runtime/pom.xml +++ b/jvm-runtime/ftl-runtime/pom.xml @@ -293,32 +293,90 @@ + + sign-artifacts + + + + org.simplify4u.plugins + sign-maven-plugin + + + + + + + ossrh + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh-releases + https://s01.oss.sonatype.org/ + true + + + + + + + ossrh-snapshots + https://s01.oss.sonatype.org/content/repositories/snapshots + + + + ossrh-releases + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + - - - tbd-oss-thirdparty - tbd-oss-thirdparty - - true - - - false - - https://blockxyz.jfrog.io/artifactory/tbd-oss-thirdparty-maven2/ - - - tbd-oss-snapshots - tbd-oss-snapshots - - false - - - true - - https://blockxyz.jfrog.io/artifactory/tbd-oss-snapshots-maven2/ - - + + + false + tbd-oss-releases + TBD OSS Releases Repository + https://blockxyz.jfrog.io/artifactory/tbd-oss-releases-maven2 + default + + + false + tbd-oss-snapshots + TBD OSS Snapshots Repository + https://blockxyz.jfrog.io/artifactory/tbd-oss-snapshots-maven2 + default + + + + + + tbd-oss-thirdparty + tbd-oss-thirdparty + + true + + + false + + https://blockxyz.jfrog.io/artifactory/tbd-oss-thirdparty-maven2/ + + + tbd-oss-snapshots + tbd-oss-snapshots + + false + + + true + + https://blockxyz.jfrog.io/artifactory/tbd-oss-snapshots-maven2/ + + From 89bbecc1031acf233030eec5ffc51e43831d3b2d Mon Sep 17 00:00:00 2001 From: Tom Daffurn Date: Tue, 10 Sep 2024 16:56:41 +1000 Subject: [PATCH 07/19] plugins for sources and signing --- .../ftl-runtime/common/build-parent/pom.xml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/jvm-runtime/ftl-runtime/common/build-parent/pom.xml b/jvm-runtime/ftl-runtime/common/build-parent/pom.xml index 78056a8183..15ee24dbdf 100644 --- a/jvm-runtime/ftl-runtime/common/build-parent/pom.xml +++ b/jvm-runtime/ftl-runtime/common/build-parent/pom.xml @@ -104,6 +104,38 @@ + + maven-deploy-plugin + 2.8.2 + + true + + + + org.simplify4u.plugins + sign-maven-plugin + 1.1.0 + + + + sign + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar + + + + From 3fb6af6ee44a13c956590c3f8e3af59ad042924d Mon Sep 17 00:00:00 2001 From: Tom Daffurn Date: Tue, 10 Sep 2024 17:52:24 +1000 Subject: [PATCH 08/19] plugins for sources and signing --- .../ftl-runtime/common/build-parent/pom.xml | 32 -------------- jvm-runtime/ftl-runtime/pom.xml | 42 +++++++++++++++++++ 2 files changed, 42 insertions(+), 32 deletions(-) diff --git a/jvm-runtime/ftl-runtime/common/build-parent/pom.xml b/jvm-runtime/ftl-runtime/common/build-parent/pom.xml index 15ee24dbdf..78056a8183 100644 --- a/jvm-runtime/ftl-runtime/common/build-parent/pom.xml +++ b/jvm-runtime/ftl-runtime/common/build-parent/pom.xml @@ -104,38 +104,6 @@ - - maven-deploy-plugin - 2.8.2 - - true - - - - org.simplify4u.plugins - sign-maven-plugin - 1.1.0 - - - - sign - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.0 - - - attach-sources - - jar - - - - diff --git a/jvm-runtime/ftl-runtime/pom.xml b/jvm-runtime/ftl-runtime/pom.xml index fa30b8e569..01437801b4 100644 --- a/jvm-runtime/ftl-runtime/pom.xml +++ b/jvm-runtime/ftl-runtime/pom.xml @@ -207,8 +207,50 @@ quarkus-extension-maven-plugin ${quarkus.version} + + maven-deploy-plugin + 2.8.2 + + true + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar + + + + + + org.simplify4u.plugins + sign-maven-plugin + 1.1.0 + + + + sign + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-deploy-plugin + + From 0d47d68a82082cc8c64ec2990a7fc645c3d540e6 Mon Sep 17 00:00:00 2001 From: Tom Daffurn Date: Tue, 10 Sep 2024 18:01:30 +1000 Subject: [PATCH 09/19] javadoc jar --- jvm-runtime/ftl-runtime/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/jvm-runtime/ftl-runtime/pom.xml b/jvm-runtime/ftl-runtime/pom.xml index 01437801b4..86ed5f44d2 100644 --- a/jvm-runtime/ftl-runtime/pom.xml +++ b/jvm-runtime/ftl-runtime/pom.xml @@ -250,6 +250,19 @@ org.apache.maven.plugins maven-deploy-plugin + + org.jetbrains.dokka + dokka-maven-plugin + 1.9.20 + + + package + + javadocJar + + + + From 80f60103e542ff36e6b9a1b7e624dc104949635b Mon Sep 17 00:00:00 2001 From: Tom Daffurn Date: Tue, 10 Sep 2024 18:08:20 +1000 Subject: [PATCH 10/19] Description, scm, developers, license, URL --- jvm-runtime/ftl-runtime/pom.xml | 35 +++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/jvm-runtime/ftl-runtime/pom.xml b/jvm-runtime/ftl-runtime/pom.xml index 86ed5f44d2..092dcd19ed 100644 --- a/jvm-runtime/ftl-runtime/pom.xml +++ b/jvm-runtime/ftl-runtime/pom.xml @@ -7,6 +7,41 @@ 1.0-SNAPSHOT pom Ftl Java Runtime - Parent + Towards a 𝝺-calculus for large-scale systems + https://tbd54566975.github.io/ftl/ + + + + scm:git:git://github.com/TBD54566975/ftl.git + + scm:git:https://github.com/TBD54566975/ftl.git + https://github.com/TBD54566975/ftl + HEAD + + + + + + TBD54566975 + Block, Inc. + releases@tbd.email + + + + + + github + https://github.com/TBD54566975/ftl/issues + + + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + common From 8ec5b72f07e0a6c028c0d7f44488f86c29824c35 Mon Sep 17 00:00:00 2001 From: Moe Jangda Date: Tue, 10 Sep 2024 09:38:03 -0500 Subject: [PATCH 11/19] set working dir for jvm release tasks --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f98d7e5eb0..311efc65b3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -155,9 +155,11 @@ jobs: ${{ runner.os }}-maven- - name: Set Version + working-directory: ./jvm-runtime/ftl-runtime run: mvn versions:set -DnewVersion=${{ github.ref_name }} - name: Build, Test, and Deploy to Maven Central + working-directory: ./jvm-runtime/ftl-runtime run: | echo $(git describe --tags) # Maven deploy lifecycle will build, run tests, verify, sign, and deploy From 9e803181642880c0f73c2654a187106de8149b95 Mon Sep 17 00:00:00 2001 From: Moe Jangda Date: Tue, 10 Sep 2024 09:38:18 -0500 Subject: [PATCH 12/19] remove temp mvn release workflow --- .github/workflows/temp-mvn-release.yml | 44 -------------------------- 1 file changed, 44 deletions(-) delete mode 100644 .github/workflows/temp-mvn-release.yml diff --git a/.github/workflows/temp-mvn-release.yml b/.github/workflows/temp-mvn-release.yml deleted file mode 100644 index 07319e2340..0000000000 --- a/.github/workflows/temp-mvn-release.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Temp JVM Publish Workflow - -on: - push: - branches: - - jvm-publish -jobs: - create-jvm-releases: - name: Release JVM Artifacts - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Init Hermit - uses: cashapp/activate-hermit@v1 - - - uses: actions/cache@v3 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - - name: Set Version - run: mvn versions:set -DnewVersion=${{ github.ref_name }} - working-directory: ./jvm-runtime/ftl-runtime - - - name: Build, Test, and Deploy to Maven Central - run: | - echo $(git describe --tags) - # Maven deploy lifecycle will build, run tests, verify, sign, and deploy - mvn \ - deploy \ - -P ossrh,sign-artifacts \ - --batch-mode \ - --settings .maven_settings.xml - working-directory: ./jvm-runtime/ftl-runtime - env: - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SIGN_KEY_PASS: ${{ secrets.GPG_SECRET_PASSPHRASE }} - SIGN_KEY: ${{ secrets.GPG_SECRET_KEY }} From ea9f669ffbd496d2d67bb272e8553c6437cfce30 Mon Sep 17 00:00:00 2001 From: Moe Jangda Date: Tue, 10 Sep 2024 10:30:01 -0500 Subject: [PATCH 13/19] remove echo --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 311efc65b3..7c5121a445 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -161,7 +161,6 @@ jobs: - name: Build, Test, and Deploy to Maven Central working-directory: ./jvm-runtime/ftl-runtime run: | - echo $(git describe --tags) # Maven deploy lifecycle will build, run tests, verify, sign, and deploy mvn \ deploy \ From c74abdf3d3b12f491045a595094212c48cd6037b Mon Sep 17 00:00:00 2001 From: Moe Jangda Date: Tue, 10 Sep 2024 11:12:07 -0500 Subject: [PATCH 14/19] add comments --- jvm-runtime/ftl-runtime/pom.xml | 37 ++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/jvm-runtime/ftl-runtime/pom.xml b/jvm-runtime/ftl-runtime/pom.xml index 092dcd19ed..eeacdbb6ee 100644 --- a/jvm-runtime/ftl-runtime/pom.xml +++ b/jvm-runtime/ftl-runtime/pom.xml @@ -10,7 +10,6 @@ Towards a 𝝺-calculus for large-scale systems https://tbd54566975.github.io/ftl/ - scm:git:git://github.com/TBD54566975/ftl.git @@ -19,7 +18,6 @@ HEAD - TBD54566975 @@ -28,13 +26,11 @@ - github https://github.com/TBD54566975/ftl/issues - Apache License, Version 2.0 @@ -277,27 +273,16 @@ + org.apache.maven.plugins maven-source-plugin + org.apache.maven.plugins maven-deploy-plugin - - org.jetbrains.dokka - dokka-maven-plugin - 1.9.20 - - - package - - javadocJar - - - - @@ -383,6 +368,11 @@ + sign-artifacts @@ -394,6 +384,10 @@ + ossrh @@ -412,6 +406,8 @@ + + ossrh-snapshots @@ -426,6 +422,8 @@ + false @@ -443,7 +441,10 @@ + + tbd-oss-thirdparty tbd-oss-thirdparty @@ -455,6 +456,7 @@ https://blockxyz.jfrog.io/artifactory/tbd-oss-thirdparty-maven2/ + tbd-oss-snapshots tbd-oss-snapshots @@ -468,6 +470,7 @@ + tbd-oss-thirdparty From 0e578a89c91ee159a31469cf63cb5dab915aee72 Mon Sep 17 00:00:00 2001 From: Moe Jangda Date: Tue, 10 Sep 2024 11:15:30 -0500 Subject: [PATCH 15/19] moar comments --- jvm-runtime/ftl-runtime/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jvm-runtime/ftl-runtime/pom.xml b/jvm-runtime/ftl-runtime/pom.xml index eeacdbb6ee..be7056251e 100644 --- a/jvm-runtime/ftl-runtime/pom.xml +++ b/jvm-runtime/ftl-runtime/pom.xml @@ -425,6 +425,7 @@ + false tbd-oss-releases @@ -432,6 +433,7 @@ https://blockxyz.jfrog.io/artifactory/tbd-oss-releases-maven2 default + false tbd-oss-snapshots From 04118dff32aa05ae50a7c40173131b16bebeb74d Mon Sep 17 00:00:00 2001 From: Moe Jangda Date: Tue, 10 Sep 2024 11:16:44 -0500 Subject: [PATCH 16/19] remove notes --- jvm-runtime/notes.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 jvm-runtime/notes.txt diff --git a/jvm-runtime/notes.txt b/jvm-runtime/notes.txt deleted file mode 100644 index 44409a531f..0000000000 --- a/jvm-runtime/notes.txt +++ /dev/null @@ -1 +0,0 @@ -* ask ALR about tbd-oss-thirdparty. Specifically, what process or mechanism mirrors the web5 kt dependencies into this maven repository? From fdc8e424f9fdbe91b21904b25c022f9f100f1577 Mon Sep 17 00:00:00 2001 From: Tom Daffurn Date: Wed, 11 Sep 2024 09:12:10 +1000 Subject: [PATCH 17/19] move source plugin to a release profile --- .github/workflows/release.yml | 2 +- jvm-runtime/ftl-runtime/pom.xml | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7c5121a445..197d789284 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -164,7 +164,7 @@ jobs: # Maven deploy lifecycle will build, run tests, verify, sign, and deploy mvn \ deploy \ - -P ossrh,sign-artifacts \ + -P ossrh,release \ --batch-mode \ --settings .maven_settings.xml env: diff --git a/jvm-runtime/ftl-runtime/pom.xml b/jvm-runtime/ftl-runtime/pom.xml index be7056251e..5f1afab01d 100644 --- a/jvm-runtime/ftl-runtime/pom.xml +++ b/jvm-runtime/ftl-runtime/pom.xml @@ -273,11 +273,6 @@ - - - org.apache.maven.plugins - maven-source-plugin - org.apache.maven.plugins @@ -368,19 +363,22 @@ - + - sign-artifacts + + release + org.simplify4u.plugins sign-maven-plugin + + + org.apache.maven.plugins + maven-source-plugin + From 4aa97b9e25204dbfd8f3c80540abd806d2b926b4 Mon Sep 17 00:00:00 2001 From: Tom Daffurn Date: Wed, 11 Sep 2024 10:03:29 +1000 Subject: [PATCH 18/19] produce javaDoc jars in the release profile --- jvm-runtime/ftl-runtime/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/jvm-runtime/ftl-runtime/pom.xml b/jvm-runtime/ftl-runtime/pom.xml index 5f1afab01d..af60f52b80 100644 --- a/jvm-runtime/ftl-runtime/pom.xml +++ b/jvm-runtime/ftl-runtime/pom.xml @@ -379,6 +379,19 @@ org.apache.maven.plugins maven-source-plugin + + org.jetbrains.dokka + dokka-maven-plugin + 1.9.20 + + + package + + javadocJar + + + + From b8e8bee02ba787dbd01ef901900e92e0506d799c Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Wed, 11 Sep 2024 10:55:17 +1000 Subject: [PATCH 19/19] move TBD repo to a profile --- jvm-runtime/ftl-runtime/.maven_settings.xml | 115 ++++++++++++++++---- jvm-runtime/ftl-runtime/pom.xml | 64 ----------- 2 files changed, 93 insertions(+), 86 deletions(-) diff --git a/jvm-runtime/ftl-runtime/.maven_settings.xml b/jvm-runtime/ftl-runtime/.maven_settings.xml index ac48809de6..ab26ea06fc 100644 --- a/jvm-runtime/ftl-runtime/.maven_settings.xml +++ b/jvm-runtime/ftl-runtime/.maven_settings.xml @@ -1,24 +1,95 @@ - - - tbd-oss-releases - ${env.ARTIFACTORY_USERNAME} - ${env.ARTIFACTORY_PASSWORD} - - - tbd-oss-snapshots - ${env.ARTIFACTORY_USERNAME} - ${env.ARTIFACTORY_PASSWORD} - - - ossrh-snapshots - ${env.SONATYPE_USERNAME} - ${env.SONATYPE_PASSWORD} - - - ossrh-releases - ${env.SONATYPE_USERNAME} - ${env.SONATYPE_PASSWORD} - - + + + tbd-oss-releases + ${env.ARTIFACTORY_USERNAME} + ${env.ARTIFACTORY_PASSWORD} + + + tbd-oss-snapshots + ${env.ARTIFACTORY_USERNAME} + ${env.ARTIFACTORY_PASSWORD} + + + ossrh-snapshots + ${env.SONATYPE_USERNAME} + ${env.SONATYPE_PASSWORD} + + + ossrh-releases + ${env.SONATYPE_USERNAME} + ${env.SONATYPE_PASSWORD} + + + + + + tbd-internal + + + + + false + tbd-oss-releases + TBD OSS Releases Repository + https://blockxyz.jfrog.io/artifactory/tbd-oss-releases-maven2 + default + + + + false + tbd-oss-snapshots + TBD OSS Snapshots Repository + https://blockxyz.jfrog.io/artifactory/tbd-oss-snapshots-maven2 + default + + + + + + + + tbd-oss-thirdparty + tbd-oss-thirdparty + + true + + + false + + https://blockxyz.jfrog.io/artifactory/tbd-oss-thirdparty-maven2/ + + + + tbd-oss-snapshots + tbd-oss-snapshots + + false + + + true + + https://blockxyz.jfrog.io/artifactory/tbd-oss-snapshots-maven2/ + + + + + + + tbd-oss-thirdparty + tbd-oss-thirdparty + + true + + + false + + https://blockxyz.jfrog.io/artifactory/tbd-oss-thirdparty-maven2/ + + + + + \ No newline at end of file diff --git a/jvm-runtime/ftl-runtime/pom.xml b/jvm-runtime/ftl-runtime/pom.xml index af60f52b80..7b634e5ad1 100644 --- a/jvm-runtime/ftl-runtime/pom.xml +++ b/jvm-runtime/ftl-runtime/pom.xml @@ -433,68 +433,4 @@ - - - - - false - tbd-oss-releases - TBD OSS Releases Repository - https://blockxyz.jfrog.io/artifactory/tbd-oss-releases-maven2 - default - - - - false - tbd-oss-snapshots - TBD OSS Snapshots Repository - https://blockxyz.jfrog.io/artifactory/tbd-oss-snapshots-maven2 - default - - - - - - - - tbd-oss-thirdparty - tbd-oss-thirdparty - - true - - - false - - https://blockxyz.jfrog.io/artifactory/tbd-oss-thirdparty-maven2/ - - - - tbd-oss-snapshots - tbd-oss-snapshots - - false - - - true - - https://blockxyz.jfrog.io/artifactory/tbd-oss-snapshots-maven2/ - - - - - - - tbd-oss-thirdparty - tbd-oss-thirdparty - - true - - - false - - https://blockxyz.jfrog.io/artifactory/tbd-oss-thirdparty-maven2/ - -