From 564e1f24a99afa798378344e3fa7f17f5dd06215 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Thu, 17 Oct 2024 17:09:25 +0200 Subject: [PATCH 1/4] publish Kit snapshot to sonatype --- .github/workflows/early-access.yml | 12 +++++++ kit/pom.xml | 57 ++++++++++++++++++++++++++---- pom.xml | 33 ++++++++++------- 3 files changed, 82 insertions(+), 20 deletions(-) diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index 120f44e33..d5ad21304 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -157,3 +157,15 @@ jobs: path: | target/jreleaser/trace.log target/jreleaser/output.properties + + - name: Publish Kit with JReleaser + env: + JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + JRELEASER_NEXUS2_USERNAME: ${{ secrets.JRELEASER_NEXUS2_USERNAME }} + JRELEASER_NEXUS2_PASSWORD: ${{ secrets.JRELEASER_NEXUS2_TOKEN }} + JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }} + 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 diff --git a/kit/pom.xml b/kit/pom.xml index 8259bb8d6..5ab65ad27 100644 --- a/kit/pom.xml +++ b/kit/pom.xml @@ -3,13 +3,20 @@ 4.0.0 kit Scene Builder Kit - + Scene Builder is a visual, drag n drop, layout tool for designing JavaFX application user interfaces + 2012 + https://github.com/gluonhq/scenebuilder + com.gluonhq.scenebuilder parent 24.0.0-SNAPSHOT + + local::file:./target/staging-deploy + + @@ -84,17 +91,53 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.4.2 scenebuilder-kit-${project.version} target/lib - - - com.gluonhq.scenebuilder.kit - - + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.3 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.10.1 + + + attach-javadocs + + jar + + + true + none + ${project.build.directory}/lib + ${project.build.directory}/lib + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + attach-sources + + jar + + + true + ${project.build.directory}/lib + + + + diff --git a/pom.xml b/pom.xml index c36bd29ec..2f83173c5 100644 --- a/pom.xml +++ b/pom.xml @@ -101,23 +101,12 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.13.0 false - - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0-M1 - - true - - false - - org.apache.maven.plugins @@ -202,7 +191,7 @@ org.jreleaser jreleaser-maven-plugin - 1.5.1 + 1.14.0 false @@ -355,6 +344,24 @@ + + ALWAYS + true + + + + + + ALWAYS + https://s01.oss.sonatype.org/service/local + https://s01.oss.sonatype.org/content/repositories/snapshots/ + true + false + target/staging-deploy + + + + From 87e6b5bb24ffb7b66a922ec81169e129324c77f2 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Thu, 17 Oct 2024 23:11:48 +0200 Subject: [PATCH 2/4] 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 From e7e481424a4f6c17fdea81f8270b561db6f4f48b Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Fri, 18 Oct 2024 19:41:37 +0200 Subject: [PATCH 3/4] use legacy server --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 45470f519..4817d4994 100644 --- a/pom.xml +++ b/pom.xml @@ -349,8 +349,9 @@ ALWAYS - https://s01.oss.sonatype.org/service/local - https://s01.oss.sonatype.org/content/repositories/snapshots + https://oss.sonatype.org/service/local + true + https://oss.sonatype.org/content/repositories/snapshots true false target/staging-deploy From 4b68b3dc3b93b74e52ab9a338af8c79ddd32fd0a Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Fri, 18 Oct 2024 19:45:31 +0200 Subject: [PATCH 4/4] unneeded property --- kit/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kit/pom.xml b/kit/pom.xml index 179211563..dd4802e91 100644 --- a/kit/pom.xml +++ b/kit/pom.xml @@ -13,10 +13,6 @@ 24.0.0-SNAPSHOT - - local::file:./target/staging-deploy - -