From 87e6b5bb24ffb7b66a922ec81169e129324c77f2 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Thu, 17 Oct 2024 23:11:48 +0200 Subject: [PATCH] publish parent pom and fixes for jrelease process --- .github/workflows/early-access.yml | 22 +++++++++++++--------- gluon-plugin/pom.xml | 7 +++++++ kit/pom.xml | 5 ----- pom.xml | 20 ++++++++------------ 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index d5ad21304..adb56c56f 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -149,14 +149,10 @@ jobs: run: | mvn -B -ntp -pl :parent -DartifactsDir=artifacts jreleaser:release - - name: JReleaser output - if: always() - uses: actions/upload-artifact@v4 - with: - name: jreleaser-logs - path: | - target/jreleaser/trace.log - target/jreleaser/output.properties + - name: Deploy parent pom and Kit to local staging + run: | + mvn -B -ntp deploy -pl :parent -Dmaven.test.skip=true + mvn -B -ntp deploy -fkit -Dmaven.test.skip=true - name: Publish Kit with JReleaser env: @@ -167,5 +163,13 @@ jobs: JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }} JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }} run: | - mvn deploy -fkit mvn -B -ntp -pl :parent jreleaser:deploy + + - name: JReleaser output + if: always() + uses: actions/upload-artifact@v4 + with: + name: jreleaser-logs + path: | + target/jreleaser/trace.log + target/jreleaser/output.properties diff --git a/gluon-plugin/pom.xml b/gluon-plugin/pom.xml index ff72a6f87..ad7190af4 100644 --- a/gluon-plugin/pom.xml +++ b/gluon-plugin/pom.xml @@ -15,6 +15,13 @@ 4.0.21 + + + gluon-nexus + https://nexus.gluonhq.com/nexus/content/repositories/releases/ + + + com.gluonhq.scenebuilder diff --git a/kit/pom.xml b/kit/pom.xml index 5ab65ad27..179211563 100644 --- a/kit/pom.xml +++ b/kit/pom.xml @@ -97,11 +97,6 @@ target/lib - - org.apache.maven.plugins - maven-deploy-plugin - 3.1.3 - org.apache.maven.plugins maven-javadoc-plugin diff --git a/pom.xml b/pom.xml index 2f83173c5..45470f519 100644 --- a/pom.xml +++ b/pom.xml @@ -30,19 +30,9 @@ gluonhq/scenebuilder github.com:${project.github.repository} RELEASE + local::file:./target/staging-deploy - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - gluon-nexus - https://nexus.gluonhq.com/nexus/content/repositories/releases/ - - - @@ -134,6 +124,12 @@ 3.2.0 + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.3 + + org.apache.maven.plugins @@ -354,7 +350,7 @@ ALWAYS https://s01.oss.sonatype.org/service/local - https://s01.oss.sonatype.org/content/repositories/snapshots/ + https://s01.oss.sonatype.org/content/repositories/snapshots true false target/staging-deploy