Skip to content

Commit

Permalink
Update GSON to 2.9.0# (#139)
Browse files Browse the repository at this point in the history
  • Loading branch information
Luke-Roy-IBM authored Jun 10, 2022
1 parent 59a611b commit 5220c55
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions core/java8/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
# Java 8 OpenWhisk Runtime Container
# next release
- use `ibm-semeru-runtimes:open-8u332-b09-jdk-focal` as baseimage
- update gson version to 2.9.0

# 1.19.0
- Use adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u332-b09_openj9-0.32.0
Expand Down
2 changes: 1 addition & 1 deletion core/java8/proxy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ repositories {
}

dependencies {
compile 'com.google.code.gson:gson:2.6.2'
compile 'com.google.code.gson:gson:2.9.0'
}

jar {
Expand Down
1 change: 1 addition & 0 deletions core/java8actionloop/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
# Java 8 OpenWhisk Runtime Container
# next release
- use `ibm-semeru-runtimes:open-8u332-b09-jdk-focal` as baseimage
- update gson version to 2.9.0

# 1.19.0
- Use adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u332-b09_openj9-0.32.0
Expand Down
4 changes: 2 additions & 2 deletions core/java8actionloop/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ COPY --from=builder_source /bin/proxy /bin/proxy_source
COPY --from=builder_release /bin/proxy /bin/proxy_release
RUN mv /bin/proxy_${GO_PROXY_BUILD_FROM} /bin/proxy

ADD https://search.maven.org/remotecontent?filepath=com/google/code/gson/gson/2.8.5/gson-2.8.5.jar /usr/java/lib/gson-2.8.5.jar
ADD https://search.maven.org/remotecontent?filepath=com/google/code/gson/gson/2.9.0/gson-2.9.0.jar /usr/java/lib/gson-2.9.0.jar
ADD lib/src/Launcher.java /usr/java/src/Launcher.java
RUN cd /usr/java/src ;\
javac -cp /usr/java/lib/gson-2.8.5.jar Launcher.java ;\
javac -cp /usr/java/lib/gson-2.9.0.jar Launcher.java ;\
jar cvf /usr/java/lib/launcher.jar *.class
ADD bin/compile /bin/compile
ENV OW_COMPILER=/bin/compile
Expand Down
2 changes: 1 addition & 1 deletion core/java8actionloop/bin/compile
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def assemble(argv):
logging.info("%s %s", mainClass, mainMethod)
source_dir = os.path.abspath(argv[2])
target_dir = os.path.abspath(argv[3])
classpath = ["/usr/java/lib/launcher.jar", "/usr/java/lib/gson-2.8.5.jar"]
classpath = ["/usr/java/lib/launcher.jar", "/usr/java/lib/gson-2.9.0.jar"]

# build
if build(source_dir, classpath, target_dir, mainClass):
Expand Down

0 comments on commit 5220c55

Please sign in to comment.