Author: [log in to unmask]
Date: Tue Oct 6 19:56:10 2015
New Revision: 3783
Log:
Update surefire-plugin version; use systemPropertyVariables setting; minor cleanup.
Modified:
java/trunk/integration-tests/pom.xml
java/trunk/parent/pom.xml
Modified: java/trunk/integration-tests/pom.xml
=============================================================================
--- java/trunk/integration-tests/pom.xml (original)
+++ java/trunk/integration-tests/pom.xml Tue Oct 6 19:56:10 2015
@@ -18,13 +18,14 @@
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-distribution</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
@@ -55,33 +56,6 @@
</plugins>
</build>
</profile>
-<!--
- <profile>
- <id>fast-integration-tests</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/hps/EtSystemTest.java</exclude>
- <exclude>org/hps/DataQualityMonitorTest.java</exclude>
- <exclude>org/hps/HPSTestRunTracker2014GeometryTrackReconTest.java</exclude>
- <exclude>org/hps/MCFilteredReconTest.java</exclude>
- <exclude>org/hps/ReadoutToEvioTest.java</exclude>
- <exclude>org/hps/ReadoutToLcioTest.java</exclude>
- <exclude>org/hps/SimpleSvtReadoutTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
--->
<!-- This profile activates automatically when not running tests on a SLAC Unix system with NFS access. -->
<profile>
<id>no-slac-nfs</id>
Modified: java/trunk/parent/pom.xml
=============================================================================
--- java/trunk/parent/pom.xml (original)
+++ java/trunk/parent/pom.xml Tue Oct 6 19:56:10 2015
@@ -436,24 +436,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
+ <version>2.18.1</version>
<configuration>
-<!--
- <disableXmlReport>true</disableXmlReport>
--->
<argLine>-Xmx1024m</argLine>
<forkMode>pertest</forkMode>
- <!-- This allows the cacheDir to be overridden by settings.xml for Hudson builds. -->
- <systemProperties>
- <property>
- <name>org.lcsim.cacheDir</name>
- <value>${org.lcsim.cacheDir}</value>
- </property>
- <property>
- <name>java.util.logging.config.class</name>
- <value>org.hps.logging.config.DefaultLoggingConfig</value>
- </property>
- </systemProperties>
+ <systemPropertyVariables>
+ <org.lcsim.cacheDir>${org.lcsim.cacheDir}</org.lcsim.cacheDir>
+ <java.util.logging.config.class>org.hps.logging.config.DefaultLoggingConfig</java.util.logging.config.class>
+ </systemPropertyVariables>
</configuration>
</plugin>
<plugin>
