Merge pull request #10 from kickass-jmh/updateTo1.18

Update to JMH 1.18

Author: biboudis

.gitignore

@@ -72,3 +72,11 @@ com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 
+# Eclipse
+.classpath
+.project
+.settings/
+
+# VSCode
+.vscode/
+

README.md

@@ -20,7 +20,7 @@ _where in the version field you can use the latest one_
 <dependency>
   <groupId>com.github.biboudis</groupId>
   <artifactId>jmh-profilers</artifactId>
-  <version>0.1.3</version>
+  <version>0.1.4</version>
 </dependency>
 ```
 #### SBT with sbt-jmh plugin

pom.xml

@@ -18,12 +18,12 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>1.8</version>
+            <version>1.18</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>1.8</version>
+            <version>1.18</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -137,7 +137,7 @@
     </scm>
 
     <properties>
-        <jdk.version>1.6</jdk.version>
+        <jdk.version>1.7</jdk.version>
     </properties>
 
     <distributionManagement>

src/main/java/profilers/FlightRecordingProfiler.java

@@ -1,19 +1,24 @@
 package profilers;
 
-import org.openjdk.jmh.infra.BenchmarkParams;
-import org.openjdk.jmh.profile.ExternalProfiler;
-import org.openjdk.jmh.results.*;
-import org.openjdk.jmh.util.FileUtils;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.management.ManagementFactory;
-import java.net.URI;
-import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.openjdk.jmh.infra.BenchmarkParams;
+import org.openjdk.jmh.profile.ExternalProfiler;
+import org.openjdk.jmh.results.AggregationPolicy;
+import org.openjdk.jmh.results.Aggregator;
+import org.openjdk.jmh.results.BenchmarkResult;
+import org.openjdk.jmh.results.Result;
+import org.openjdk.jmh.results.ResultRole;
+import org.openjdk.jmh.util.FileUtils;
 
 // Effectively equivalent to passing jvm args to append for each benchmark. e.g.,
 //
@@ -65,7 +70,7 @@ public Collection<String> addJVMOptions(BenchmarkParams params) {
 
         startFlightRecordingOptions += "filename=" + jfrData;
         String jfcPath = Paths.get(params.getJvm()).resolve("../../lib/jfr/profile.jfc").normalize().toAbsolutePath().toString();
-        flightRecorderOptions       += "settings=" + jfcPath;
+        flightRecorderOptions       += ",settings=" + jfcPath;
 
         return Arrays.asList(
                 "-XX:+FlightRecorder",
@@ -114,13 +119,13 @@ public boolean allowPrintErr() {
         return false;
     }
 
-    @Override
+    
     public boolean checkSupport(List<String> msgs) {
         msgs.add("Commercial features of the JVM need to be enabled for this profiler.");
         return IS_SUPPORTED;
     }
 
-    @Override
+    
     public String label() {
         return "jfr";
     }