X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=pom.xml;h=97aa28c810c63ed9c202f53dadbe3591daf1776b;hb=08f2567c6174ecee18349fc5b60b57e6de1b11b7;hp=f2b55cb89a8766a4aa904a444b7fc6ba48d74bd0;hpb=eca1a136dbd9c6beb63258f8d1ee20590a81fa77;p=lttng-ust-java-tests.git

diff --git a/pom.xml b/pom.xml
index f2b55cb..97aa28c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,9 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
+    <!-- Work around bug SUREFIRE-1831 in failsafe 3.0.0-M5 -->
+    <failsafe.useModulePath>false</failsafe.useModulePath>
+
     <!-- Paths that come from UST's default "make install".
          Override to specify other locations. -->
     <common-jar-location>/usr/local/share/java/lttng-ust-agent-common-1.0.0.jar</common-jar-location>
@@ -64,17 +67,27 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.6.1</version>
+          <version>3.9.0</version>
           <configuration>
             <source>1.8</source>
             <target>1.8</target>
           </configuration>
         </plugin>
 
+	<!-- Set Surefire to the same version as Failsafe even if we don't use
+	     it. Otherwise, Maven will invoke a random default version and if
+	     we specify a user property used by both plugins on the command
+	     line things could go wrong. -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>3.0.0-M5</version>
+        </plugin>
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.19.1</version>
+          <version>3.0.0-M5</version>
           <executions>
             <execution>
               <goals>
@@ -111,10 +124,11 @@
       </dependency>
 
       <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.13.2</version>
-        <scope>test</scope>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
 
       <!-- System dependencies, should have been installed by UST -->
@@ -161,7 +175,6 @@
         <groupId>org.lttng.ust</groupId>
         <artifactId>lttng-ust-java-tests-common</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <scope>test</scope>
       </dependency>
     </dependencies>
   </dependencyManagement>