Skip to content

Commit ae78edb

Browse files
authored
Merge pull request #98 from SokaDance/versions
[build] set go generator to 1.9.2 and ts generator to 1.5.0
2 parents 5f4c676 + c7155a2 commit ae78edb

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

Dockerfile-go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ INCLUDE+ Dockerfile-base
66
FROM openjdk:16-alpine AS jvm
77
COPY --from=build /home/soft.gen/out/soft.generator.go/*.jar /soft.generator.go/
88
WORKDIR /soft.generator.go
9-
RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.go-1.9.1.jar > java.modules \
9+
RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.go-1.9.2.jar > java.modules \
1010
&& jlink --strip-java-debug-attributes --add-modules $(cat java.modules) --output /java-generator
1111

1212
# Build result stage
1313
FROM alpine
1414
COPY --from=build /home/soft.gen/out/soft.generator.go/*.jar /usr/share/soft.generator.go/
1515
COPY --from=jvm /java-generator /usr/lib/jvm/java-generator
1616

17-
ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.go/soft.generator.go-1.9.1.jar"]
17+
ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.go/soft.generator.go-1.9.2.jar"]

Dockerfile-ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ INCLUDE+ Dockerfile-base
66
FROM openjdk:16-alpine AS jvm
77
COPY --from=build /home/soft.gen/out/soft.generator.ts/*.jar /soft.generator.ts/
88
WORKDIR /soft.generator.ts
9-
RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.ts-1.4.0.jar > java.modules \
9+
RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.ts-1.5.0.jar > java.modules \
1010
&& jlink --strip-java-debug-attributes --add-modules $(cat java.modules) --output /java-generator
1111

1212
# Build result stage
1313
FROM alpine
1414
COPY --from=build /home/soft.gen/out/soft.generator.ts/*.jar /usr/share/soft.generator.ts/
1515
COPY --from=jvm /java-generator /usr/lib/jvm/java-generator
1616

17-
ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.ts/soft.generator.ts-1.4.0.jar"]
17+
ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.ts/soft.generator.ts-1.5.0.jar"]

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ packages := go ts cpp common
33
soft.generators.version := 1.6.0
44
soft.generator.common.version := 1.4.1
55
soft.generator.cpp.version := 1.2.4
6-
soft.generator.go.version := 1.9.1
7-
soft.generator.ts.version := 1.4.0
6+
soft.generator.go.version := 1.9.2
7+
soft.generator.ts.version := 1.5.0
88

99
export DOCKER_BUILDKIT=1
1010

soft.generators/soft.generator.go/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Created-By: 13.0.2+8 (Oracle Corporation)
44
Bundle-ManifestVersion: 2
55
Bundle-Name: Soft Generator Go
66
Bundle-SymbolicName: soft.generator.go
7-
Bundle-Version: 1.9.1
7+
Bundle-Version: 1.9.2
88
Export-Package: soft.generator.go,soft.generator.go.lib,soft.generator
99
.go.lib.factory,soft.generator.go.lib.pack,soft.generator.go.tests
1010
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

soft.generators/soft.generator.go/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<version>1.6.0</version>
99
</parent>
1010
<artifactId>soft.generator.go</artifactId>
11-
<version>1.9.1</version>
11+
<version>1.9.2</version>
1212
<dependencies>
1313
<dependency>
1414
<groupId>soft.generators</groupId>

soft.generators/soft.generator.ts/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Created-By: 13.0.2+8 (Oracle Corporation)
44
Bundle-ManifestVersion: 2
55
Bundle-Name: Soft Generator TypeScript
66
Bundle-SymbolicName: soft.generator.ts
7-
Bundle-Version: 1.4.0
7+
Bundle-Version: 1.5.0
88
Export-Package: soft.generator.ts,
99
soft.generator.ts.lib,
1010
soft.generator.ts.lib.factory,

soft.generators/soft.generator.ts/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<version>1.6.0</version>
99
</parent>
1010
<artifactId>soft.generator.ts</artifactId>
11-
<version>1.4.0</version>
11+
<version>1.5.0</version>
1212
<dependencies>
1313
<dependency>
1414
<groupId>soft.generators</groupId>

0 commit comments

Comments
 (0)