Skip to content
This repository has been archived by the owner on May 18, 2023. It is now read-only.

Commit

Permalink
Merge branch 'development' into iss642-fttrkDev
Browse files Browse the repository at this point in the history
  • Loading branch information
@baltzell
baltzell authored Jun 10, 2022
2 parents 7d233f1 + 4104769 commit b31f124
Show file tree
Hide file tree
Showing 41 changed files with 124 additions and 124 deletions.
4 changes: 2 additions & 2 deletions common-tools/clara-io/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clara-io</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
20 changes: 10 additions & 10 deletions common-tools/clas-analysis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,63 +3,63 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-analysis</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-jcsg</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>swim-tools</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-reco</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
10 changes: 5 additions & 5 deletions common-tools/clas-detector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</parent>

<dependencies>
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

<dependency>
Expand All @@ -29,13 +29,13 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public final void initDecoder(){
tablesTrans = Arrays.asList(new String[]{
"/daq/tt/ftcal","/daq/tt/fthodo","/daq/tt/fttrk","/daq/tt/ltcc",
"/daq/tt/ec","/daq/tt/ftof","/daq/tt/htcc","/daq/tt/dc","/daq/tt/ctof","/daq/tt/cnd","/daq/tt/svt",
"/daq/tt/rf","/daq/tt/bmt","/daq/tt/fmt","/daq/tt/rich","/daq/tt/hel","/daq/tt/band","/daq/tt/rtpc",
"/daq/tt/rf","/daq/tt/bmt","/daq/tt/fmt","/daq/tt/rich2","/daq/tt/hel","/daq/tt/band","/daq/tt/rtpc",
"/daq/tt/raster"
});

Expand Down
4 changes: 2 additions & 2 deletions common-tools/clas-geometry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
8 changes: 4 additions & 4 deletions common-tools/clas-io/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down Expand Up @@ -87,13 +87,13 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-logging</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>

Expand Down
8 changes: 4 additions & 4 deletions common-tools/clas-jcsg/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-jcsg</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand All @@ -27,12 +27,12 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>java3d</groupId>
Expand Down
4 changes: 2 additions & 2 deletions common-tools/clas-logging/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-logging</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</parent>

</project>
4 changes: 2 additions & 2 deletions common-tools/clas-math/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-math</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions common-tools/clas-physics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</parent>

</project>
16 changes: 8 additions & 8 deletions common-tools/clas-reco/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-reco</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down Expand Up @@ -42,37 +42,37 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-math</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-logging</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions common-tools/clas-tracking/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-tracking</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>swim-tools</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions common-tools/clas-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion common-tools/cnuphys/magfield/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-math</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion common-tools/cnuphys/swimmer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-math</artifactId>
<version>8.0.0-SNAPSHOT</version>
<version>8.1.0-SNAPSHOT</version>
</dependency>

</dependencies>
Expand Down
Loading

0 comments on commit b31f124

Please sign in to comment.