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

Commit

Permalink
Merge pull request #566 from JeffersonLab/versionUpdate
Browse files Browse the repository at this point in the history 
BG merging: fixed tool usage printouts, Version bump
  • Loading branch information
@raffaelladevita
raffaelladevita authored Aug 14, 2020
2 parents 9c48624 + dd5abfe commit 62e7446
Show file tree
Hide file tree
Showing 36 changed files with 113 additions and 113 deletions.
14 changes: 7 additions & 7 deletions common-tools/clas-analysis/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-analysis</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</parent>

<build>
Expand All @@ -30,31 +30,31 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion common-tools/clas-analysis/src/main/java/org/jlab/analysis/eventmerger/EventMerger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public EventMerger() {

public static void main(String[] args) {

OptionParser parser = new OptionParser("bgMerger");
OptionParser parser = new OptionParser("bg-merger");
parser.addRequired("-o" ,"merged file");
parser.addRequired("-i" ,"input data file");
parser.addRequired("-b" ,"background file");
Expand Down
2 changes: 1 addition & 1 deletion ...-tools/clas-analysis/src/main/java/org/jlab/analysis/eventmerger/RandomTriggerFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public Bank createFilterBank(HipoWriterSorted writer, JsonObject json){

public static void main(String[] args){

OptionParser parser = new OptionParser("triggerBitFilter");
OptionParser parser = new OptionParser("trigger-filter");
parser.addRequired("-o" ,"output file");
parser.addRequired("-b" ,"trigger bit (0-63)");
parser.setRequiresInputList(false);
Expand Down
2 changes: 1 addition & 1 deletion ...n-tools/clas-analysis/src/main/java/org/jlab/analysis/eventmerger/RandomTriggerSplit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ private HipoWriterSorted openOutputFile(String outputfile){

public static void main(String[] args){

OptionParser parser = new OptionParser("fileSplitter");
OptionParser parser = new OptionParser("trigger-splitter");
parser.addOption("-o" ,"", "output file prefix");
parser.addOption("-n" ,"-1", "maximum number of events to process");
parser.addOption("-s" ,"-1", "number of events per output file");
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,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</parent>

<build>
Expand All @@ -30,7 +30,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<dependency>
Expand All @@ -42,13 +42,13 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<dependency>
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>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</parent>

<build>
Expand Down
6 changes: 3 additions & 3 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>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</parent>

<build>
Expand Down Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>
</dependencies>

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>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</parent>

<build>
Expand Down Expand Up @@ -40,12 +40,12 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>java3d</groupId>
Expand Down
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>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</parent>

<build>
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,7 +4,7 @@

<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
<plugins>
Expand All @@ -23,7 +23,7 @@
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</parent>

</project>
14 changes: 7 additions & 7 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>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</parent>

<build>
Expand Down Expand Up @@ -67,7 +67,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-math</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>
<!--
<dependency>
Expand All @@ -80,25 +80,25 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-physics</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-utils</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<!--
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>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas</groupId>
<artifactId>clas12rec</artifactId>
<relativePath>../../parent/pom.xml</relativePath>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</parent>

<build>
Expand Down
8 changes: 4 additions & 4 deletions common-tools/cnuphys/ced/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,25 +69,25 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clasrec-main</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-geometry</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>

<dependency>
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>6b.5.9-SNAPSHOT</version>
<version>6.5.9-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 @@ -28,7 +28,7 @@
<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-math</artifactId>
<version>6b.5.9-SNAPSHOT</version>
<version>6.5.9-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion common-tools/coat-lib/deployDistribution.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd `dirname $0`
# Script is exporting existing Jar files to repository
#-------------------------------------------------------------------------------------------------

VERSION=6b.5.9
VERSION=6.5.9

mvn org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file \
-Dfile=target/coat-libs-${VERSION}-SNAPSHOT.jar \
Expand Down
Loading

0 comments on commit 62e7446

Please sign in to comment.