From ab6520f0f3a49244d4aef564e4f50fea32bbb4cc Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Sun, 23 Jun 2013 22:10:29 +0400
Subject: [PATCH] fix

---
 core/pom.xml                                        | 13 +++++++++++++
 .../android/calculator/CalculatorTestUtils.java     |  2 +-
 pom.xml                                             |  3 +--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 3f35e58a..eb919a22 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -70,5 +70,18 @@
 
 	</dependencies>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<forkCount>1</forkCount>
+					<reuseForks>false</reuseForks>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
 
 </project>
\ No newline at end of file
diff --git a/core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java b/core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
index 33f02781..1e9b43ec 100644
--- a/core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
+++ b/core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
@@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit;
 public class CalculatorTestUtils {
 
 	// in seconds
-	public static final int TIMEOUT = 10;
+	public static final int TIMEOUT = 15;
 
 	public static void staticSetUp() throws Exception {
 		Locator.getInstance().init(new CalculatorImpl(), newCalculatorEngine(), Mockito.mock(CalculatorClipboard.class), Mockito.mock(CalculatorNotifier.class), Mockito.mock(CalculatorHistory.class), new SystemOutCalculatorLogger(), Mockito.mock(CalculatorPreferenceService.class), Mockito.mock(CalculatorKeyboard.class), Mockito.mock(CalculatorExternalListenersContainer.class), Mockito.mock(CalculatorPlotter.class));
diff --git a/pom.xml b/pom.xml
index 2d619e91..3aa0f4f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,7 +259,6 @@
 				</executions>
 			</plugin>
 
-			<!-- as some classes are singletons we must run  each test in separate JVM-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -296,7 +295,7 @@
 				<plugin>
 					<groupId>com.jayway.maven.plugins.android.generation2</groupId>
 					<artifactId>android-maven-plugin</artifactId>
-					<version>3.4.0</version>
+					<version>3.6.0</version>
 					<configuration>
 
 						<sourceDirectories>