Author: [log in to unmask]
Date: Tue Jul 7 12:23:33 2015
New Revision: 3244
Log:
Merge trunk changes into conditions branch.
Added:
java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/ecal/EcalPulseWidth.java
- copied unchanged from r3243, java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalPulseWidth.java
Modified:
java/branches/HPSJAVA-488/ (props changed)
java/branches/HPSJAVA-488/analysis/pom.xml
java/branches/HPSJAVA-488/conditions/ (props changed)
java/branches/HPSJAVA-488/conditions/pom.xml
java/branches/HPSJAVA-488/detector-data/pom.xml
java/branches/HPSJAVA-488/detector-model/pom.xml
java/branches/HPSJAVA-488/distribution/ (props changed)
java/branches/HPSJAVA-488/distribution/pom.xml
java/branches/HPSJAVA-488/ecal-event-display/pom.xml
java/branches/HPSJAVA-488/ecal-readout-sim/pom.xml
java/branches/HPSJAVA-488/ecal-recon/pom.xml
java/branches/HPSJAVA-488/evio/pom.xml
java/branches/HPSJAVA-488/integration-tests/ (props changed)
java/branches/HPSJAVA-488/integration-tests/pom.xml
java/branches/HPSJAVA-488/monitoring-app/ (props changed)
java/branches/HPSJAVA-488/monitoring-app/pom.xml
java/branches/HPSJAVA-488/monitoring-drivers/pom.xml
java/branches/HPSJAVA-488/monitoring-util/pom.xml
java/branches/HPSJAVA-488/parent/pom.xml
java/branches/HPSJAVA-488/plugin/pom.xml
java/branches/HPSJAVA-488/pom.xml
java/branches/HPSJAVA-488/recon/pom.xml
java/branches/HPSJAVA-488/record-util/pom.xml
java/branches/HPSJAVA-488/steering-files/pom.xml
java/branches/HPSJAVA-488/tracking/pom.xml
java/branches/HPSJAVA-488/users/pom.xml
java/branches/HPSJAVA-488/util/pom.xml
Modified: java/branches/HPSJAVA-488/analysis/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/analysis/pom.xml (original)
+++ java/branches/HPSJAVA-488/analysis/pom.xml Tue Jul 7 12:23:33 2015
@@ -8,7 +8,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/analysis/</url>
Modified: java/branches/HPSJAVA-488/conditions/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/conditions/pom.xml (original)
+++ java/branches/HPSJAVA-488/conditions/pom.xml Tue Jul 7 12:23:33 2015
@@ -8,7 +8,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/conditions/</url>
Modified: java/branches/HPSJAVA-488/detector-data/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/detector-data/pom.xml (original)
+++ java/branches/HPSJAVA-488/detector-data/pom.xml Tue Jul 7 12:23:33 2015
@@ -8,7 +8,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/detector-data/</url>
Modified: java/branches/HPSJAVA-488/detector-model/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/detector-model/pom.xml (original)
+++ java/branches/HPSJAVA-488/detector-model/pom.xml Tue Jul 7 12:23:33 2015
@@ -8,7 +8,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<build>
<plugins>
Modified: java/branches/HPSJAVA-488/distribution/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/distribution/pom.xml (original)
+++ java/branches/HPSJAVA-488/distribution/pom.xml Tue Jul 7 12:23:33 2015
@@ -13,7 +13,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/distribution/</url>
Modified: java/branches/HPSJAVA-488/ecal-event-display/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/ecal-event-display/pom.xml (original)
+++ java/branches/HPSJAVA-488/ecal-event-display/pom.xml Tue Jul 7 12:23:33 2015
@@ -7,7 +7,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/ecal-event-display/</url>
Modified: java/branches/HPSJAVA-488/ecal-readout-sim/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/ecal-readout-sim/pom.xml (original)
+++ java/branches/HPSJAVA-488/ecal-readout-sim/pom.xml Tue Jul 7 12:23:33 2015
@@ -8,7 +8,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/ecal-readout-sim/</url>
Modified: java/branches/HPSJAVA-488/ecal-recon/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/ecal-recon/pom.xml (original)
+++ java/branches/HPSJAVA-488/ecal-recon/pom.xml Tue Jul 7 12:23:33 2015
@@ -8,7 +8,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/ecal-recon/</url>
Modified: java/branches/HPSJAVA-488/evio/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/evio/pom.xml (original)
+++ java/branches/HPSJAVA-488/evio/pom.xml Tue Jul 7 12:23:33 2015
@@ -8,7 +8,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/evio/</url>
Modified: java/branches/HPSJAVA-488/integration-tests/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/integration-tests/pom.xml (original)
+++ java/branches/HPSJAVA-488/integration-tests/pom.xml Tue Jul 7 12:23:33 2015
@@ -7,7 +7,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/integration-tests/</url>
Modified: java/branches/HPSJAVA-488/monitoring-app/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/monitoring-app/pom.xml (original)
+++ java/branches/HPSJAVA-488/monitoring-app/pom.xml Tue Jul 7 12:23:33 2015
@@ -7,7 +7,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/monitoring-app/</url>
Modified: java/branches/HPSJAVA-488/monitoring-drivers/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/monitoring-drivers/pom.xml (original)
+++ java/branches/HPSJAVA-488/monitoring-drivers/pom.xml Tue Jul 7 12:23:33 2015
@@ -7,7 +7,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/monitoring-drivers/</url>
Modified: java/branches/HPSJAVA-488/monitoring-util/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/monitoring-util/pom.xml (original)
+++ java/branches/HPSJAVA-488/monitoring-util/pom.xml Tue Jul 7 12:23:33 2015
@@ -7,7 +7,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/monitoring-util/</url>
Modified: java/branches/HPSJAVA-488/parent/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/parent/pom.xml (original)
+++ java/branches/HPSJAVA-488/parent/pom.xml Tue Jul 7 12:23:33 2015
@@ -6,7 +6,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<packaging>pom</packaging>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<name>parent</name>
<description>HPS Java parent POM</description>
<properties>
@@ -137,92 +137,92 @@
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-util</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-detector-data</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-detector-model</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-conditions</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-ecal-recon</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-ecal-readout-sim</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-tracking</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-evio</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-recon</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-analysis</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-monitoring-drivers</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-monitoring-app</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-users</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-steering-files</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-distribution</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-ecal-event-display</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-record-util</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hps</groupId>
<artifactId>hps-monitoring-util</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</dependency>
<!-- Next are external dependencies used in multiple modules. -->
<dependency>
Modified: java/branches/HPSJAVA-488/plugin/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/plugin/pom.xml (original)
+++ java/branches/HPSJAVA-488/plugin/pom.xml Tue Jul 7 12:23:33 2015
@@ -7,7 +7,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/plugin/</url>
Modified: java/branches/HPSJAVA-488/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/pom.xml (original)
+++ java/branches/HPSJAVA-488/pom.xml Tue Jul 7 12:23:33 2015
@@ -10,7 +10,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>svn://svn.freehep.org/hps/java/trunk/</url>
Modified: java/branches/HPSJAVA-488/recon/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/recon/pom.xml (original)
+++ java/branches/HPSJAVA-488/recon/pom.xml Tue Jul 7 12:23:33 2015
@@ -8,7 +8,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/recon/</url>
Modified: java/branches/HPSJAVA-488/record-util/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/record-util/pom.xml (original)
+++ java/branches/HPSJAVA-488/record-util/pom.xml Tue Jul 7 12:23:33 2015
@@ -7,7 +7,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/record-util/</url>
Modified: java/branches/HPSJAVA-488/steering-files/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/steering-files/pom.xml (original)
+++ java/branches/HPSJAVA-488/steering-files/pom.xml Tue Jul 7 12:23:33 2015
@@ -8,7 +8,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/steering-files/</url>
Modified: java/branches/HPSJAVA-488/tracking/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/tracking/pom.xml (original)
+++ java/branches/HPSJAVA-488/tracking/pom.xml Tue Jul 7 12:23:33 2015
@@ -8,7 +8,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/tracking/</url>
Modified: java/branches/HPSJAVA-488/users/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/users/pom.xml (original)
+++ java/branches/HPSJAVA-488/users/pom.xml Tue Jul 7 12:23:33 2015
@@ -7,7 +7,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/users/</url>
Modified: java/branches/HPSJAVA-488/util/pom.xml
=============================================================================
--- java/branches/HPSJAVA-488/util/pom.xml (original)
+++ java/branches/HPSJAVA-488/util/pom.xml Tue Jul 7 12:23:33 2015
@@ -7,7 +7,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<scm>
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/util/</url>
|