Merged the utils module with the core module, created a separate

core-tests module

mzmine-build/pom.xml

@@ -13,6 +13,12 @@
 			<artifactId>mzmine-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>net.sf.mzmine</groupId>
+			<artifactId>mzmine-core-tests</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>net.sf.mzmine.modules</groupId>
 			<artifactId>mzmine-rawdata-import</artifactId>
@@ -39,7 +45,7 @@
 						</goals>
 						<configuration>
 							<descriptors>
-								<descriptor>assembly.xml</descriptor>
+								<descriptor>src/main/assembly/assembly.xml</descriptor>
 							</descriptors>
 							<finalName>MZmine-${project.version}</finalName>
 							<outputDirectory>../</outputDirectory>

mzmine-utils/.classpath → mzmine-core-tests/.classpath

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -27,5 +21,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

mzmine-utils/.settings/org.eclipse.core.resources.prefs → mzmine-core-tests/.settings/org.eclipse.core.resources.prefs

@@ -1,5 +1,4 @@
 eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8

mzmine-utils/pom.xml → mzmine-core-tests/pom.xml

@@ -6,7 +6,7 @@
 		<artifactId>mzmine</artifactId>
 		<version>3.0</version>
 	</parent>
-	<artifactId>mzmine-utils</artifactId>
+	<artifactId>mzmine-core-tests</artifactId>
 
 	<dependencies>
 
@@ -25,7 +25,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>