home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-23 11:46:46 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1763 from emeroad/#1761_add_${test.jdk.home}

Browse Source 
#1761 Add ${test.jdk.home} for jdk 1.6 compatibility of plugin
This commit is contained in:
Woonduk Kang
2016-05-11 19:22:13 +09:00
parent 3efad8b0ce f355251f5f
commit bac427ec6a
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/redis/pom.xml
+1 -2
View File
@@ -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>
plugins/tomcat/pom.xml
+1 -2
View File
@@ -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>
pom.xml
+2 -1
View File
@@ -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>