Author: gk
Date: Wed Jul 1 10:22:59 2020
New Revision: 1879398
URL: http://svn.apache.org/viewvc?rev=1879398&view=rev
Log:
- update version jupiter to 5.6.2 and junit.platform to 1.6.2
- simplify jupiter deps
- remove .cvsignore, update svn:ignore prop
Removed:
turbine/fulcrum/trunk/testcontainer/.cvsignore
Modified:
turbine/fulcrum/trunk/testcontainer/ (props changed)
turbine/fulcrum/trunk/testcontainer/pom.xml
Propchange: turbine/fulcrum/trunk/testcontainer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jul 1 10:22:59 2020
@@ -5,9 +5,9 @@ target
*.log
.classpath
.project
+.idea
+.settings
+*.iml
+
*.ser
junit*.properties
-.externalToolBuilders
-.settings
-maven-eclipse.xml
-fulcrum-testcontainer.iml
Modified: turbine/fulcrum/trunk/testcontainer/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/pom.xml?rev=1879398&r1=1879397&r2=1879398&view=diff
==============================================================================
--- turbine/fulcrum/trunk/testcontainer/pom.xml (original)
+++ turbine/fulcrum/trunk/testcontainer/pom.xml Wed Jul 1 10:22:59 2020
@@ -60,30 +60,14 @@
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>${junit.jupiter.version}</version>
- <!--scope>test</scope -->
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <version>${junit.jupiter.version}</version>
- <!--scope>test</scope -->
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit.jupiter.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junit.jupiter.version}</version>
+ <!--scope>test</scope -->
+ </dependency>
<!-- use Junit 4 within Junit 5 -->
<dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit.jupiter.version}</version>
- </dependency>
- <dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-runner</artifactId>
<version>${junit.platform}</version>
@@ -109,7 +93,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.28.2</version>
+ <version>3.3.3</version>
</dependency>
<!-- Needed if testing with ECM -->
<dependency>
@@ -175,8 +159,8 @@
<properties>
<turbine.site.path>fulcrum/fulcrum-testcontainer</turbine.site.path>
<turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/testcontainer</turbine.scmPubCheckoutDirectory>
- <junit.jupiter.version>5.5.2</junit.jupiter.version>
- <junit.platform>1.5.2</junit.platform>
+ <junit.jupiter.version>5.6.2</junit.jupiter.version>
+ <junit.platform>1.6.2</junit.platform>
</properties>
</project>
