Merge branch 'master' of github.com:magefree/mage into github-actions

This commit is contained in:
Phred 2021-10-04 09:22:52 -05:00
commit ede39159a6
No known key found for this signature in database
GPG key ID: 8103F27168DAA2A0
4 changed files with 349 additions and 7 deletions

16
pom.xml
View file

@ -97,7 +97,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<version>3.0.0-M5</version>
<!--
for compatible with jacoco code coverage - argLine moved to properties section
<configuration>
@ -191,9 +191,9 @@
<dependency>
<!-- junit 4 tests -->
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
@ -216,6 +216,14 @@
<!-- OTHER dependencies - you must add it to child modules manually (copy groupId and artifactId without scope and version) -->
<!-- write shared libs from all childs here to version control -->
<dependencies>
<dependency>
<!-- junit compatible dependencies (xmage uses junit 5 platform for all v4 and v5 tests) -->
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<!-- json support -->
<groupId>com.google.code.gson</groupId>