From a51d8cd80c4999244b4f367933068af2b783f66f Mon Sep 17 00:00:00 2001
From: Manthan Dave <manthanhd@live.com>
Date: Sun, 31 Jan 2021 09:09:12 +0000
Subject: [PATCH 1/3] Package CLI into self-executable

---
 keyconnect-cli/pom.xml | 65 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/keyconnect-cli/pom.xml b/keyconnect-cli/pom.xml
index 7786d90..af83aac 100644
--- a/keyconnect-cli/pom.xml
+++ b/keyconnect-cli/pom.xml
@@ -63,6 +63,12 @@
       <artifactId>slf4j-simple</artifactId>
       <version>1.7.30</version>
     </dependency>
+    <dependency>
+      <groupId>com.akathist.maven.plugins.launch4j</groupId>
+      <artifactId>launch4j-maven-plugin</artifactId>
+      <version>1.7.25</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -75,6 +81,8 @@
           <descriptorRefs>
             <descriptorRef>jar-with-dependencies</descriptorRef>
           </descriptorRefs>
+          <finalName>kc</finalName>
+          <appendAssemblyId>false</appendAssemblyId>
           <archive>
             <manifest>
               <mainClass>app.keyconnect.cli.CommandLineApplication</mainClass>
@@ -91,6 +99,63 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>com.akathist.maven.plugins.launch4j</groupId>
+        <artifactId>launch4j-maven-plugin</artifactId>
+        <version>1.7.25</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>launch4j</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <headerType>console</headerType>
+          <outfile>${project.build.directory}/kc.exe</outfile>
+          <jar>${project.build.directory}/kc.jar</jar>
+          <jre>
+            <path>./jre</path>
+            <minVersion>15.0.2</minVersion>
+          </jre>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>download-files</id>
+            <phase>package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <!-- download file -->
+                <get src="https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_windows_hotspot_15.0.2_7.zip"
+                  dest="${project.build.directory}/jre.zip"
+                  verbose="false"
+
+                  usetimestamp="true"/>
+                <unzip src="${project.build.directory}/jre.zip"
+                  dest="${project.build.directory}/jre"/>
+                <move todir="${project.build.directory}/jre" overwrite="true">
+                  <fileset dir="${project.build.directory}/jre/jdk-15.0.2+7-jre">
+                    <include name="**/*"/>
+                  </fileset>
+                </move>
+                <delete dir="${project.build.directory}/jre/jdk-15.0.2+7-jre"/>
+                <delete dir="${project.build.directory}/jre.zip"/>
+                <zip destfile="${project.build.directory}/kc-win.zip"
+                  basedir="${project.build.directory}"
+                  includes="jre/**,kc.exe"/>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

From 1ee56f8ec639635d05c2c886e5f2664750c031fd Mon Sep 17 00:00:00 2001
From: Manthan Dave <manthanhd@live.com>
Date: Sun, 31 Jan 2021 09:11:46 +0000
Subject: [PATCH 2/3] Only package into executable when profile is release

---
 keyconnect-cli/pom.xml | 127 +++++++++++++++++++++++------------------
 1 file changed, 70 insertions(+), 57 deletions(-)

diff --git a/keyconnect-cli/pom.xml b/keyconnect-cli/pom.xml
index af83aac..70d37f9 100644
--- a/keyconnect-cli/pom.xml
+++ b/keyconnect-cli/pom.xml
@@ -99,64 +99,77 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>com.akathist.maven.plugins.launch4j</groupId>
-        <artifactId>launch4j-maven-plugin</artifactId>
-        <version>1.7.25</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>launch4j</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <headerType>console</headerType>
-          <outfile>${project.build.directory}/kc.exe</outfile>
-          <jar>${project.build.directory}/kc.jar</jar>
-          <jre>
-            <path>./jre</path>
-            <minVersion>15.0.2</minVersion>
-          </jre>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>download-files</id>
-            <phase>package</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <!-- download file -->
-                <get src="https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_windows_hotspot_15.0.2_7.zip"
-                  dest="${project.build.directory}/jre.zip"
-                  verbose="false"
-
-                  usetimestamp="true"/>
-                <unzip src="${project.build.directory}/jre.zip"
-                  dest="${project.build.directory}/jre"/>
-                <move todir="${project.build.directory}/jre" overwrite="true">
-                  <fileset dir="${project.build.directory}/jre/jdk-15.0.2+7-jre">
-                    <include name="**/*"/>
-                  </fileset>
-                </move>
-                <delete dir="${project.build.directory}/jre/jdk-15.0.2+7-jre"/>
-                <delete dir="${project.build.directory}/jre.zip"/>
-                <zip destfile="${project.build.directory}/kc-win.zip"
-                  basedir="${project.build.directory}"
-                  includes="jre/**,kc.exe"/>
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>release</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.akathist.maven.plugins.launch4j</groupId>
+            <artifactId>launch4j-maven-plugin</artifactId>
+            <version>1.7.25</version>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <goals>
+                  <goal>launch4j</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <headerType>console</headerType>
+              <outfile>${project.build.directory}/kc.exe</outfile>
+              <jar>${project.build.directory}/kc.jar</jar>
+              <jre>
+                <path>./jre</path>
+                <minVersion>15.0.2</minVersion>
+              </jre>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>download-files</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <tasks>
+                    <!-- download file -->
+                    <get src="https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_windows_hotspot_15.0.2_7.zip"
+                      dest="${project.build.directory}/jre.zip"
+                      verbose="false"
+
+                      usetimestamp="true"/>
+                    <unzip src="${project.build.directory}/jre.zip"
+                      dest="${project.build.directory}/jre"/>
+                    <move todir="${project.build.directory}/jre" overwrite="true">
+                      <fileset dir="${project.build.directory}/jre/jdk-15.0.2+7-jre">
+                        <include name="**/*"/>
+                      </fileset>
+                    </move>
+                    <delete dir="${project.build.directory}/jre/jdk-15.0.2+7-jre"/>
+                    <delete dir="${project.build.directory}/jre.zip"/>
+                    <zip destfile="${project.build.directory}/kc-win.zip"
+                      basedir="${project.build.directory}"
+                      includes="jre/**,kc.exe"/>
+                  </tasks>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

From f0f6ca640e7b496dd0db103e2c9e8c2097e24f79 Mon Sep 17 00:00:00 2001
From: Manthan Dave <manthanhd@live.com>
Date: Fri, 12 Feb 2021 15:55:19 +0000
Subject: [PATCH 3/3] Updates for building against graalvm

---
 build-graal.bat                               |  4 ++
 keyconnect-api/pom.xml                        |  5 +-
 keyconnect-chainbase/pom.xml                  |  3 +-
 keyconnect-cli/pom.xml                        | 53 +++++++++++++++++--
 .../cli/config/BaseClientConfig.java          |  1 +
 keyconnect-rippled-api/pom.xml                |  3 +-
 keyconnect-server/pom.xml                     |  3 +-
 7 files changed, 64 insertions(+), 8 deletions(-)
 create mode 100644 build-graal.bat

diff --git a/build-graal.bat b/build-graal.bat
new file mode 100644
index 0000000..dd2cff5
--- /dev/null
+++ b/build-graal.bat
@@ -0,0 +1,4 @@
+set JAVA_HOME=C:\tools\graalvm-ce-java11-21.0.0
+set PATH=%JAVA_HOME%\bin;%PATH%
+cd keyconnect-cli
+mvn -DskipTests -P release package
diff --git a/keyconnect-api/pom.xml b/keyconnect-api/pom.xml
index 6b81a28..3d204b4 100644
--- a/keyconnect-api/pom.xml
+++ b/keyconnect-api/pom.xml
@@ -20,6 +20,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
+    <okhttp.version>4.9.1</okhttp.version>
   </properties>
 
   <dependencies>
@@ -39,12 +40,12 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>4.8.1</version>
+      <version>${okhttp.version}</version>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>logging-interceptor</artifactId>
-      <version>4.8.1</version>
+      <version>${okhttp.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
diff --git a/keyconnect-chainbase/pom.xml b/keyconnect-chainbase/pom.xml
index 5d9e5db..70f443d 100644
--- a/keyconnect-chainbase/pom.xml
+++ b/keyconnect-chainbase/pom.xml
@@ -19,6 +19,7 @@
     <maven.compiler.target>11</maven.compiler.target>
     <maven.compiler.source>11</maven.compiler.source>
     <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
+    <okhttp.version>4.9.1</okhttp.version>
   </properties>
 
   <dependencyManagement>
@@ -42,7 +43,7 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>4.9.0</version>
+      <version>${okhttp.version}</version>
     </dependency>
     <dependency>
       <groupId>app.keyconnect</groupId>
diff --git a/keyconnect-cli/pom.xml b/keyconnect-cli/pom.xml
index 70d37f9..cca6819 100644
--- a/keyconnect-cli/pom.xml
+++ b/keyconnect-cli/pom.xml
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>info.picocli</groupId>
       <artifactId>picocli</artifactId>
-      <version>4.5.2</version>
+      <version>4.6.1</version>
     </dependency>
     <dependency>
       <groupId>app.keyconnect.api</groupId>
@@ -69,10 +69,40 @@
       <version>1.7.25</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.graalvm.nativeimage</groupId>
+      <artifactId>native-image-maven-plugin</artifactId>
+      <version>21.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>info.picocli</groupId>
+      <artifactId>picocli-codegen</artifactId>
+      <version>4.6.1</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>
     <plugins>
+      <!--<plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        &lt;!&ndash; annotationProcessorPaths requires maven-compiler-plugin version 3.5 or higher &ndash;&gt;
+        <version>3.8.1</version>
+        <configuration>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>info.picocli</groupId>
+              <artifactId>picocli-codegen</artifactId>
+              <version>4.6.1</version>
+            </path>
+          </annotationProcessorPaths>
+          <compilerArgs>
+            <arg>-Aproject=${project.groupId}/${project.artifactId}</arg>
+          </compilerArgs>
+        </configuration>
+      </plugin>-->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -111,6 +141,23 @@
       <build>
         <plugins>
           <plugin>
+            <groupId>org.graalvm.nativeimage</groupId>
+            <artifactId>native-image-maven-plugin</artifactId>
+            <version>21.0.0</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>native-image</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <buildArgs>-H:+ReportExceptionStackTraces --no-fallback --enable-all-security-services</buildArgs>
+              <imageName>kc</imageName>
+            </configuration>
+          </plugin>
+          <!--<plugin>
             <groupId>com.akathist.maven.plugins.launch4j</groupId>
             <artifactId>launch4j-maven-plugin</artifactId>
             <version>1.7.25</version>
@@ -144,7 +191,7 @@
                 </goals>
                 <configuration>
                   <tasks>
-                    <!-- download file -->
+                    &lt;!&ndash; download file &ndash;&gt;
                     <get src="https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_windows_hotspot_15.0.2_7.zip"
                       dest="${project.build.directory}/jre.zip"
                       verbose="false"
@@ -166,7 +213,7 @@
                 </configuration>
               </execution>
             </executions>
-          </plugin>
+          </plugin>-->
         </plugins>
       </build>
     </profile>
diff --git a/keyconnect-cli/src/main/java/app/keyconnect/cli/config/BaseClientConfig.java b/keyconnect-cli/src/main/java/app/keyconnect/cli/config/BaseClientConfig.java
index 33e406b..a023e46 100644
--- a/keyconnect-cli/src/main/java/app/keyconnect/cli/config/BaseClientConfig.java
+++ b/keyconnect-cli/src/main/java/app/keyconnect/cli/config/BaseClientConfig.java
@@ -4,6 +4,7 @@
 import app.keyconnect.api.client.BlockchainsApi;
 import app.keyconnect.api.client.RatesApi;
 import app.keyconnect.api.client.ServerApi;
+import okhttp3.logging.HttpLoggingInterceptor;
 import org.jetbrains.annotations.NotNull;
 import picocli.CommandLine.Option;
 
diff --git a/keyconnect-rippled-api/pom.xml b/keyconnect-rippled-api/pom.xml
index e8e0985..d4d21cd 100644
--- a/keyconnect-rippled-api/pom.xml
+++ b/keyconnect-rippled-api/pom.xml
@@ -19,6 +19,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
+    <okhttp.version>4.9.1</okhttp.version>
   </properties>
 
   <dependencies>
@@ -38,7 +39,7 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>4.8.1</version>
+      <version>${okhttp.version}</version>
     </dependency>
     <dependency>
       <groupId>io.gsonfire</groupId>
diff --git a/keyconnect-server/pom.xml b/keyconnect-server/pom.xml
index 0fec58c..17aec77 100644
--- a/keyconnect-server/pom.xml
+++ b/keyconnect-server/pom.xml
@@ -21,6 +21,7 @@
     <spring-boot.version>2.3.8.RELEASE</spring-boot.version>
     <junit-jupiter.version>5.3.2</junit-jupiter.version>
     <start-class>app.keyconnect.server.KeyConnectApplication</start-class>
+    <okhttp.version>4.9.1</okhttp.version>
   </properties>
 
   <dependencyManagement>
@@ -68,7 +69,7 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>4.9.0</version>
+      <version>${okhttp.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>