From 16a80cabdecc2a2f35676223b8175f80ccb3077b Mon Sep 17 00:00:00 2001
From: Martin Monperrus <martin.monperrus@gnieh.org>
Date: Sat, 8 Dec 2018 19:23:10 +0100
Subject: [PATCH 01/11] chore: JUnit dependency is in parent pom

---
 pom.xml                  |  6 ------
 spoon-decompiler/pom.xml |  6 ------
 spoon-pom/pom.xml        | 12 +++++++++++-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index dc4a13cba71..3bc60d80f78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,12 +52,6 @@
       <artifactId>org.eclipse.jdt.core</artifactId>
       <version>3.15.0</version>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.github.stefanbirkner</groupId>
       <artifactId>system-rules</artifactId>
diff --git a/spoon-decompiler/pom.xml b/spoon-decompiler/pom.xml
index 557d4e184ab..65625f0faa8 100644
--- a/spoon-decompiler/pom.xml
+++ b/spoon-decompiler/pom.xml
@@ -40,12 +40,6 @@
             <artifactId>spoon-core</artifactId>
             <version>7.2.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/org.jboss.windup.decompiler.fernflower/fernflower -->
         <dependency>
             <groupId>org.jboss.windup.decompiler.fernflower</groupId>
diff --git a/spoon-pom/pom.xml b/spoon-pom/pom.xml
index 34f72914fd6..457ac979fac 100644
--- a/spoon-pom/pom.xml
+++ b/spoon-pom/pom.xml
@@ -22,7 +22,6 @@
     <properties>
         <java.src.version>1.8</java.src.version>
         <java.test.version>1.8</java.test.version>
-        <junit.version>4.12</junit.version>
         <runtime.log>target/velocity.log</runtime.log>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -36,6 +35,17 @@
         </repository>
     </repositories>
 
+    <dependencies>
+        
+        <!-- we all depend on Junit with scope=test -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+        
     <organization>
         <name>Inria</name>
         <url>http://www.inria.fr</url>

From 01f16e626d218ff2410f7d23f96848bfd7dcf6ce Mon Sep 17 00:00:00 2001
From: Martin Monperrus <martin.monperrus@gnieh.org>
Date: Sat, 8 Dec 2018 22:05:13 +0100
Subject: [PATCH 02/11] up

---
 spoon-pom/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spoon-pom/pom.xml b/spoon-pom/pom.xml
index 457ac979fac..d82a2427f70 100644
--- a/spoon-pom/pom.xml
+++ b/spoon-pom/pom.xml
@@ -44,6 +44,12 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <version>1.13</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
         
     <organization>

From 9dba0248eaf2d132791fc56a3f5cc9db752f0749 Mon Sep 17 00:00:00 2001
From: Martin Monperrus <martin.monperrus@gnieh.org>
Date: Sat, 8 Dec 2018 22:08:17 +0100
Subject: [PATCH 03/11] up

---
 spoon-pom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spoon-pom/pom.xml b/spoon-pom/pom.xml
index d82a2427f70..c6c38582135 100644
--- a/spoon-pom/pom.xml
+++ b/spoon-pom/pom.xml
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
-            <version>1.13</version>
+            <version>1.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

From cab0ec667128aa6ca56d88b592219b0d9d082145 Mon Sep 17 00:00:00 2001
From: Martin Monperrus <monperrus@users.noreply.github.com>
Date: Mon, 10 Dec 2018 16:37:52 +0100
Subject: [PATCH 04/11] Update pom.xml

---
 spoon-pom/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spoon-pom/pom.xml b/spoon-pom/pom.xml
index c6c38582135..9f8b4812bd1 100644
--- a/spoon-pom/pom.xml
+++ b/spoon-pom/pom.xml
@@ -42,13 +42,13 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.12</version>
-            <scope>test</scope>
+            <!-- <scope>test</scope> -->
         </dependency>
-        <dependency>
+        <!-- <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
             <version>1.3</version>
-            <scope>test</scope>
+            <scope>test</scope>-->
         </dependency>
     </dependencies>
         

From ba88fc975ea273435a8602b1a451280d654cfeb7 Mon Sep 17 00:00:00 2001
From: Martin Monperrus <monperrus@users.noreply.github.com>
Date: Mon, 10 Dec 2018 16:38:22 +0100
Subject: [PATCH 05/11] Update pom.xml

---
 spoon-pom/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spoon-pom/pom.xml b/spoon-pom/pom.xml
index 9f8b4812bd1..a6a9da33599 100644
--- a/spoon-pom/pom.xml
+++ b/spoon-pom/pom.xml
@@ -48,8 +48,8 @@
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
             <version>1.3</version>
-            <scope>test</scope>-->
-        </dependency>
+            <scope>test</scope>
+        </dependency>-->
     </dependencies>
         
     <organization>

From 66bbe630cf9029150e91ebbfc2bd3385133a0999 Mon Sep 17 00:00:00 2001
From: Martin Monperrus <monperrus@users.noreply.github.com>
Date: Sat, 22 Dec 2018 18:22:19 +0100
Subject: [PATCH 06/11] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3bc60d80f78..2d8363786d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>2.0.2-beta</version>
+      <version>1.10.19</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From cd30938fe4c81054028cc23f74bbece2eec78859 Mon Sep 17 00:00:00 2001
From: Martin Monperrus <monperrus@users.noreply.github.com>
Date: Sat, 22 Dec 2018 18:29:54 +0100
Subject: [PATCH 07/11] Update pom.xml

---
 spoon-pom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spoon-pom/pom.xml b/spoon-pom/pom.xml
index a6a9da33599..a9ed5a145bd 100644
--- a/spoon-pom/pom.xml
+++ b/spoon-pom/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.11</version>
             <!-- <scope>test</scope> -->
         </dependency>
         <!-- <dependency>

From c23ba92bc7b7402142f28be9f8ad3d7ae1d62f0b Mon Sep 17 00:00:00 2001
From: Martin Monperrus <monperrus@users.noreply.github.com>
Date: Sat, 22 Dec 2018 18:33:12 +0100
Subject: [PATCH 08/11] Update pom.xml

---
 spoon-pom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spoon-pom/pom.xml b/spoon-pom/pom.xml
index a9ed5a145bd..b1c9f74e128 100644
--- a/spoon-pom/pom.xml
+++ b/spoon-pom/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.13-beta-1</version>
             <!-- <scope>test</scope> -->
         </dependency>
         <!-- <dependency>

From 2574d6b05d6f722e938aa90900557e4786822fc2 Mon Sep 17 00:00:00 2001
From: Martin Monperrus <monperrus@users.noreply.github.com>
Date: Sat, 22 Dec 2018 18:36:00 +0100
Subject: [PATCH 09/11] Update pom.xml

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2d8363786d3..c3675b647f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,8 +60,8 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.10.19</version>
+      <artifactId>mockito-core</artifactId>
+      <version>2.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 7bb74c6ec9e0d6170ff6ac5491693ec1a4a0c65f Mon Sep 17 00:00:00 2001
From: Martin Monperrus <monperrus@users.noreply.github.com>
Date: Sat, 22 Dec 2018 18:39:36 +0100
Subject: [PATCH 10/11] Update pom.xml

---
 spoon-pom/pom.xml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/spoon-pom/pom.xml b/spoon-pom/pom.xml
index b1c9f74e128..457ac979fac 100644
--- a/spoon-pom/pom.xml
+++ b/spoon-pom/pom.xml
@@ -41,15 +41,9 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13-beta-1</version>
-            <!-- <scope>test</scope> -->
-        </dependency>
-        <!-- <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <version>1.3</version>
+            <version>4.12</version>
             <scope>test</scope>
-        </dependency>-->
+        </dependency>
     </dependencies>
         
     <organization>

From d54c4cc3a03fcabedd4971d9fbee6f6efb84648c Mon Sep 17 00:00:00 2001
From: Martin Monperrus <monperrus@users.noreply.github.com>
Date: Sat, 22 Dec 2018 18:47:30 +0100
Subject: [PATCH 11/11] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c3675b647f3..775b2dd1071 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.9.0</version>
+      <version>2.23.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>