Adopted Google Java Style

README.md

@@ -39,9 +39,8 @@ https://github.com/mzmine/mzmine3/issues
 
 ### Code style
 
-Since this is a collaborative project, please adhere to the following code formatting conventions:
-* All Java sources should be formatted according to the official [Java Code Conventions](http://www.oracle.com/technetwork/java/javase/documentation/codeconvtoc-136057.html) with only one adjustment: use spaces for indentation instead of tabs
-* You can use the `mzmine-eclipse-code-formater.xml` file to automatically format your code in the Eclipse IDE
-* Please write JavaDoc comments as full sentences, starting with a capital letter and ending with a period. Brevity is preferred (e.g., "Calculates standard deviation" is preferred over "This method calculates and returns a standard deviation of given set of numbers").
+* We use the Google Java Style Guide (https://github.com/google/styleguide)
+* You can use the `eclipse-java-google-style.xml` file to automatically format your code in the Eclipse IDE
+* Please write JavaDoc comments as full sentences, starting with a capital letter and ending with a period. Brevity is preferred (e.g., "Calculates standard deviation" instead of "This method calculates and returns a standard deviation of given set of numbers").
 
 

pom.xml

@@ -13,9 +13,9 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<cdk.version>1.5.14</cdk.version>
-		<guava.version>20.0</guava.version>
+		<guava.version>21.0</guava.version>
 		<controlsfx.version>8.40.12</controlsfx.version>
-		<slf4j.version>1.7.22</slf4j.version>
+		<slf4j.version>1.7.25</slf4j.version>
 		<jfreechart.version>1.0.19-fx</jfreechart.version>
 	</properties>
 
@@ -40,7 +40,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.6.0</version>
+				<version>3.6.1</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
@@ -51,11 +51,32 @@
 			<plugin>
 				<groupId>com.zenjava</groupId>
 				<artifactId>javafx-maven-plugin</artifactId>
-				<version>8.7.0</version>
+				<version>8.8.3</version>
 				<configuration>
 					<vendor>MZmine development team</vendor>
 					<mainClass>io.github.mzmine.main.MZmineMain</mainClass>
+					<identifier>MZmine 3</identifier>
+					<jvmArgs>
+						<jvmArg>-Xmx4g</jvmArg>
+					</jvmArgs>
+					<bundler>dmg</bundler>
 				</configuration>
+				<executions>
+					<execution>
+						<id>create-jfxjar</id>
+						<phase>package</phase>
+						<goals>
+							<goal>build-jar</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>create-native</id>
+						<phase>package</phase>
+						<goals>
+							<goal>build-native</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 		<resources>
@@ -83,7 +104,7 @@
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>
 			<artifactId>jsr305</artifactId>
-			<version>3.0.1</version>
+			<version>3.0.2</version>
 		</dependency>
 
 		<dependency>
@@ -149,7 +170,7 @@
 		<dependency>
 			<groupId>org.apache.xmlgraphics</groupId>
 			<artifactId>fop</artifactId>
-			<version>2.1</version>
+			<version>2.2</version>
 		</dependency>
 
 		<dependency>