| Commit in java/trunk on MAIN |
| analysis/pom.xml | | -5 | 1123 -> 1124 |
| conditions/pom.xml | | -5 | 1123 -> 1124 |
| datacat/pom.xml | +1 | -6 | 1123 -> 1124 |
| detector-data/pom.xml | | -5 | 1123 -> 1124 |
| distribution/pom.xml | +2 | -8 | 1123 -> 1124 |
| ecal-readout-sim/pom.xml | | -5 | 1123 -> 1124 |
| ecal-recon/pom.xml | | -10 | 1123 -> 1124 |
| integration-tests/pom.xml | +7 | -22 | 1123 -> 1124 |
| parent/pom.xml | +5 | | 1123 -> 1124 |
| steering-files/pom.xml | | -4 | 1123 -> 1124 |
| tracking/pom.xml | | -11 | 1123 -> 1124 |
| util/pom.xml | | -10 | 1123 -> 1124 |
| +15 | -91 | |
12 modified files
java/trunk/analysis
--- java/trunk/analysis/pom.xml 2014-10-01 00:40:24 UTC (rev 1123)
+++ java/trunk/analysis/pom.xml 2014-10-01 00:53:44 UTC (rev 1124)
@@ -1,29 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<artifactId>hps-analysis</artifactId>
<name>analysis</name>
<description>HPS analysis code</description>
-
<parent>
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
<version>3.0.3-SNAPSHOT</version>
</parent>
-
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/analysis/</url>
<connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/analysis/</connection>
<developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/analysis/</developerConnection>
</scm>
-
<dependencies>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-recon</artifactId>
</dependency>
</dependencies>
-
</project>
java/trunk/conditions
--- java/trunk/conditions/pom.xml 2014-10-01 00:40:24 UTC (rev 1123)
+++ java/trunk/conditions/pom.xml 2014-10-01 00:53:44 UTC (rev 1124)
@@ -35,11 +35,6 @@
</build>
<dependencies>
<dependency>
- <groupId>org.lcsim</groupId>
- <artifactId>lcsim-event-processing</artifactId>
- <version>${lcsimVersion}</version>
- </dependency>
- <dependency>
<groupId>org.hps</groupId>
<artifactId>hps-util</artifactId>
</dependency>
java/trunk/datacat
--- java/trunk/datacat/pom.xml 2014-10-01 00:40:24 UTC (rev 1123)
+++ java/trunk/datacat/pom.xml 2014-10-01 00:53:44 UTC (rev 1124)
@@ -36,11 +36,6 @@
<dependencies>
<dependency>
<groupId>org.lcsim</groupId>
- <artifactId>lcsim-distribution</artifactId>
- <version>3.0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.lcsim</groupId>
<artifactId>lcio</artifactId>
<version>2.4.4-SNAPSHOT</version>
</dependency>
@@ -124,4 +119,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
java/trunk/detector-data
--- java/trunk/detector-data/pom.xml 2014-10-01 00:40:24 UTC (rev 1123)
+++ java/trunk/detector-data/pom.xml 2014-10-01 00:53:44 UTC (rev 1124)
@@ -1,24 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<artifactId>hps-detector-data</artifactId>
<name>detector-data</name>
<description>detector conditions data for the HPS experiment</description>
-
<parent>
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
<version>3.0.3-SNAPSHOT</version>
</parent>
-
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/detector-data/</url>
<connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/detector-data/</connection>
<developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/detector-data/</developerConnection>
</scm>
-
<build>
<resources>
<resource>
@@ -31,5 +27,4 @@
</resource>
</resources>
</build>
-
</project>
java/trunk/distribution
--- java/trunk/distribution/pom.xml 2014-10-01 00:40:24 UTC (rev 1123)
+++ java/trunk/distribution/pom.xml 2014-10-01 00:53:44 UTC (rev 1124)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<artifactId>hps-distribution</artifactId>
<name>distribution</name>
@@ -8,20 +7,17 @@
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
-
<parent>
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
<version>3.0.3-SNAPSHOT</version>
- </parent>
-
+ </parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/distribution/</url>
<connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/distribution/</connection>
<developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/distribution/</developerConnection>
</scm>
-
<build>
<plugins>
<plugin>
@@ -63,9 +59,8 @@
</plugin>
</plugins>
</build>
-
<dependencies>
- <!-- This pulls in analysis et al transitively. -->
+ <!-- This next dep pulls in analysis et al. transitively. -->
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-users</artifactId>
@@ -79,5 +74,4 @@
<artifactId>hps-steering-files</artifactId>
</dependency>
</dependencies>
-
</project>
java/trunk/ecal-readout-sim
--- java/trunk/ecal-readout-sim/pom.xml 2014-10-01 00:40:24 UTC (rev 1123)
+++ java/trunk/ecal-readout-sim/pom.xml 2014-10-01 00:53:44 UTC (rev 1124)
@@ -1,24 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<artifactId>hps-ecal-readout-sim</artifactId>
<name>ecal-readout-sim</name>
<description>HPS ECAL readout simulation</description>
-
<parent>
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
<version>3.0.3-SNAPSHOT</version>
</parent>
-
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/ecal-readout-sim/</url>
<connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/ecal-readout-sim/</connection>
<developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/ecal-readout-sim/</developerConnection>
</scm>
-
<dependencies>
<dependency>
<groupId>org.hps</groupId>
@@ -29,5 +25,4 @@
<artifactId>hps-conditions</artifactId>
</dependency>
</dependencies>
-
</project>
java/trunk/ecal-recon
--- java/trunk/ecal-recon/pom.xml 2014-10-01 00:40:24 UTC (rev 1123)
+++ java/trunk/ecal-recon/pom.xml 2014-10-01 00:53:44 UTC (rev 1124)
@@ -1,34 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<artifactId>hps-ecal-recon</artifactId>
<name>ecal-recon</name>
<description>HPS ECAL reconstruction module</description>
-
<parent>
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
<version>3.0.3-SNAPSHOT</version>
</parent>
-
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/ecal-recon/</url>
<connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/ecal-recon/</connection>
<developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/ecal-recon/</developerConnection>
</scm>
-
<dependencies>
<dependency>
- <groupId>org.lcsim</groupId>
- <artifactId>lcsim-distribution</artifactId>
- <version>${lcsimVersion}</version>
- </dependency>
- <dependency>
<groupId>org.hps</groupId>
<artifactId>hps-conditions</artifactId>
</dependency>
</dependencies>
-
</project>
java/trunk/integration-tests
--- java/trunk/integration-tests/pom.xml 2014-10-01 00:40:24 UTC (rev 1123)
+++ java/trunk/integration-tests/pom.xml 2014-10-01 00:53:44 UTC (rev 1124)
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>hps-integration-tests</artifactId>
<name>integration-tests</name>
- <description>Integration test suite</description>
+ <description>Integration test suite for HPS Java</description>
<parent>
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
@@ -29,12 +29,15 @@
<excludes>
<exclude>org/hps/TestRunEvioToLcioTest.java</exclude>
<exclude>org/hps/MCFilteredReconTest.java</exclude>
+ <!-- Remove this test from exclusions when it is fixed. JM -->
+ <exclude>org/hps/HPSTestRunTracker2014GeometryTrackReconTest.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
+ <!-- This profile is for deactivating all integration tests when building everything from trunk. -->
<profile>
<id>no-integration-tests</id>
<activation>
@@ -52,25 +55,7 @@
</plugins>
</build>
</profile>
- <profile>
- <id>track-integration-tests</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/hps/HPSTestRunTracker2014GeometryTrackReconTest.java</include>
- </includes>
- </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>
<activation>
@@ -85,8 +70,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludes>
- <exclude>org/hps/EcalReadoutSimTest.java</exclude>
+ <excludes>
+ <exclude>org/hps/EcalReadoutSimTest.java</exclude>
</excludes>
</configuration>
</plugin>
java/trunk/parent
--- java/trunk/parent/pom.xml 2014-10-01 00:40:24 UTC (rev 1123)
+++ java/trunk/parent/pom.xml 2014-10-01 00:53:44 UTC (rev 1124)
@@ -70,6 +70,11 @@
<artifactId>junit</artifactId>
<version>4.11</version>
</dependency>
+ <dependency>
+ <groupId>org.lcsim</groupId>
+ <artifactId>lcsim-distribution</artifactId>
+ <version>${lcsimVersion}</version>
+ </dependency>
</dependencies>
<!-- DO NOT EDIT THESE DEPENDENCY VERSIONS MANUALLY. -->
<dependencyManagement>
java/trunk/steering-files
--- java/trunk/steering-files/pom.xml 2014-10-01 00:40:24 UTC (rev 1123)
+++ java/trunk/steering-files/pom.xml 2014-10-01 00:53:44 UTC (rev 1124)
@@ -1,22 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<artifactId>hps-steering-files</artifactId>
<name>steering-files</name>
<description>XML steering files</description>
-
<parent>
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
<version>3.0.3-SNAPSHOT</version>
</parent>
-
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/steering-files/</url>
<connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/steering-files/</connection>
<developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/steering-files/</developerConnection>
</scm>
-
</project>
java/trunk/tracking
--- java/trunk/tracking/pom.xml 2014-10-01 00:40:24 UTC (rev 1123)
+++ java/trunk/tracking/pom.xml 2014-10-01 00:53:44 UTC (rev 1124)
@@ -1,24 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<artifactId>hps-tracking</artifactId>
<name>tracking</name>
<description>HPS tracking reconstruction module</description>
-
<parent>
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
<version>3.0.3-SNAPSHOT</version>
</parent>
-
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/tracking/</url>
<connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/tracking/</connection>
<developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/tracking/</developerConnection>
</scm>
-
<build>
<plugins>
<plugin>
@@ -35,14 +31,8 @@
</plugin>
</plugins>
</build>
-
<dependencies>
<dependency>
- <groupId>org.lcsim</groupId>
- <artifactId>lcsim-distribution</artifactId>
- <version>${lcsimVersion}</version>
- </dependency>
- <dependency>
<groupId>org.hps</groupId>
<artifactId>hps-conditions</artifactId>
</dependency>
@@ -61,5 +51,4 @@
<version>1.0.2-SNAPSHOT</version>
</dependency>
</dependencies>
-
</project>
java/trunk/util
--- java/trunk/util/pom.xml 2014-10-01 00:40:24 UTC (rev 1123)
+++ java/trunk/util/pom.xml 2014-10-01 00:53:44 UTC (rev 1124)
@@ -1,34 +1,24 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<artifactId>hps-util</artifactId>
<name>util</name>
<description>miscellaneous utility classes</description>
-
<parent>
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
<version>3.0.3-SNAPSHOT</version>
</parent>
-
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/util/</url>
<connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/util/</connection>
<developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/util/</developerConnection>
</scm>
-
<dependencies>
<dependency>
- <groupId>org.lcsim</groupId>
- <artifactId>lcsim-distribution</artifactId>
- <version>${lcsimVersion}</version>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.2</version>
</dependency>
</dependencies>
-
</project>
SVNspam 0.1
