From 09e39dc01ee149a066a13cea17f86f0132d269fe Mon Sep 17 00:00:00 2001 From: JDY Date: Tue, 23 May 2023 15:12:19 +0200 Subject: [PATCH] [build] update go generator to 1.7.0 and generators to 1.6.0 --- Dockerfile-go | 4 ++-- Makefile | 4 ++-- soft.generators/pom.xml | 2 +- soft.generators/soft.generator.common/pom.xml | 2 +- soft.generators/soft.generator.cpp/pom.xml | 2 +- soft.generators/soft.generator.go/META-INF/MANIFEST.MF | 2 +- soft.generators/soft.generator.go/pom.xml | 4 ++-- soft.generators/soft.generator.ts/pom.xml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile-go b/Dockerfile-go index 850278d3..7e720c94 100644 --- a/Dockerfile-go +++ b/Dockerfile-go @@ -6,7 +6,7 @@ INCLUDE+ Dockerfile-base FROM openjdk:16-alpine AS jvm COPY --from=build /home/soft.gen/out/soft.generator.go/*.jar /soft.generator.go/ WORKDIR /soft.generator.go -RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.go-1.6.0.jar > java.modules \ +RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.go-1.7.0.jar > java.modules \ && jlink --strip-java-debug-attributes --add-modules $(cat java.modules) --output /java-generator # Build result stage @@ -14,4 +14,4 @@ FROM alpine COPY --from=build /home/soft.gen/out/soft.generator.go/*.jar /usr/share/soft.generator.go/ COPY --from=jvm /java-generator /usr/lib/jvm/java-generator -ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.go/soft.generator.go-1.6.0.jar"] +ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.go/soft.generator.go-1.7.0.jar"] diff --git a/Makefile b/Makefile index 49c6f736..41b87b36 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ langs := go ts cpp packages := go ts cpp common -soft.generators.version := 1.5.1 +soft.generators.version := 1.6.0 soft.generator.common.version := 1.3.0 soft.generator.cpp.version := 1.2.4 -soft.generator.go.version := 1.6.0 +soft.generator.go.version := 1.7.0 soft.generator.ts.version := 1.0.5 export DOCKER_BUILDKIT=1 diff --git a/soft.generators/pom.xml b/soft.generators/pom.xml index 516be1db..86e3fc1e 100644 --- a/soft.generators/pom.xml +++ b/soft.generators/pom.xml @@ -4,7 +4,7 @@ 4.0.0 soft.generators soft.generators - 1.5.1 + 1.6.0 pom UTF-8 diff --git a/soft.generators/soft.generator.common/pom.xml b/soft.generators/soft.generator.common/pom.xml index 1ba4af55..9871e0f4 100644 --- a/soft.generators/soft.generator.common/pom.xml +++ b/soft.generators/soft.generator.common/pom.xml @@ -5,7 +5,7 @@ soft.generators soft.generators - 1.5.1 + 1.6.0 soft.generator.common 1.3.0 diff --git a/soft.generators/soft.generator.cpp/pom.xml b/soft.generators/soft.generator.cpp/pom.xml index 83a4806f..82f96377 100644 --- a/soft.generators/soft.generator.cpp/pom.xml +++ b/soft.generators/soft.generator.cpp/pom.xml @@ -5,7 +5,7 @@ soft.generators soft.generators - 1.5.1 + 1.6.0 soft.generator.cpp 1.2.4 diff --git a/soft.generators/soft.generator.go/META-INF/MANIFEST.MF b/soft.generators/soft.generator.go/META-INF/MANIFEST.MF index 6638dabf..bfb44eef 100644 --- a/soft.generators/soft.generator.go/META-INF/MANIFEST.MF +++ b/soft.generators/soft.generator.go/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Created-By: 13.0.2+8 (Oracle Corporation) Bundle-ManifestVersion: 2 Bundle-Name: Soft Generator Go Bundle-SymbolicName: soft.generator.go -Bundle-Version: 1.6.0 +Bundle-Version: 1.7.0 Export-Package: soft.generator.go,soft.generator.go.lib,soft.generator .go.lib.factory,soft.generator.go.lib.pack,soft.generator.go.tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/soft.generators/soft.generator.go/pom.xml b/soft.generators/soft.generator.go/pom.xml index e63b22e4..b22c0540 100644 --- a/soft.generators/soft.generator.go/pom.xml +++ b/soft.generators/soft.generator.go/pom.xml @@ -5,10 +5,10 @@ soft.generators soft.generators - 1.5.1 + 1.6.0 soft.generator.go - 1.6.0 + 1.7.0 soft.generators diff --git a/soft.generators/soft.generator.ts/pom.xml b/soft.generators/soft.generator.ts/pom.xml index 3418b7d5..0abe834d 100644 --- a/soft.generators/soft.generator.ts/pom.xml +++ b/soft.generators/soft.generator.ts/pom.xml @@ -5,7 +5,7 @@ soft.generators soft.generators - 1.5.1 + 1.6.0 soft.generator.ts 1.0.5