From 9694a8f8c01f65ee1f0f5bdedbecc90b9cf83059 Mon Sep 17 00:00:00 2001 From: moacirrf Date: Mon, 30 Jan 2023 16:14:29 -0300 Subject: [PATCH 1/5] Include configurations to sign nbm plugin --- .github/workflows/pre-release.yml | 32 ++++++++++++++++++++++++++++++ keystore.jks | Bin 0 -> 2276 bytes pom.xml | 17 +++++++++++++--- 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/pre-release.yml create mode 100644 keystore.jks diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml new file mode 100644 index 0000000..24cb6e6 --- /dev/null +++ b/.github/workflows/pre-release.yml @@ -0,0 +1,32 @@ +## YAML Template. +--- +name: Pre Release +on: + push: + branches: + - main + +jobs: + pre-release: + name: "Pre Release" + runs-on: "ubuntu-latest" + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - name: NBM + run: mvn -Dkeypass=${{secrets.KEYPASS}} verify + - uses: marvinpinto/action-automatic-releases@latest + with: + repo_token: "${{ secrets.NETBEANS_ACTION_TOKEN }}" + automatic_release_tag: "latest" + prerelease: true + title: "Development Build" + files: | + target/*.jar + target/*.nbm + diff --git a/keystore.jks b/keystore.jks new file mode 100644 index 0000000000000000000000000000000000000000..d41865a09ed531685693cf9cfcb9a81cc07aabd7 GIT binary patch literal 2276 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 literal 0 HcmV?d00001 diff --git a/pom.xml b/pom.xml index b61ffb8..815acca 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.github.moacirrf nb-java-decompiler - 1.0.2 + 2.0 nbm NB Java Decompiler https://github.com/moacirrf/nb-java-decompiler @@ -20,7 +20,7 @@ scm:git:https://github.com/moacirrf/nb-java-decompiler scm:git:https://github.com/moacirrf/nb-java-decompiler https://github.com/moacirrf/nb-java-decompiler/tree/${project.scm.tag} - v1.0.2 + v2.0 @@ -67,7 +67,10 @@ GNU GENERAL PUBLIC LICENSE 3.0 LICENSE + ${netbeansInstalationPath} --> + ${basedir}/keystore.jks + ${keypass} + nb-java-decompiler-key @@ -193,6 +196,14 @@ org-netbeans-api-java-classpath RELEASE130 + + + org.netbeans.external + updater + RELEASE130 + jar + + From 90c01eae6df27fb6b1bded87f1a321f9fb21b1ec Mon Sep 17 00:00:00 2001 From: moacirrf Date: Mon, 30 Jan 2023 16:20:42 -0300 Subject: [PATCH 2/5] Fix CI --- .github/workflows/maven-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 4721e2b..5b6ee03 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -13,5 +13,5 @@ jobs: with: java-version: '11' distribution: 'adopt' - - name: NBM + - name: Tests run: mvn test From 9fe77b925e4185f31477d269f2ad3afdb0520e4c Mon Sep 17 00:00:00 2001 From: moacirrf Date: Mon, 30 Jan 2023 17:37:44 -0300 Subject: [PATCH 3/5] Include profile to separate maven-gpg-plugin task. --- pom.xml | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 815acca..95bca35 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,29 @@ https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + maven-publish + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + + + @@ -97,20 +120,6 @@ maven-surefire-plugin 2.22.0 - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - From 3c27b0ec07a36a7a35c8acbc0fa5f14e985b3019 Mon Sep 17 00:00:00 2001 From: moacirrf Date: Mon, 30 Jan 2023 18:01:47 -0300 Subject: [PATCH 4/5] Fix ci --- .github/workflows/pre-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 24cb6e6..32dab27 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -4,7 +4,7 @@ name: Pre Release on: push: branches: - - main + - master jobs: pre-release: From 580ed4c018f87117d013d69cb33fd6d6ed33654d Mon Sep 17 00:00:00 2001 From: moacirrf Date: Mon, 30 Jan 2023 18:05:15 -0300 Subject: [PATCH 5/5] Change version to snapshot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95bca35..4e2e571 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.github.moacirrf nb-java-decompiler - 2.0 + 2.0-SNAPSHOT nbm NB Java Decompiler https://github.com/moacirrf/nb-java-decompiler