Author: painter
Date: Tue Jan 22 18:14:18 2019
New Revision: 1851840
URL: http://svn.apache.org/viewvc?rev=1851840&view=rev
Log:
Move back to Turbine Parent 5 until we publish all fulcrum components. Update
sub-modules to execute tests correctly using surefire plugin version 3.0.0-M2
Modified:
turbine/fulcrum/trunk/security/hibernate/pom.xml
turbine/fulcrum/trunk/security/memory/pom.xml
turbine/fulcrum/trunk/security/pom.xml
turbine/fulcrum/trunk/security/torque/pom.xml
Modified: turbine/fulcrum/trunk/security/hibernate/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/pom.xml?rev=1851840&r1=1851839&r2=1851840&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/pom.xml (original)
+++ turbine/fulcrum/trunk/security/hibernate/pom.xml Tue Jan 22 18:14:18 2019
@@ -41,27 +41,23 @@
<build>
<sourceDirectory>${basedir}/src/java/</sourceDirectory>
<testSourceDirectory>${basedir}/src/test/</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${basedir}/src/test</directory>
- <includes>
- <include>**/*.*</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>perTest</forkMode>
- <includes>
- <include>**/*Test.*</include>
- <include>**/*TestCase.*</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
+ <testResources>
+ <testResource>
+
<directory>${project.basedir}/src/test</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M2</version>
+ <configuration>
+ <!--default setting is
forkCount=1/reuseForks=true -->
+ <reuseForks>false</reuseForks>
+ <forkCount>1</forkCount>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
<dependency>
Modified: turbine/fulcrum/trunk/security/memory/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/pom.xml?rev=1851840&r1=1851839&r2=1851840&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/pom.xml (original)
+++ turbine/fulcrum/trunk/security/memory/pom.xml Tue Jan 22 18:14:18 2019
@@ -39,26 +39,23 @@
<build>
<sourceDirectory>${basedir}/src/java/</sourceDirectory>
<testSourceDirectory>${basedir}/src/test/</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${basedir}/src/test</directory>
- <includes>
- <include>**/*.*</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>always</forkMode>
- <includes>
- <include>**/*Test.*</include>
- <include>**/*TestCase.*</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
+ <testResources>
+ <testResource>
+
<directory>${project.basedir}/src/test</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M2</version>
+ <configuration>
+ <!--default setting is
forkCount=1/reuseForks=true -->
+ <reuseForks>false</reuseForks>
+ <forkCount>1</forkCount>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
Modified: turbine/fulcrum/trunk/security/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/pom.xml?rev=1851840&r1=1851839&r2=1851840&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/pom.xml (original)
+++ turbine/fulcrum/trunk/security/pom.xml Tue Jan 22 18:14:18 2019
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>6-SNAPSHOT</version>
+ <version>5</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: turbine/fulcrum/trunk/security/torque/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/pom.xml?rev=1851840&r1=1851839&r2=1851840&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/pom.xml (original)
+++ turbine/fulcrum/trunk/security/torque/pom.xml Tue Jan 22 18:14:18 2019
@@ -45,13 +45,20 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
-
+ <testResources>
+ <testResource>
+
<directory>${project.basedir}/src/test</directory>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M2</version>
<configuration>
- <forkMode>perTest</forkMode>
+ <!--default setting is
forkCount=1/reuseForks=true -->
+ <reuseForks>false</reuseForks>
+ <forkCount>1</forkCount>
</configuration>
</plugin>
<plugin>
