From be4cef192bbddbca6522f6a5af57569bbe7b3a22 Mon Sep 17 00:00:00 2001 From: Build Pipeline Date: Mon, 20 Sep 2021 11:24:05 +0200 Subject: [PATCH 1/9] update action --- .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 9d6e05c..5273966 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -23,4 +23,4 @@ jobs: - name: Build with Maven env: SONATYPE_PASSWORD: ${{ secrets.SonatypePassword }} - run: mvn -B deploy --file pom.xml -s settings-template.xml + run: mvn -B -Prelease source:jar javadoc:jar deploy --file pom.xml -s settings-template.xml From 1d7a9fbc4586f63aee1f8b97bbb0960e043420f1 Mon Sep 17 00:00:00 2001 From: Build Pipeline Date: Mon, 20 Sep 2021 11:26:02 +0200 Subject: [PATCH 2/9] update action --- .github/workflows/maven-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 5273966..1948867 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -4,6 +4,7 @@ name: Maven Package on: + workflow_dispatch: release: types: - published From 7502a8a0bfcb5fcc3b072d8beb08557af18543e0 Mon Sep 17 00:00:00 2001 From: Build Pipeline Date: Mon, 20 Sep 2021 11:49:04 +0200 Subject: [PATCH 3/9] update action --- settings-template.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/settings-template.xml b/settings-template.xml index 17de78e..4bc93f8 100644 --- a/settings-template.xml +++ b/settings-template.xml @@ -14,7 +14,12 @@ sonatype-server bsorrentino - ${env.SONATYPE_PASSWORD} + ${env.OSS_SONATYPE_PASSWORD} + + + + github + ${env.GITHUB_TOKEN} From 5fe5843f13ed7ff71dd907a0cbb5d2273c28c2d9 Mon Sep 17 00:00:00 2001 From: Build Pipeline Date: Mon, 20 Sep 2021 11:52:36 +0200 Subject: [PATCH 4/9] update action --- .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 1948867..0b1589a 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -23,5 +23,5 @@ jobs: - name: Build with Maven env: - SONATYPE_PASSWORD: ${{ secrets.SonatypePassword }} + OSS_SONATYPE_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }} run: mvn -B -Prelease source:jar javadoc:jar deploy --file pom.xml -s settings-template.xml From 74a27c402ec9f38bb7e41dc75d2132c423e15451 Mon Sep 17 00:00:00 2001 From: Build Pipeline Date: Mon, 20 Sep 2021 11:59:32 +0200 Subject: [PATCH 5/9] update action --- .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 0b1589a..af16888 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -24,4 +24,4 @@ jobs: - name: Build with Maven env: OSS_SONATYPE_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }} - run: mvn -B -Prelease source:jar javadoc:jar deploy --file pom.xml -s settings-template.xml + run: mvn -B -Prelease source:jar javadoc:jar deploy --file pom.xml -s settings-template.xml -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} From 727365ca0fb7bf03406a54d2c476235f516f9d53 Mon Sep 17 00:00:00 2001 From: Build Pipeline Date: Mon, 20 Sep 2021 12:09:22 +0200 Subject: [PATCH 6/9] update action --- .github/workflows/maven-publish.yml | 9 +++++++-- gpg-setup.sh | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100755 gpg-setup.sh diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index af16888..c92da2f 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -20,8 +20,13 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - - - name: Build with Maven + - name: GPG Setup + env: + GPG_KEY_BASE64: ${{ secrets.GPG_KEY_BASE64 }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + run: ./gpg-setup.sh + - name: Deploy to OSS Sonatype env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} OSS_SONATYPE_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }} run: mvn -B -Prelease source:jar javadoc:jar deploy --file pom.xml -s settings-template.xml -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} diff --git a/gpg-setup.sh b/gpg-setup.sh new file mode 100755 index 0000000..6a93b18 --- /dev/null +++ b/gpg-setup.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +# +# Prepare GPG Key is expected to be in base64 +# Exported with gpg -a --export-secret-keys "your@email" | base64 > gpg.base64 +# +printf "$GPG_KEY_BASE64" | base64 --decode > gpg.asc +echo ${GPG_PASSPHRASE} | gpg --batch --yes --passphrase-fd 0 --import gpg.asc +gpg -k \ No newline at end of file From 82afe2c111141f0907dc5b5c17433a0bf5a85065 Mon Sep 17 00:00:00 2001 From: Build Pipeline Date: Mon, 20 Sep 2021 12:10:51 +0200 Subject: [PATCH 7/9] update action --- .github/workflows/maven-publish.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index c92da2f..0376044 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -21,10 +21,10 @@ jobs: with: java-version: 1.8 - name: GPG Setup - env: - GPG_KEY_BASE64: ${{ secrets.GPG_KEY_BASE64 }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - run: ./gpg-setup.sh + env: + GPG_KEY_BASE64: ${{ secrets.GPG_KEY_BASE64 }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + run: ./gpg-setup.sh - name: Deploy to OSS Sonatype env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 29f10d0b045eec3c7ea9bb3a23aa85f88ba55fca Mon Sep 17 00:00:00 2001 From: Build Pipeline Date: Mon, 20 Sep 2021 12:28:15 +0200 Subject: [PATCH 8/9] skip deploy --- samples.rhino/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/samples.rhino/pom.xml b/samples.rhino/pom.xml index 54296df..657cee8 100644 --- a/samples.rhino/pom.xml +++ b/samples.rhino/pom.xml @@ -84,6 +84,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + org.apache.maven.plugins maven-dependency-plugin From 34ac374368965dc16a351dedeb51738f8dabda9f Mon Sep 17 00:00:00 2001 From: Build Pipeline Date: Mon, 20 Sep 2021 12:35:29 +0200 Subject: [PATCH 9/9] skip source = false --- samples.rhino/pom.xml | 404 +++++++++++++++++++++--------------------- samples/pom.xml | 3 +- 2 files changed, 202 insertions(+), 205 deletions(-) diff --git a/samples.rhino/pom.xml b/samples.rhino/pom.xml index 657cee8..9271d66 100644 --- a/samples.rhino/pom.xml +++ b/samples.rhino/pom.xml @@ -1,220 +1,216 @@ - - 4.0.0 - rhino-sample - java2ts-processor::rhino::sample - rhino sample - - - org.bsc.processor - java2ts-processor-parent - 1.3.0 - - - - - sample - - - - org.apache.maven.plugins - maven-compiler-plugin - - none - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - org.apache.maven.plugins - maven-source-plugin - - true - - - - - - - - - - - org.bsc.processor - java2ts-processor - ${project.version} - - - - - - - rhino - - true - - - - - org.bsc - jvm-npm-rhino - 1.1.0 - - - org.mozilla - rhino - - - + + 4.0.0 + rhino-sample + java2ts-processor::rhino::sample + rhino sample - - org.mozilla - rhino - 1.7.12 - + + org.bsc.processor + java2ts-processor-parent + 1.3.0 + - + - + sample - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - package - - unpack - + + org.apache.maven.plugins + maven-compiler-plugin - - - org.bsc - jvm-npm-core - jar - false - ${project.build.directory}/js - **/*.js - - + none - - - - - - org.bsc.maven - maven-processor-plugin - - - process - - process-test - - package + + + org.apache.maven.plugins + maven-deploy-plugin - ts - - jdk8 - rhino - + true - - - - - org.codehaus.mojo - exec-maven-plugin - - java - - -classpath - - org.bsc.java2ts.JSRun$Rhino - app.js - - - + - - - - - - nashorn - - - - - - - org.bsc.maven - maven-processor-plugin - - - process - - process-test - - package + + - - + + + + + + + org.bsc.processor + java2ts-processor + ${project.version} + - + + + + + rhino + + true + + + + + org.bsc + jvm-npm-rhino + 1.1.0 + + + org.mozilla + rhino + + + + + + org.mozilla + rhino + 1.7.12 + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + package + + unpack + + + + + org.bsc + jvm-npm-core + jar + false + ${project.build.directory}/js + **/*.js + + + + + + + + + org.bsc.maven + maven-processor-plugin + + + process + + process-test + + package + + ts + + jdk8 + rhino + + + + + + + org.codehaus.mojo + exec-maven-plugin + + java + + -classpath + + org.bsc.java2ts.JSRun$Rhino + app.js + + + + + + + + + + nashorn + + + + + + + org.bsc.maven + maven-processor-plugin + + + process + + process-test + + package + + ts + + jdk8 + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + jsrun + + java + + -classpath + + org.bsc.java2ts.JSRun$Nashorn + app.js + + + + + jjs + + jjs + + -scripting + -classpath + + app.js + -- + + + + + + + + + + diff --git a/samples/pom.xml b/samples/pom.xml index f1e3892..0802cea 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -258,7 +258,7 @@ true - + org.apache.maven.plugins