Author: centic
Date: Wed May 24 10:07:32 2017
New Revision: 1796035
URL: http://svn.apache.org/viewvc?rev=1796035&view=rev
Log:
Add jmh to Sonar-Maven build as well, add comment why we need to stick to 1.15
for now
Modified:
poi/trunk/build.gradle
poi/trunk/build.xml
poi/trunk/sonar/ooxml/pom.xml
Modified: poi/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1796035&r1=1796034&r2=1796035&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Wed May 24 10:07:32 2017
@@ -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'
}
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1796035&r1=1796034&r2=1796035&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Wed May 24 10:07:32 2017
@@ -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"/>
Modified: poi/trunk/sonar/ooxml/pom.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml/pom.xml?rev=1796035&r1=1796034&r2=1796035&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml/pom.xml (original)
+++ poi/trunk/sonar/ooxml/pom.xml Wed May 24 10:07:32 2017
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
