Merge pull request #1132 from akomakom/parent-10-corrections

new parent, surefire/failsafe->forge

Author: Myron Scott

build-parent/pom.xml

@@ -48,7 +48,6 @@
 
     <gmaven-plugin.version>1.4</gmaven-plugin.version>
     <copy-maven-plugin.version>0.2.3.8</copy-maven-plugin.version>
-    <surefire.version>2.15</surefire.version>
     <powermock.version>2.0.0</powermock.version>
     <hamcrest.version>1.3</hamcrest.version>
     <asm.version>7.2</asm.version>
@@ -261,11 +260,6 @@
             </execution>
           </executions>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>${surefire.version}</version>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>

common/pom.xml

@@ -101,9 +101,8 @@ Apache Ivy version: 2.2.0 20100923230623
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19</version>
+        <groupId>org.terracotta</groupId>
+        <artifactId>maven-forge-plugin</artifactId>
         <configuration>
             <forkCount>2C</forkCount>
             <reuseForks>false</reuseForks>

dso-l2/pom.xml

@@ -131,9 +131,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19.1</version>
+        <groupId>org.terracotta</groupId>
+        <artifactId>maven-forge-plugin</artifactId>
         <configuration>
             <forkCount>1C</forkCount>
             <reuseForks>false</reuseForks>
@@ -153,9 +152,8 @@
       <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19.1</version>
+        <groupId>org.terracotta</groupId>
+        <artifactId>maven-forge-plugin</artifactId>
         <configuration>
             <debugForkedProcess>true</debugForkedProcess>
         </configuration>

galvan-support/pom.xml

@@ -103,16 +103,8 @@ limitations under the License.
         </executions>
       </plugin>
       <plugin>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.19.1</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
+        <groupId>org.terracotta</groupId>
+        <artifactId>maven-forge-plugin</artifactId>
         <configuration>
           <reuseForks>false</reuseForks>
           <systemPropertyVariables>

pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.terracotta</groupId>
     <artifactId>terracotta-parent</artifactId>
-    <version>5.5.0</version>
+    <version>5.10</version>
     <relativePath/>
   </parent>
 
@@ -37,7 +37,6 @@
 
   <properties>
     <build.edition>opensource</build.edition>
-    <maven-forge-plugin.version>1.2.22</maven-forge-plugin.version>
     <tc-shader.version>1.2</tc-shader.version>
     <skip.deploy>false</skip.deploy>
 

terracotta-kit/pom.xml

@@ -107,9 +107,8 @@
             </plugin>
 
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <version>${surefire.version}</version>
+              <groupId>org.terracotta</groupId>
+              <artifactId>maven-forge-plugin</artifactId>
               <executions>
                 <execution>
                   <id>test-scripts</id>

terracotta/pom.xml

@@ -31,7 +31,6 @@
             <plugin>
                 <groupId>org.terracotta</groupId>
                 <artifactId>maven-forge-plugin</artifactId>
-                <version>${maven-forge-plugin.version}</version>
                 <configuration>
                     <rootPath>${basedir}/..</rootPath>
                     <addClasspath>true</addClasspath>