From 3021f03be9da4c2fb02a5938298085be2d4c27f7 Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Wed, 24 May 2017 10:07:32 +0000
Subject: [PATCH] Add jmh to Sonar-Maven build as well, add comment why we need
 to stick to 1.15 for now

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1796035 13f79535-47bb-0310-9956-ffa450edef68
---
 build.gradle        |  1 +
 build.xml           |  1 +
 sonar/ooxml/pom.xml | 14 ++++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/build.gradle b/build.gradle
index 526cff0405..94b7021e08 100644
--- a/build.gradle
+++ b/build.gradle
@@ -210,6 +210,7 @@ project('ooxml') {
 		
 		testCompile 'junit:junit:4.12'
 		testCompile project(path: ':main', configuration: 'tests')
+		// Keep using 1.15 until we switch to Java 7
 		testCompile 'org.openjdk.jmh:jmh-core:1.15'
 		testCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.15'
 	}
diff --git a/build.xml b/build.xml
index aa945c68dd..5e971dfc9c 100644
--- a/build.xml
+++ b/build.xml
@@ -163,6 +163,7 @@ under the License.
     <property name="main.log4j.url" value="${repository.m2}/maven2/log4j/log4j/1.2.17/log4j-1.2.17.jar"/>
     <property name="main.junit.jar" location="${main.lib}/junit-4.12.jar"/>
     <property name="main.junit.url" value="${repository.m2}/maven2/junit/junit/4.12/junit-4.12.jar"/>
+    <!-- Keep using 1.15 until we switch to Java 7 -->
     <property name="main.jmh.jar" location="${main.lib}/jmh-core-1.15.jar"/>
     <property name="main.jmh.url" value="${repository.m2}/maven2/org/openjdk/jmh/jmh-core/1.15/jmh-core-1.15.jar"/>
     <property name="main.jmhAnnotation.jar" location="${main.lib}/jmh-generator-annprocess-1.15.jar"/>
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index 97b0bb0bea..d1c6248806 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -161,5 +161,19 @@
             <artifactId>junit</artifactId>
             <version>${junit.version}</version>
         </dependency>
+
+        <!-- Keep using 1.15 until we switch to Java 7 -->
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>1.15</version>
+			<scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>1.15</version>
+			<scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
-- 
2.39.5