From 8904b8dcf026adbd9cbdde27ebdfb501ec7bbcb3 Mon Sep 17 00:00:00 2001 From: vitaxa Date: Thu, 10 Mar 2022 11:38:15 +0300 Subject: [PATCH 01/10] TD-161: bump java image --- .github/workflows/build.yml | 2 +- .github/workflows/deploy.yml | 5 ++++- pom.xml | 2 +- src/main/resources/Dockerfile | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7381159d..b0359e15 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,4 @@ on: jobs: build: - uses: valitydev/base-workflow/.github/workflows/maven-library-build.yml@v1 \ No newline at end of file + uses: valitydev/base-workflow/.github/workflows/maven-library-build.yml@v2 \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index df9c2f48..c79c89ea 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,6 +1,9 @@ name: Maven Deploy Artifact on: + pull_request: + branches: + - '*' push: branches: - 'master' @@ -8,7 +11,7 @@ on: jobs: deploy: - uses: valitydev/base-workflow/.github/workflows/maven-library-deploy.yml@v1 + uses: valitydev/base-workflow/.github/workflows/maven-library-deploy.yml@v2 secrets: server-username: ${{ secrets.OSSRH_USERNAME }} server-password: ${{ secrets.OSSRH_TOKEN }} diff --git a/pom.xml b/pom.xml index 15a7fa7e..41d2f353 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ shared-resources - 1.0.0 + 2.0.0-BETA jar Java shared resources diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile index 40a7c0a5..0e3bad0e 100644 --- a/src/main/resources/Dockerfile +++ b/src/main/resources/Dockerfile @@ -1,5 +1,5 @@ # @dockerfile.Template@ -FROM openjdk:15-jdk-slim +FROM eclipse-temurin:17.0.2_8-jdk-nanoserver RUN useradd -s /bin/false -U -u 20000 vality From 929547e6cb1a3ac7db4e2016b3c14efc028a27d9 Mon Sep 17 00:00:00 2001 From: vitaxa Date: Thu, 10 Mar 2022 11:41:41 +0300 Subject: [PATCH 02/10] bump parent pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 50aa3710..e053a719 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ dev.vality library-parent-pom - 1.0.2 + 2.0.0.BETA-2 shared-resources From 913a3e6c066edf7cabc5ec80c78a9e103c300cc0 Mon Sep 17 00:00:00 2001 From: vitaxa Date: Thu, 10 Mar 2022 11:42:35 +0300 Subject: [PATCH 03/10] rename workflow --- .github/workflows/build.yml | 2 +- .github/workflows/deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 923fb6a3..70f1a7a7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,4 @@ on: jobs: build: - uses: valitydev/base-workflow/.github/workflows/maven-library-build.yml@v2 + uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v2 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1d63ca09..0abf9b26 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,7 +11,7 @@ on: jobs: deploy: - uses: valitydev/base-workflow/.github/workflows/maven-library-deploy.yml@v2 + uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v2 secrets: server-username: ${{ secrets.OSSRH_USERNAME }} server-password: ${{ secrets.OSSRH_TOKEN }} From e2ced567f7b3ef937c8b5314f8e04b776c59e7ed Mon Sep 17 00:00:00 2001 From: vitaxa Date: Thu, 10 Mar 2022 11:47:12 +0300 Subject: [PATCH 04/10] fix workflow version --- .github/workflows/build.yml | 2 +- .github/workflows/deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70f1a7a7..5a3725cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,4 @@ on: jobs: build: - uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v2 + uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v2-beta diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0abf9b26..db644702 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,7 +11,7 @@ on: jobs: deploy: - uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v2 + uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v2-beta secrets: server-username: ${{ secrets.OSSRH_USERNAME }} server-password: ${{ secrets.OSSRH_TOKEN }} From 1220b65df9aa1b1b3e542e8f2c3919620d743b15 Mon Sep 17 00:00:00 2001 From: vitaxa Date: Thu, 10 Mar 2022 12:04:12 +0300 Subject: [PATCH 05/10] fix workflow --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e053a719..2a86106d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ shared-resources - 2.0.0-BETA + 2.0.0-BETA-2 jar Java shared resources From 4873be053f723e9ec50379df10bf22547ad9a555 Mon Sep 17 00:00:00 2001 From: vitaxa Date: Thu, 10 Mar 2022 12:08:49 +0300 Subject: [PATCH 06/10] fix workflow [2] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2a86106d..102ca224 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ shared-resources - 2.0.0-BETA-2 + 2.0.0-BETA-3 jar Java shared resources From 155ff61c0e4e692d2043eea3985f79efe2eadc7a Mon Sep 17 00:00:00 2001 From: vitaxa Date: Thu, 10 Mar 2022 12:37:50 +0300 Subject: [PATCH 07/10] bump parent pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 102ca224..d655a55b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ dev.vality library-parent-pom - 2.0.0.BETA-2 + 2.0.0.BETA-3 shared-resources From aa86cb36c7087cb93910eede2aa39474eeee5ce5 Mon Sep 17 00:00:00 2001 From: vitaxa Date: Wed, 16 Mar 2022 16:09:53 +0300 Subject: [PATCH 08/10] fix temurin image --- pom.xml | 2 +- src/main/resources/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d655a55b..331ca0a6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ shared-resources - 2.0.0-BETA-3 + 2.0.0-SNAPSHOT jar Java shared resources diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile index e9f9d96d..09ff517a 100644 --- a/src/main/resources/Dockerfile +++ b/src/main/resources/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17.0.2_8-jdk-nanoserver +FROM eclipse-temurin:17 RUN useradd -s /bin/false -U -u 20000 vality From d94bbbe089ea654baec6f5a9c15ed1f61159b4da Mon Sep 17 00:00:00 2001 From: vitaxa Date: Thu, 17 Mar 2022 12:12:19 +0300 Subject: [PATCH 09/10] bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 331ca0a6..4a2a90ac 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ shared-resources - 2.0.0-SNAPSHOT + 2.0.0-BETA-4 jar Java shared resources From d2145ca24cbc5d4f8a0d9d556dad5ff4e330de21 Mon Sep 17 00:00:00 2001 From: vitaxa Date: Tue, 15 Nov 2022 19:19:21 +0300 Subject: [PATCH 10/10] fix deploy version --- .github/workflows/build.yml | 2 +- .github/workflows/deploy.yml | 5 +---- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a3725cb..70f1a7a7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,4 @@ on: jobs: build: - uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v2-beta + uses: valitydev/java-workflow/.github/workflows/maven-library-build.yml@v2 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index db644702..5e2da3ac 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,9 +1,6 @@ name: Maven Deploy Artifact on: - pull_request: - branches: - - '*' push: branches: - 'master' @@ -11,7 +8,7 @@ on: jobs: deploy: - uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v2-beta + uses: valitydev/java-workflow/.github/workflows/maven-library-deploy.yml@v2 secrets: server-username: ${{ secrets.OSSRH_USERNAME }} server-password: ${{ secrets.OSSRH_TOKEN }} diff --git a/pom.xml b/pom.xml index 4a2a90ac..2fbecc70 100644 --- a/pom.xml +++ b/pom.xml @@ -7,11 +7,11 @@ dev.vality library-parent-pom - 2.0.0.BETA-3 + 1.0.2 shared-resources - 2.0.0-BETA-4 + 2.0.0 jar Java shared resources