From 29988f25436c27c9ad6efbea6269baf24a106ede Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Sat, 9 May 2020 00:27:43 +0900
Subject: [PATCH] generate proxies with Java 1.8

---
 osx-toolchains.xml | 15 +++++++++++++++
 pom.xml            | 48 +++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 osx-toolchains.xml

diff --git a/osx-toolchains.xml b/osx-toolchains.xml
new file mode 100644
index 00000000..e395af96
--- /dev/null
+++ b/osx-toolchains.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF8"?>
+<toolchains>
+   <toolchain>
+      <type>paths</type>
+      <provides>
+         <!-- Defines the folders to search for binaries of the "foo-bar" toolset -->
+         <id>javac</id>
+      </provides>
+      <configuration>
+         <paths>
+            <path>/Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home/bin</path>
+         </paths>
+      </configuration>
+   </toolchain>
+</toolchains>
diff --git a/pom.xml b/pom.xml
index 80159e73..80d33c4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -269,22 +269,65 @@
             </executions>
          </plugin>
 
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-toolchains-plugin</artifactId>
+            <version>1.1</version>
+            <executions>
+               <execution>
+                  <goals>
+                     <goal>toolchain</goal>
+                  </goals>
+               </execution>
+            </executions>
+            <configuration>
+               <toolchains>
+                  <paths>
+                     <id>javac</id>
+                  </paths>
+               </toolchains>
+            </configuration>
+         </plugin>
+
+         <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <version>2.8</version>
+            <executions>
+               <execution>
+                  <phase>generate-sources</phase>
+                  <goals>
+                     <goal>build-classpath</goal>
+                  </goals>
+                  <configuration>
+                     <outputProperty>maven.compile.classpath</outputProperty>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+
          <plugin>
             <!-- Generate proxies -->
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
             <version>1.6.0</version>
+            <extensions>true</extensions>
             <executions>
                <execution>
                   <phase>compile</phase>
                   <!-- phase>generate-test-sources</phase -->
                   <goals>
-                     <goal>java</goal>
+                     <goal>exec</goal>
                   </goals>
                </execution>
             </executions>
             <configuration>
-               <mainClass>com.zaxxer.hikari.util.JavassistProxyFactory</mainClass>
+               <toolchain>paths</toolchain>
+               <executable>java</executable>
+               <arguments>
+                  <argument>-cp</argument>
+                  <argument>${project.build.outputDirectory}:${maven.compile.classpath}</argument>
+                  <argument>com.zaxxer.hikari.util.JavassistProxyFactory</argument>
+               </arguments>
             </configuration>
          </plugin>
 
@@ -454,7 +497,6 @@
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
                <version>3.8.1</version>
-               <extensions>true</extensions>
                <configuration>
                   <source>1.8</source>
                   <target>1.8</target>