From f355251f5f446f37b65cf4d03081c891443da9c0 Mon Sep 17 00:00:00 2001
From: emeroad <wd.kang@navercorp.com>
Date: Wed, 11 May 2016 18:57:18 +0900
Subject: [PATCH] #1761 Add ${test.jdk.home} for jdk 1.6 compatibility of
 plugin

---
 plugins/redis/pom.xml  | 3 +--
 plugins/tomcat/pom.xml | 3 +--
 pom.xml                | 3 ++-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/redis/pom.xml b/plugins/redis/pom.xml
index dbcf349b3..4da65e05a 100644
--- a/plugins/redis/pom.xml
+++ b/plugins/redis/pom.xml
@@ -13,8 +13,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <jdk.version>1.7</jdk.version>
-        <jdk.home>${env.JAVA_7_HOME}</jdk.home>
+        <test.jdk.home>${env.JAVA_7_HOME}</test.jdk.home>
     </properties>
 
     <dependencies>
diff --git a/plugins/tomcat/pom.xml b/plugins/tomcat/pom.xml
index 88b098e2f..2df621e3a 100644
--- a/plugins/tomcat/pom.xml
+++ b/plugins/tomcat/pom.xml
@@ -13,8 +13,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <jdk.version>1.7</jdk.version>
-        <jdk.home>${env.JAVA_7_HOME}</jdk.home>
+        <test.jdk.home>${env.JAVA_7_HOME}</test.jdk.home>
     </properties>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 0d19f2c06..c2bd84785 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
         <encoding>UTF-8</encoding>
         <jdk.version>1.6</jdk.version>
         <jdk.home>${env.JAVA_6_HOME}</jdk.home>
+        <test.jdk.home>${jdk.home}</test.jdk.home>
         <slf4j.version>1.7.21</slf4j.version>
         <metrics.version>3.1.2</metrics.version>
         <spring.version>4.1.9.RELEASE</spring.version>
@@ -752,7 +753,7 @@
                         <exclude>**/*$*</exclude>
                     </excludes>
                     <argLine>-Dfile.encoding=${encoding}</argLine>
-                    <jvm>${jdk.home}/bin/java</jvm>
+                    <jvm>${test.jdk.home}/bin/java</jvm>
                     <forkMode>once</forkMode>
                 </configuration>
             </plugin>