From 19c0083682167202cb73a091840ccb23c254ee9b Mon Sep 17 00:00:00 2001
From: dsinghvi <dsinghvi@umich.edu>
Date: Thu, 29 Feb 2024 13:30:26 -0500
Subject: [PATCH] (fix): Java SDK generator uses UTF-8 Decoding for files

---
 .../src/main/java/com/fern/java/utils/JavaDocUtils.java      | 1 +
 generators/java/sdk/CHANGELOG.md                             | 5 +++++
 generators/java/sdk/Dockerfile                               | 4 +++-
 generators/java/sdk/VERSION                                  | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/generators/java/generator-utils/src/main/java/com/fern/java/utils/JavaDocUtils.java b/generators/java/generator-utils/src/main/java/com/fern/java/utils/JavaDocUtils.java
index dc4e18f536a..ff9162d7b24 100644
--- a/generators/java/generator-utils/src/main/java/com/fern/java/utils/JavaDocUtils.java
+++ b/generators/java/generator-utils/src/main/java/com/fern/java/utils/JavaDocUtils.java
@@ -1,6 +1,7 @@
 package com.fern.java.utils;
 
 import com.squareup.javapoet.CodeBlock;
+import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.TypeName;
 import org.apache.commons.lang3.StringUtils;
 import org.commonmark.node.Paragraph;
diff --git a/generators/java/sdk/CHANGELOG.md b/generators/java/sdk/CHANGELOG.md
index fe39481d4df..45400a8e935 100644
--- a/generators/java/sdk/CHANGELOG.md
+++ b/generators/java/sdk/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.8.5-rc0] - 2024-02-23
+- Internal: Use gradle:jdk11-jammy instead of bitnami/gradle:latest for the base 
+  docker image. 
+- Internal: Set file encoding to UTF-8 (JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8")
+
 ## [0.8.4] - 2024-02-23
 - Improvement: The timeout specified on the RequestOptions object now sets the timeout on the entire call, not just the read timeout of the request.
   As a refresher, a timeout can be added per request like so: 
diff --git a/generators/java/sdk/Dockerfile b/generators/java/sdk/Dockerfile
index 93486479430..a46beb3a9bb 100644
--- a/generators/java/sdk/Dockerfile
+++ b/generators/java/sdk/Dockerfile
@@ -1,9 +1,11 @@
 # Apple Silicon: FROM bitnami/gradle:latest
-FROM bitnami/gradle:latest
+FROM gradle:jdk11-jammy
 
 COPY build/distributions/sdk.tar init.sh /
 RUN cd / \
     && tar -xvf sdk.tar \
     && rm -rf sdk.tar
 
+ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
+
 ENTRYPOINT ["sh", "/init.sh"]
\ No newline at end of file
diff --git a/generators/java/sdk/VERSION b/generators/java/sdk/VERSION
index b60d71966ae..17506519663 100644
--- a/generators/java/sdk/VERSION
+++ b/generators/java/sdk/VERSION
@@ -1 +1 @@
-0.8.4
+0.8.5-rc0
\ No newline at end of file