- update fulcrums with parent 6
- update fulcrum quartz to 2.3.1
- update fulcrumtestcontainer deps mockito 2.28.2, junit.jupiter to 5.5.1, junit-platform-runner to 1.5.1
- update README.txt
git-svn-id: https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/testcontainer@1863620 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 8f86362..f52d3b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
<name>Fulcrum Test Container</name>
<inceptionYear>2004</inceptionYear>
<description>A test framework for Avalon components</description>
- <url>http://turbine.apache.org/fulcrum/fulcrum-testcontainer</url>
+ <url>https://turbine.apache.org/fulcrum/fulcrum-testcontainer</url>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/testcontainer</connection>
@@ -113,7 +113,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.23.0</version>
+ <version>2.28.2</version>
</dependency>
<!-- Needed if testing with ECM -->
<dependency>
@@ -127,20 +127,20 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
+ <version>${turbine.log4j2.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
+ <version>${turbine.log4j2.version}</version>
<optional>true</optional>
</dependency>
<!-- log4j1.2 bridge instead of log4j -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
- <version>${log4j2.version}</version>
+ <version>${turbine.log4j2.version}</version>
<optional>true</optional>
</dependency>
@@ -175,16 +175,15 @@
</plugins>
</build>
- <properties>
+ <properties>
- <turbine.site.path>fulcrum/fulcrum-testcontainer</turbine.site.path>
+ <turbine.site.path>fulcrum/fulcrum-testcontainer</turbine.site.path>
<turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/testcontainer</turbine.scmPubCheckoutDirectory>
- <turbine.site.cache>${project.build.directory}/turbine-sites</turbine.site.cache>
- <siteContent.path>${project.build.directory}/staging</siteContent.path><!-- default stagingSiteURL -->
- <junit.jupiter.version>5.3.2</junit.jupiter.version>
- <junit.platform>1.3.2</junit.platform>
- <log4j2.version>2.11.1</log4j2.version>
- </properties>
+ <junit.jupiter.version>5.5.1</junit.jupiter.version>
+ <junit.platform>1.5.1</junit.platform>
+ <!--junit.platform>1.3.2</junit.platform-->
+ <!--turbine.site.cache>${project.build.directory}/turbine-sites</turbine.site.cache-->
+ </properties>
-</project>
+</project>
