]> source.dussan.org Git - aspectj.git/commitdiff
Update to JUnit Jupiter 5.6.2
authorLars Grefer <eclipse@larsgrefer.de>
Sun, 16 Aug 2020 23:48:58 +0000 (01:48 +0200)
committerAndy Clement <aclement@pivotal.io>
Mon, 17 Aug 2020 00:05:51 +0000 (17:05 -0700)
The "old" JUnit-3-style tests will be executed by the vintage-engine

Signed-off-by: Lars Grefer <eclipse@larsgrefer.de>
pom.xml

diff --git a/pom.xml b/pom.xml
index 32934ba49e8d4a1adeba926520e65de95b3cdb51..e73828d2cb81082f1ac4eafae3de36543665655c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-surefire-plugin</artifactId>
+                                       <version>2.22.2</version>
                                        <configuration>
 <!--
                                                <testFailureIgnore>true</testFailureIgnore>
@@ -95,8 +96,8 @@
                                </executions>
                        </plugin>
 
-                       <!-- <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>3.1.1</version> 
-                               <configuration> <descriptors> <descriptor>assembly.xml</descriptor> </descriptors> 
+                       <!-- <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>3.1.1</version>
+                               <configuration> <descriptors> <descriptor>assembly.xml</descriptor> </descriptors>
                                </configuration> </plugin> -->
 
                        <plugin>
                                                <fileset>
                                                        <directory>.</directory>
                                                        <includes>
-<include>**/ajcore.*.txt</include> 
+<include>**/ajcore.*.txt</include>
 
-                                                               </includes> 
+                                                               </includes>
 <!--
-<excludes> <exclude>**/important.log</exclude> <exclude>**/another-important.log</exclude> 
+<excludes> <exclude>**/important.log</exclude> <exclude>**/another-important.log</exclude>
                                                                </excludes> -->
                                                        <followSymlinks>false</followSymlinks>
                                                </fileset>
                                                <fileset>
                                                        <directory>aj-build</directory>
-                                                       <!-- <includes> <include>**/*.tmp</include> <include>**/*.log</include> 
-                                                               </includes> <excludes> <exclude>**/important.log</exclude> <exclude>**/another-important.log</exclude> 
+                                                       <!-- <includes> <include>**/*.tmp</include> <include>**/*.log</include>
+                                                               </includes> <excludes> <exclude>**/important.log</exclude> <exclude>**/another-important.log</exclude>
                                                                </excludes> -->
                                                        <followSymlinks>false</followSymlinks>
                                                </fileset>
 
        </build>
 
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.junit</groupId>
+                               <artifactId>junit-bom</artifactId>
+                               <version>5.6.2</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
+
        <dependencies>
                <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.13</version>
+                       <groupId>org.junit.jupiter</groupId>
+                       <artifactId>junit-jupiter-api</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.junit.jupiter</groupId>
+                       <artifactId>junit-jupiter-engine</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.junit.vintage</groupId>
+                       <artifactId>junit-vintage-engine</artifactId>
                        <scope>test</scope>
                </dependency>
        </dependencies>