From bf917b9e9f7ea1de9edeefff021cbb23c7d69ce5 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Mon, 26 Aug 2024 10:17:58 -0400 Subject: [PATCH 1/7] bump version --- common-tools/clara-io/pom.xml | 4 ++-- common-tools/clas-analysis/pom.xml | 20 ++++++++--------- common-tools/clas-detector/pom.xml | 10 ++++----- common-tools/clas-geometry/pom.xml | 4 ++-- common-tools/clas-io/pom.xml | 8 +++---- common-tools/clas-jcsg/pom.xml | 8 +++---- common-tools/clas-logging/pom.xml | 4 ++-- common-tools/clas-math/pom.xml | 4 ++-- common-tools/clas-physics/pom.xml | 4 ++-- common-tools/clas-reco/pom.xml | 16 +++++++------- common-tools/clas-tracking/pom.xml | 6 +++--- common-tools/clas-utils/pom.xml | 6 +++--- common-tools/cnuphys/magfield/pom.xml | 2 +- common-tools/cnuphys/swimmer/pom.xml | 2 +- common-tools/coat-lib/deployDistribution.sh | 2 +- common-tools/coat-lib/pom.xml | 24 ++++++++++----------- common-tools/parent/pom.xml | 2 +- common-tools/pom.xml | 4 ++-- common-tools/swim-tools/pom.xml | 6 +++--- parent/pom.xml | 2 +- pom.xml | 4 ++-- reconstruction/alert/pom.xml | 10 ++++----- reconstruction/band/pom.xml | 4 ++-- reconstruction/bg/pom.xml | 8 +++---- reconstruction/cnd/pom.xml | 2 +- reconstruction/cvt/pom.xml | 6 +++--- reconstruction/dc/pom.xml | 14 ++++++------ reconstruction/eb/pom.xml | 10 ++++----- reconstruction/ec/pom.xml | 6 +++--- reconstruction/fmt/pom.xml | 6 +++--- reconstruction/ft/pom.xml | 4 ++-- reconstruction/htcc/pom.xml | 4 ++-- reconstruction/ltcc/pom.xml | 4 ++-- reconstruction/mc/pom.xml | 4 ++-- reconstruction/mltn/pom.xml | 6 +++--- reconstruction/pom.xml | 4 ++-- reconstruction/postproc/pom.xml | 8 +++---- reconstruction/raster/pom.xml | 4 ++-- reconstruction/rich/pom.xml | 6 +++--- reconstruction/rtpc/pom.xml | 6 +++--- reconstruction/swaps/pom.xml | 8 +++---- reconstruction/tof/pom.xml | 4 ++-- reconstruction/urwell/pom.xml | 6 +++--- reconstruction/vtx/pom.xml | 6 +++--- 44 files changed, 141 insertions(+), 141 deletions(-) diff --git a/common-tools/clara-io/pom.xml b/common-tools/clara-io/pom.xml index 2dbc38aff..46749d240 100644 --- a/common-tools/clara-io/pom.xml +++ b/common-tools/clara-io/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clara-io - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/common-tools/clas-analysis/pom.xml b/common-tools/clas-analysis/pom.xml index d99afad8e..550b9be84 100644 --- a/common-tools/clas-analysis/pom.xml +++ b/common-tools/clas-analysis/pom.xml @@ -3,63 +3,63 @@ 4.0.0 org.jlab.clas clas-analysis - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-utils - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-physics - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-io - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-geometry - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-jcsg - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas swim-tools - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-detector - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/common-tools/clas-detector/pom.xml b/common-tools/clas-detector/pom.xml index a0bee6c64..20f607f30 100644 --- a/common-tools/clas-detector/pom.xml +++ b/common-tools/clas-detector/pom.xml @@ -3,21 +3,21 @@ 4.0.0 org.jlab.clas clas-detector - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-utils - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -29,13 +29,13 @@ org.jlab.clas clas-io - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-geometry - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/common-tools/clas-geometry/pom.xml b/common-tools/clas-geometry/pom.xml index 4633be055..7662ab84d 100644 --- a/common-tools/clas-geometry/pom.xml +++ b/common-tools/clas-geometry/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-geometry - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/common-tools/clas-io/pom.xml b/common-tools/clas-io/pom.xml index 5e35aca62..0d600e86f 100644 --- a/common-tools/clas-io/pom.xml +++ b/common-tools/clas-io/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-io - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -90,13 +90,13 @@ org.jlab.clas clas-utils - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-logging - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT compile diff --git a/common-tools/clas-jcsg/pom.xml b/common-tools/clas-jcsg/pom.xml index d587ed48b..24028d8d6 100644 --- a/common-tools/clas-jcsg/pom.xml +++ b/common-tools/clas-jcsg/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-jcsg - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -27,12 +27,12 @@ org.jlab.clas clas-geometry - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-detector - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT java3d diff --git a/common-tools/clas-logging/pom.xml b/common-tools/clas-logging/pom.xml index 704e52c6a..d42442205 100644 --- a/common-tools/clas-logging/pom.xml +++ b/common-tools/clas-logging/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-logging - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/common-tools/clas-math/pom.xml b/common-tools/clas-math/pom.xml index 52ddd4acd..766803d13 100644 --- a/common-tools/clas-math/pom.xml +++ b/common-tools/clas-math/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-math - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/common-tools/clas-physics/pom.xml b/common-tools/clas-physics/pom.xml index d5696db3f..e653d85b1 100644 --- a/common-tools/clas-physics/pom.xml +++ b/common-tools/clas-physics/pom.xml @@ -4,14 +4,14 @@ org.jlab.clas clas-physics - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/common-tools/clas-reco/pom.xml b/common-tools/clas-reco/pom.xml index 013a03d6f..df584d353 100644 --- a/common-tools/clas-reco/pom.xml +++ b/common-tools/clas-reco/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -42,37 +42,37 @@ org.jlab.clas clas-math - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-io - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-logging - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-physics - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-utils - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-detector - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/common-tools/clas-tracking/pom.xml b/common-tools/clas-tracking/pom.xml index 6f2ccd342..13c12cf7c 100644 --- a/common-tools/clas-tracking/pom.xml +++ b/common-tools/clas-tracking/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.jlab.clas clas-tracking - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -22,7 +22,7 @@ org.jlab.clas swim-tools - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar diff --git a/common-tools/clas-utils/pom.xml b/common-tools/clas-utils/pom.xml index a837399d8..4fd730d04 100644 --- a/common-tools/clas-utils/pom.xml +++ b/common-tools/clas-utils/pom.xml @@ -3,21 +3,21 @@ 4.0.0 org.jlab.clas clas-utils - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-logging - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.apache.commons diff --git a/common-tools/cnuphys/magfield/pom.xml b/common-tools/cnuphys/magfield/pom.xml index f49f034ca..61c8ddb80 100644 --- a/common-tools/cnuphys/magfield/pom.xml +++ b/common-tools/cnuphys/magfield/pom.xml @@ -23,7 +23,7 @@ org.jlab.clas clas-math - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/common-tools/cnuphys/swimmer/pom.xml b/common-tools/cnuphys/swimmer/pom.xml index 194cd949e..b3944a22f 100644 --- a/common-tools/cnuphys/swimmer/pom.xml +++ b/common-tools/cnuphys/swimmer/pom.xml @@ -35,7 +35,7 @@ org.jlab.clas clas-math - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/common-tools/coat-lib/deployDistribution.sh b/common-tools/coat-lib/deployDistribution.sh index 3e20865c6..1e56391c1 100755 --- a/common-tools/coat-lib/deployDistribution.sh +++ b/common-tools/coat-lib/deployDistribution.sh @@ -8,7 +8,7 @@ cd `dirname $0` # Script is exporting existing Jar files to repository #------------------------------------------------------------------------------------------------- -VERSION=11.0.1 +VERSION=11.0.2 mvn org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file \ -Dfile=target/coat-libs-${VERSION}-SNAPSHOT.jar \ diff --git a/common-tools/coat-lib/pom.xml b/common-tools/coat-lib/pom.xml index 6321a0ae2..0cbc71102 100644 --- a/common-tools/coat-lib/pom.xml +++ b/common-tools/coat-lib/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.jlab.clas coat-libs - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT pom @@ -94,67 +94,67 @@ org.jlab.clas clas-io - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clara-io - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-utils - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-jcsg - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-detector - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-analysis - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-geometry - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-physics - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas swim-tools - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-tracking - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/common-tools/parent/pom.xml b/common-tools/parent/pom.xml index 6db98ed08..912a00d86 100644 --- a/common-tools/parent/pom.xml +++ b/common-tools/parent/pom.xml @@ -3,7 +3,7 @@ org.jlab.clas common-tools - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT pom diff --git a/common-tools/pom.xml b/common-tools/pom.xml index 785bf5f42..e9d85c151 100644 --- a/common-tools/pom.xml +++ b/common-tools/pom.xml @@ -2,14 +2,14 @@ 4.0.0 org.jlab.clas common-tools - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT pom org.jlab.clas clas12rec ../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/common-tools/swim-tools/pom.xml b/common-tools/swim-tools/pom.xml index b0374374b..443fa1b4d 100644 --- a/common-tools/swim-tools/pom.xml +++ b/common-tools/swim-tools/pom.xml @@ -3,21 +3,21 @@ 4.0.0 org.jlab.clas swim-tools - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/parent/pom.xml b/parent/pom.xml index 2c721860b..f5273b1ab 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,7 +3,7 @@ org.jlab.clas clas12rec - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index 662f3062a..bde7c11cf 100644 --- a/pom.xml +++ b/pom.xml @@ -2,14 +2,14 @@ 4.0.0 org.jlab.clas clas12 - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT pom org.jlab.clas clas12rec parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/alert/pom.xml b/reconstruction/alert/pom.xml index 5c23a5d6f..6bea56299 100644 --- a/reconstruction/alert/pom.xml +++ b/reconstruction/alert/pom.xml @@ -13,31 +13,31 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-io - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT compile org.jlab.clas clas-tracking - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT compile org.jlab.clas clas-geometry - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT compile diff --git a/reconstruction/band/pom.xml b/reconstruction/band/pom.xml index 0165e2ed9..4a94eacc9 100644 --- a/reconstruction/band/pom.xml +++ b/reconstruction/band/pom.xml @@ -13,14 +13,14 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/bg/pom.xml b/reconstruction/bg/pom.xml index 94afa6d27..ab6945173 100644 --- a/reconstruction/bg/pom.xml +++ b/reconstruction/bg/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -21,19 +21,19 @@ org.jlab.clas clas-io - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-analysis - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/cnd/pom.xml b/reconstruction/cnd/pom.xml index ca1159b5d..327f9aea1 100644 --- a/reconstruction/cnd/pom.xml +++ b/reconstruction/cnd/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/cvt/pom.xml b/reconstruction/cvt/pom.xml index 10ab46789..e7841212d 100644 --- a/reconstruction/cvt/pom.xml +++ b/reconstruction/cvt/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-jcsg - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -47,7 +47,7 @@ org.jlab.clas clas-tracking - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/dc/pom.xml b/reconstruction/dc/pom.xml index 9e5561620..822c39cbf 100644 --- a/reconstruction/dc/pom.xml +++ b/reconstruction/dc/pom.xml @@ -14,7 +14,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -28,25 +28,25 @@ org.jlab.clas clas-tracking - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-jcsg - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-analysis - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -75,13 +75,13 @@ org.jlab.clas swim-tools - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-math - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/eb/pom.xml b/reconstruction/eb/pom.xml index 83bd36459..a1638f598 100644 --- a/reconstruction/eb/pom.xml +++ b/reconstruction/eb/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -21,25 +21,25 @@ org.jlab.clas clas-utils - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-io - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-analysis - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/ec/pom.xml b/reconstruction/ec/pom.xml index 2c3707516..19dd8cebc 100644 --- a/reconstruction/ec/pom.xml +++ b/reconstruction/ec/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -21,13 +21,13 @@ org.jlab.clas clas-detector - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-analysis - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/fmt/pom.xml b/reconstruction/fmt/pom.xml index e73a48210..38e7600c4 100644 --- a/reconstruction/fmt/pom.xml +++ b/reconstruction/fmt/pom.xml @@ -15,21 +15,21 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-jcsg - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar org.jlab.clas swim-tools - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/ft/pom.xml b/reconstruction/ft/pom.xml index 8884a4283..82221c8fb 100644 --- a/reconstruction/ft/pom.xml +++ b/reconstruction/ft/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/htcc/pom.xml b/reconstruction/htcc/pom.xml index 321dd21f5..c3a911c4b 100644 --- a/reconstruction/htcc/pom.xml +++ b/reconstruction/htcc/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/ltcc/pom.xml b/reconstruction/ltcc/pom.xml index 0762e8671..cd8720bfd 100644 --- a/reconstruction/ltcc/pom.xml +++ b/reconstruction/ltcc/pom.xml @@ -13,14 +13,14 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/mc/pom.xml b/reconstruction/mc/pom.xml index ee80e0253..f1268c258 100644 --- a/reconstruction/mc/pom.xml +++ b/reconstruction/mc/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/mltn/pom.xml b/reconstruction/mltn/pom.xml index 991f6ab21..56ec517cd 100644 --- a/reconstruction/mltn/pom.xml +++ b/reconstruction/mltn/pom.xml @@ -14,7 +14,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -34,13 +34,13 @@ org.jlab.clas clas-io - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/pom.xml b/reconstruction/pom.xml index 99053fa2f..a7565a73c 100644 --- a/reconstruction/pom.xml +++ b/reconstruction/pom.xml @@ -3,14 +3,14 @@ org.jlab.clas reconstruction - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT pom org.jlab.clas clas12rec ../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/postproc/pom.xml b/reconstruction/postproc/pom.xml index 27cc2a7af..e9ed05d22 100644 --- a/reconstruction/postproc/pom.xml +++ b/reconstruction/postproc/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -21,19 +21,19 @@ org.jlab.clas clas-io - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-analysis - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/raster/pom.xml b/reconstruction/raster/pom.xml index bb0568373..dd8f28f16 100644 --- a/reconstruction/raster/pom.xml +++ b/reconstruction/raster/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/rich/pom.xml b/reconstruction/rich/pom.xml index 93413b0b5..281efcd0c 100644 --- a/reconstruction/rich/pom.xml +++ b/reconstruction/rich/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -21,13 +21,13 @@ org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-jcsg - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/rtpc/pom.xml b/reconstruction/rtpc/pom.xml index b8e912237..eab03722e 100644 --- a/reconstruction/rtpc/pom.xml +++ b/reconstruction/rtpc/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -21,12 +21,12 @@ org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-tracking - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT compile diff --git a/reconstruction/swaps/pom.xml b/reconstruction/swaps/pom.xml index e72c64e6a..b04924b62 100644 --- a/reconstruction/swaps/pom.xml +++ b/reconstruction/swaps/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -21,19 +21,19 @@ org.jlab.clas clas-detector - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-io - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-reco - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/tof/pom.xml b/reconstruction/tof/pom.xml index 6ca28c96a..5de807863 100644 --- a/reconstruction/tof/pom.xml +++ b/reconstruction/tof/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -21,7 +21,7 @@ org.jlab.clas clas-jcsg - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/urwell/pom.xml b/reconstruction/urwell/pom.xml index e9cc63c63..f35f4b0d3 100644 --- a/reconstruction/urwell/pom.xml +++ b/reconstruction/urwell/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -21,13 +21,13 @@ org.jlab.clas clas-detector - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT org.jlab.clas clas-analysis - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT diff --git a/reconstruction/vtx/pom.xml b/reconstruction/vtx/pom.xml index bfa4dab29..4d16f416c 100644 --- a/reconstruction/vtx/pom.xml +++ b/reconstruction/vtx/pom.xml @@ -13,7 +13,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT @@ -33,13 +33,13 @@ org.jlab.clas swim-tools - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar org.jlab.clas clas-tracking - 11.0.1-SNAPSHOT + 11.0.2-SNAPSHOT jar From 47c77eb0889ca76ba19a85e561272fc66a51a9d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 07:11:02 +0000 Subject: [PATCH 2/7] build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.8.0 to 3.10.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.8.0...maven-javadoc-plugin-3.10.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index f5273b1ab..f99a88530 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -71,7 +71,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 + 3.10.0 coatjavadocs coatjavadocs From 29dfdfe7bfca2590995632f9c005cb94fdd648a0 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Wed, 28 Aug 2024 16:43:17 -0400 Subject: [PATCH 3/7] fix: remove `hipo-add` Resolves #323 --- bin/hipo-add | 8 -------- 1 file changed, 8 deletions(-) delete mode 100755 bin/hipo-add diff --git a/bin/hipo-add b/bin/hipo-add deleted file mode 100755 index 3b234699b..000000000 --- a/bin/hipo-add +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -. `dirname $0`/../libexec/env.sh - -java -Xms1024m \ - -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \ - org.jlab.groot.data.TDirectory \ - $* From ec9467362ab5940872f4c3c38ea3763e8ea0eec5 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Wed, 28 Aug 2024 17:03:05 -0400 Subject: [PATCH 4/7] new file: bin/hipo-merge-histograms --- bin/hipo-merge-histograms | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 bin/hipo-merge-histograms diff --git a/bin/hipo-merge-histograms b/bin/hipo-merge-histograms new file mode 100755 index 000000000..cf8b3b6cd --- /dev/null +++ b/bin/hipo-merge-histograms @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +. `dirname $0`/../libexec/env.sh +cmd="java -Xms1024m -cp $CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/* org.jlab.groot.data.TDirectory" + +if [ $# -eq 0 ]; then + echo """ + hipo-merge-histograms + - merge histogram HIPO files + - to merge HIPO data files, use 'hipo-utils -merge' instead""" + $cmd | sed 's;\;hipo-merge-histograms;g' + exit 2 +fi + +$cmd $* From 1c0eea7ce7566c04bd1e715c2003c62d297b20c2 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Thu, 29 Aug 2024 10:10:29 -0400 Subject: [PATCH 5/7] fix: allow `run-groovy` users to set `JAVA_OPTS` `libexec/env.sh` hard codes a value of `$JAVA_OPTS` for groovy calls, (via `run-groovy`) making it impossible for `run-groovy` users to change any Java options, e.g., heap size limits. This PR allows users to override `env.sh`'s settings by appending user-level `JAVA_OPTS`. --- libexec/env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/env.sh b/libexec/env.sh index a0c8a0c69..c1825694b 100644 --- a/libexec/env.sh +++ b/libexec/env.sh @@ -30,7 +30,7 @@ if [ $# -ge 1 ]; then # additional variables and settings for groovy if [ "$1" = "groovy" ]; then JYPATH="${JYPATH:+${JYPATH}:}${CLAS12DIR}/lib/packages" - export JAVA_OPTS="-Dsun.java2d.pmoffscreen=false -Djava.util.logging.config.file=$CLAS12DIR/etc/logging/debug.properties -Xms1024m -Xmx2048m -XX:+UseSerialGC" + export JAVA_OPTS="-Dsun.java2d.pmoffscreen=false -Djava.util.logging.config.file=$CLAS12DIR/etc/logging/debug.properties -Xms1024m -Xmx2048m -XX:+UseSerialGC ${JAVA_OPTS-}" fi export JYPATH From 6ee14a66440e1d1c4b8ff90cbc0c8057f5307224 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 5 Sep 2024 16:17:31 -0400 Subject: [PATCH 6/7] new wildcard feature from Gagik (#321) --- .../org/jlab/io/clara/HipoToHipoWriter.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/common-tools/clara-io/src/main/java/org/jlab/io/clara/HipoToHipoWriter.java b/common-tools/clara-io/src/main/java/org/jlab/io/clara/HipoToHipoWriter.java index 550d8e108..69d45b605 100644 --- a/common-tools/clara-io/src/main/java/org/jlab/io/clara/HipoToHipoWriter.java +++ b/common-tools/clara-io/src/main/java/org/jlab/io/clara/HipoToHipoWriter.java @@ -11,6 +11,7 @@ import org.jlab.clara.std.services.EventWriterException; import org.jlab.jnp.hipo4.data.Bank; import org.jlab.jnp.hipo4.data.Event; +import org.jlab.jnp.hipo4.data.SchemaFactory; import org.jlab.jnp.hipo4.io.HipoWriter; import org.jlab.jnp.hipo4.io.HipoWriterSorted; import org.jlab.jnp.utils.file.FileUtils; @@ -25,6 +26,8 @@ public class HipoToHipoWriter extends AbstractEventWriterService schemaBankList = new ArrayList(); private final StringSubstitutor envSubstitutor = new StringSubstitutor(System.getenv()); @@ -56,9 +59,19 @@ private void configure(HipoWriterSorted writer, JSONObject opts) { schemaDir = envSubstitutor.replace(schemaDir); System.out.printf("%s service: schema directory = %s%n", getName(), schemaDir); } - writer.getSchemaFactory().initFromDirectory(schemaDir); - if (opts.has(CONF_SCHEMA_DIR)) { + SchemaFactory factory = new SchemaFactory(); + factory.initFromDirectory(schemaDir); + + if(opts.has(CONF_SCHEMA_WILDCARD)==true){ + String wildcard = opts.getString("wildcard"); + SchemaFactory f2 = factory.reduce(wildcard); + writer.getSchemaFactory().copy(f2); + } else { + writer.getSchemaFactory().copy(factory); + } + + if (opts.has(CONF_SCHEMA_DIR)==true||opts.has(CONF_SCHEMA_WILDCARD)==true) { boolean useFilter = opts.optBoolean(CONF_SCHEMA_FILTER, true); System.out.printf("%s service: schema filter = %b%n", getName(), useFilter); if(useFilter==true){ @@ -69,6 +82,10 @@ private void configure(HipoWriterSorted writer, JSONObject opts) { } } } + + System.out.printf("SERVICE WRITER :: [filter] %s\n",opts.has(HipoToHipoWriter.CONF_SCHEMA_FILTER)); + System.out.printf("SERVICE WRITER :: [dir] %s\n",opts.has(HipoToHipoWriter.CONF_SCHEMA_DIR)); + System.out.printf("SERVICE WRITER :: [wildcard] %s\n",opts.has(HipoToHipoWriter.CONF_SCHEMA_WILDCARD)); } private Method getSchemaFilterSetter() throws NoSuchMethodException, SecurityException { From 9a562615c5ff8ddd74c23a0321fa30c50a0b817a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 07:34:53 +0000 Subject: [PATCH 7/7] build(deps): bump com.github.spotbugs:spotbugs-maven-plugin Bumps [com.github.spotbugs:spotbugs-maven-plugin](https://github.com/spotbugs/spotbugs-maven-plugin) from 4.8.6.2 to 4.8.6.3. - [Release notes](https://github.com/spotbugs/spotbugs-maven-plugin/releases) - [Commits](https://github.com/spotbugs/spotbugs-maven-plugin/compare/spotbugs-maven-plugin-4.8.6.2...spotbugs-maven-plugin-4.8.6.3) --- updated-dependencies: - dependency-name: com.github.spotbugs:spotbugs-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- common-tools/cnuphys/parent/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common-tools/cnuphys/parent/pom.xml b/common-tools/cnuphys/parent/pom.xml index 0590ce905..2c3928e4b 100644 --- a/common-tools/cnuphys/parent/pom.xml +++ b/common-tools/cnuphys/parent/pom.xml @@ -38,7 +38,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.6.2 + 4.8.6.3 spotbugs-exclude.xml diff --git a/parent/pom.xml b/parent/pom.xml index f99a88530..812cc1d04 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -62,7 +62,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.6.2 + 4.8.6.3 spotbugs-exclude.xml