Merge branch 'master' into fixHeaderSplit

Author: anthonygauthier

.gitignore

@@ -1,8 +1,16 @@
 # Compiled class file
 *.class
 
+# Eclipse
+lib/
+.project
+certs/
+*.jks
+*.p12
+
 # Log file
 *.log
+logs/
 
 # BlueJ files
 *.ctxt
@@ -40,3 +48,4 @@ buildNumber.properties
 **.idea
 *.iml
 *.sh
+/bin/

config/log4j2.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="info">
+  <Appenders>
+    <Console name="Console" target="SYSTEM_OUT">
+      	<PatternLayout pattern="%highlight{%d{dd MMM yyyy HH:mm:ss,SSS} %-5p [%t] - %msg%n%n}{FATAL=bright red, ERROR=bright red, WARN=bright yellow, INFO=bright white, DEBUG=bright blue, TRACE=white}"/>
+    </Console>
+    <File name="File" fileName="logs/${date:yyyyMMdd_HHmmss}.log">
+    	<PatternLayout pattern="%d{dd MMM yyyy HH:mm:ss,SSS} %-5p %marker [%t] %C %M - %msg%n"/>
+    <!--logs/${ctx:testrun:-unknown}_${date:yyyyMMdd_HHmmss}_${ctx:application:-unknown}_${ctx:loadprofile:-Log}.log--></File>
+  </Appenders>
+  <Loggers>
+    <Root level="trace">
+      <AppenderRef ref="File"/>
+	  <AppenderRef ref="Console"/>
+    </Root>
+  </Loggers>
+</Configuration>

pom.xml

@@ -1,9 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>io.github.delirius325</groupId>
+	<groupId>main.java.io.github.delirius325</groupId>
 	<artifactId>jmeter.backendlistener.elasticsearch</artifactId>
-  <version>2.6.4-SNAPSHOT</version>
+	<version>2.6.5</version>
 	<packaging>jar</packaging>
 
 	<name>jmeter.backendlistener.elasticsearch</name>
@@ -35,6 +37,12 @@
 			<url>http://www.github.com/delirius325</url>
 			<timezone>America/New_York</timezone>
 		</developer>
+		<developer>
+			<id>siggitrain</id>
+			<name>Christian Weber</name>
+			<url>http://www.github.com/siggitrain</url>
+			<timezone>MESZ</timezone>
+		</developer>
 	</developers>
 
 	<properties>
@@ -94,7 +102,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.elasticsearch.client</groupId>
-            <artifactId>elasticsearch-rest-client</artifactId>
+			<artifactId>elasticsearch-rest-client</artifactId>
 			<version>${org.elasticsearch.client}</version>
 		</dependency>
 		<dependency>
@@ -161,10 +169,10 @@
 		<profile>
 			<id>release-sign-artifacts</id>
 			<activation>
-		    		<property>
+				<property>
 					<name>performRelease</name>
 					<value>true</value>
-			    	</property>
+				</property>
 			</activation>
 			<build>
 				<plugins>
@@ -284,15 +292,15 @@
 							<goal>shade</goal>
 						</goals>
 						<configuration>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>org.apache.jmeter:*</exclude>
-                                    <exclude>commons-codec:*</exclude>
-                                    <exclude>commons-logging:*</exclude>
-                                    <exclude>org.apache.httpcomponents:*</exclude>
-                                    <exclude>net.java.dev.jna:*</exclude>
-                                </excludes>
-                            </artifactSet>
+							<artifactSet>
+								<excludes>
+									<exclude>org.apache.jmeter:*</exclude>
+									<exclude>commons-codec:*</exclude>
+									<exclude>commons-logging:*</exclude>
+									<exclude>org.apache.httpcomponents:*</exclude>
+									<exclude>net.java.dev.jna:*</exclude>
+								</excludes>
+							</artifactSet>
 						</configuration>
 					</execution>
 				</executions>