From a3e33a34c2c5ebcc7add5127f5ccd50aed24d1b6 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Fri, 28 Mar 2025 10:26:54 -0400 Subject: [PATCH 01/26] modified: maven-settings.xml --- maven-settings.xml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/maven-settings.xml b/maven-settings.xml index 3899e896c3..ee04e5a7c9 100644 --- a/maven-settings.xml +++ b/maven-settings.xml @@ -1,11 +1,22 @@ - + + + + + release + + 12.0.0-SNAPSHOT + + + + + new-freehep From 1c20331612028e7ebd039a8d5b08a4fa9afce7a6 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Fri, 28 Mar 2025 10:39:58 -0400 Subject: [PATCH 02/26] modified: maven-settings.xml --- maven-settings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maven-settings.xml b/maven-settings.xml index ee04e5a7c9..aebdd8ac8b 100644 --- a/maven-settings.xml +++ b/maven-settings.xml @@ -3,6 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 http://maven.apache.org/xsd/settings-1.2.0.xsd"> + Building documentation ...." - javadoc -d javadoc/clas-io -sourcepath clas-io/src/main/java/ -subpackages org - javadoc -d javadoc/clas-geometry -sourcepath clas-geometry/src/main/java/ -subpackages org - javadoc -d javadoc/clas-io -sourcepath clas-io/src/main/java/ -subpackages org - javadoc -d javadoc/clas-physics -sourcepath clas-physics/src/main/java/ -subpackages org - javadoc -d javadoc/clas-detector -sourcepath clas-detector/src/main/java/ -subpackages org - javadoc -d javadoc/clas-utils -sourcepath clas-utils/src/main/java/ -subpackages org - #scp -r javadoc clas12@ifarm65:/group/clas/www/clasweb/html/clas12offline/docs/. -fi - -#================================================================= -# Finishing touches -echo "" -echo "--> Done building....." -echo "" -echo " \t Usage : build.sh -d -m" -echo "" - - From 72fc9a2a0f285cc2886b0442c6d0df36d3a88f32 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Fri, 28 Mar 2025 11:48:20 -0400 Subject: [PATCH 07/26] build!: combine `common-tools/coat-lib` POM with `common-tools` POM --- build-coatjava.sh | 6 --- bumpo.sh | 4 -- common-tools/coat-lib/pom.xml | 89 +++++------------------------------ common-tools/pom.xml | 5 +- 4 files changed, 14 insertions(+), 90 deletions(-) diff --git a/build-coatjava.sh b/build-coatjava.sh index 766bd88f78..e76ac62bcd 100755 --- a/build-coatjava.sh +++ b/build-coatjava.sh @@ -119,12 +119,6 @@ if [ $runSpotBugs == "yes" ]; then if [ $? != 0 ] ; then echo "spotbugs failure" ; exit 1 ; fi fi -#FIXME: can `./pom.xml` and `common-tools/coat-lib/pom.xml` be combined? see also `version-bump.sh` -cd common-tools/coat-lib -$mvn package -if [ $? != 0 ] ; then echo "mvn package failure" ; exit 1 ; fi -cd - - cp common-tools/coat-lib/target/coat-libs-*-SNAPSHOT.jar coatjava/lib/clas/ cp reconstruction/*/target/clas12detector-*-SNAPSHOT*.jar coatjava/lib/services/ diff --git a/bumpo.sh b/bumpo.sh index 2bbb4f3e3c..101be8ba09 100755 --- a/bumpo.sh +++ b/bumpo.sh @@ -7,9 +7,5 @@ ver_num=$(echo $1|sed 's/-SNAPSHOT//g') ver_pom=$ver_num-SNAPSHOT mvn --batch-mode release:update-versions -DdevelopmentVersion=$ver_pom -#FIXME: can `./pom.xml` and `common-tools/coat-lib/pom.xml` be combined? see also `build-coatjava.sh` -cd common-tools/coat-lib -mvn --batch-mode release:update-versions -DdevelopmentVersion=$ver_pom -cd - sed -i "s/^VERSION=.*/VERSION=$ver_num/g" common-tools/coat-lib/deployDistribution.sh diff --git a/common-tools/coat-lib/pom.xml b/common-tools/coat-lib/pom.xml index aa9ae7cadc..912c86445f 100644 --- a/common-tools/coat-lib/pom.xml +++ b/common-tools/coat-lib/pom.xml @@ -6,20 +6,19 @@ 12.0.0-SNAPSHOT pom + + org.jlab.clas + clas12rec + ../../parent/pom.xml + 12.0.0-SNAPSHOT + + - local-build - https://clasweb.jlab.org/clas12maven + freehep-repo-public + https://clasweb.jlab.org/clas12maven/ + - - jnp-build - https://clasweb.jlab.org/jhep/maven - - - freehep-repo-public - https://clasweb.jlab.org/clas12maven/ - - @@ -72,7 +71,7 @@ j4ml-clas12 0.9-SNAPSHOT - + org.jama jamapack @@ -91,72 +90,6 @@ 1.0 - - org.jlab.clas - clas-io - 12.0.0-SNAPSHOT - - - - org.jlab.clas - clara-io - 12.0.0-SNAPSHOT - - - - org.jlab.clas - clas-reco - 12.0.0-SNAPSHOT - - - - org.jlab.clas - clas-utils - 12.0.0-SNAPSHOT - - - - org.jlab.clas - clas-jcsg - 12.0.0-SNAPSHOT - - - - org.jlab.clas - clas-detector - 12.0.0-SNAPSHOT - - - - org.jlab.clas - clas-analysis - 12.0.0-SNAPSHOT - - - - org.jlab.clas - clas-geometry - 12.0.0-SNAPSHOT - - - - org.jlab.clas - clas-physics - 12.0.0-SNAPSHOT - - - - org.jlab.clas - swim-tools - 12.0.0-SNAPSHOT - - - - org.jlab.clas - clas-tracking - 12.0.0-SNAPSHOT - - org.freehep jminuit diff --git a/common-tools/pom.xml b/common-tools/pom.xml index 5cac22d24d..180548402e 100644 --- a/common-tools/pom.xml +++ b/common-tools/pom.xml @@ -21,12 +21,13 @@ clas-jcsg clas-detector cnuphys - clas-reco + clas-reco swim-tools - clas-analysis + clas-analysis clas-math clara-io clas-tracking + coat-lib From a4d3a9dbe4eddb785e768df748423c6b2c3c4339 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Fri, 28 Mar 2025 11:49:21 -0400 Subject: [PATCH 08/26] fix: replace `version-bump.sh` --- bumpo.sh | 11 ----------- version-bump.sh | 23 +++++++---------------- 2 files changed, 7 insertions(+), 27 deletions(-) delete mode 100755 bumpo.sh diff --git a/bumpo.sh b/bumpo.sh deleted file mode 100755 index 101be8ba09..0000000000 --- a/bumpo.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -[ $# -ne 1 ] && echo "USAGE: $0 [NEW_VERSION_NUMBER]" && exit 2 - -ver_num=$(echo $1|sed 's/-SNAPSHOT//g') -ver_pom=$ver_num-SNAPSHOT - -mvn --batch-mode release:update-versions -DdevelopmentVersion=$ver_pom - -sed -i "s/^VERSION=.*/VERSION=$ver_num/g" common-tools/coat-lib/deployDistribution.sh diff --git a/version-bump.sh b/version-bump.sh index 186fb703f5..101be8ba09 100755 --- a/version-bump.sh +++ b/version-bump.sh @@ -1,20 +1,11 @@ -#!/bin/bash +#!/usr/bin/env bash +set -euo pipefail -if [ -z $2 ] -then - echo Usage: bump-version.sh oldversion newversion - exit -fi +[ $# -ne 1 ] && echo "USAGE: $0 [NEW_VERSION_NUMBER]" && exit 2 -old=$1 -new=$2 - -if [[ "$OSTYPE" == "darwin"* ]]; then - find . -type f -name pom.xml -exec sed -i '' -e "s/$old-SNAPSHOT/$new-SNAPSHOT/" "{}" \; - find . -type f -name deployDistribution.sh -exec sed -i '' -e "s/$old/$new/" "{}" \; -else - find . -type f -name pom.xml -exec sed -i -e "s/$old-SNAPSHOT/$new-SNAPSHOT/" "{}" \; - find . -type f -name deployDistribution.sh -exec sed -i -e "s/$old/$new/" "{}" \; -fi +ver_num=$(echo $1|sed 's/-SNAPSHOT//g') +ver_pom=$ver_num-SNAPSHOT +mvn --batch-mode release:update-versions -DdevelopmentVersion=$ver_pom +sed -i "s/^VERSION=.*/VERSION=$ver_num/g" common-tools/coat-lib/deployDistribution.sh From 1850902355239210067b4e322008b20b7b04bd4b Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Fri, 28 Mar 2025 11:51:10 -0400 Subject: [PATCH 09/26] fix: revert maven-settings.xml --- maven-settings.xml | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/maven-settings.xml b/maven-settings.xml index aebdd8ac8b..3899e896c3 100644 --- a/maven-settings.xml +++ b/maven-settings.xml @@ -1,24 +1,11 @@ + - - - - - new-freehep From c6ad125b00e0fc4b4e505bc7d1693989a35a136a Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Fri, 28 Mar 2025 11:53:21 -0400 Subject: [PATCH 10/26] build: all POMs should be at 12.0.0 --- common-tools/clas-reco/pom.xml | 6 +++--- common-tools/cnuphys/magfield/pom.xml | 2 +- common-tools/cnuphys/pom.xml | 2 +- common-tools/cnuphys/snr/pom.xml | 2 +- common-tools/cnuphys/splot/pom.xml | 2 +- common-tools/cnuphys/swimmer/pom.xml | 6 +++--- reconstruction/alert/pom.xml | 6 ++---- reconstruction/band/pom.xml | 6 ++---- reconstruction/bg/pom.xml | 6 ++---- reconstruction/cnd/pom.xml | 8 +++----- reconstruction/cvt/pom.xml | 10 ++++------ reconstruction/dc/pom.xml | 14 ++++++-------- reconstruction/eb/pom.xml | 16 +++++++--------- reconstruction/ec/pom.xml | 6 ++---- reconstruction/fmt/pom.xml | 6 ++---- reconstruction/ft/pom.xml | 6 ++---- reconstruction/htcc/pom.xml | 6 ++---- reconstruction/ltcc/pom.xml | 6 ++---- reconstruction/mc/pom.xml | 6 ++---- reconstruction/mltn/pom.xml | 6 ++---- reconstruction/postproc/pom.xml | 6 ++---- reconstruction/raster/pom.xml | 6 ++---- reconstruction/rich/pom.xml | 6 ++---- reconstruction/rtpc/pom.xml | 6 ++---- reconstruction/swaps/pom.xml | 6 ++---- reconstruction/tof/pom.xml | 8 +++----- reconstruction/urwell/pom.xml | 6 ++---- reconstruction/vtx/pom.xml | 6 ++---- 28 files changed, 67 insertions(+), 111 deletions(-) diff --git a/common-tools/clas-reco/pom.xml b/common-tools/clas-reco/pom.xml index b9980570f3..5c097e84ef 100644 --- a/common-tools/clas-reco/pom.xml +++ b/common-tools/clas-reco/pom.xml @@ -24,19 +24,19 @@ cnuphys magfield - 2.0-SNAPSHOT + 12.0.0-SNAPSHOT cnuphys swimmer - 2.0-SNAPSHOT + 12.0.0-SNAPSHOT cnuphys snr - 2.0-SNAPSHOT + 12.0.0-SNAPSHOT diff --git a/common-tools/cnuphys/magfield/pom.xml b/common-tools/cnuphys/magfield/pom.xml index b666ba7272..da29c3830e 100644 --- a/common-tools/cnuphys/magfield/pom.xml +++ b/common-tools/cnuphys/magfield/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cnuphys magfield - 2.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/common-tools/cnuphys/pom.xml b/common-tools/cnuphys/pom.xml index 4266839e60..c89fc106bd 100644 --- a/common-tools/cnuphys/pom.xml +++ b/common-tools/cnuphys/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cnuphys clas12 - 2.0-SNAPSHOT + 12.0.0-SNAPSHOT pom cnuphys diff --git a/common-tools/cnuphys/snr/pom.xml b/common-tools/cnuphys/snr/pom.xml index 1271408026..83126caed6 100644 --- a/common-tools/cnuphys/snr/pom.xml +++ b/common-tools/cnuphys/snr/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cnuphys snr - 2.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/common-tools/cnuphys/splot/pom.xml b/common-tools/cnuphys/splot/pom.xml index 6e9e00cbd6..3796fc6aa0 100644 --- a/common-tools/cnuphys/splot/pom.xml +++ b/common-tools/cnuphys/splot/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cnuphys splot - 2.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/common-tools/cnuphys/swimmer/pom.xml b/common-tools/cnuphys/swimmer/pom.xml index de6f825263..b5ad32a50e 100644 --- a/common-tools/cnuphys/swimmer/pom.xml +++ b/common-tools/cnuphys/swimmer/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cnuphys swimmer - 2.0-SNAPSHOT + 12.0.0-SNAPSHOT jar @@ -17,13 +17,13 @@ cnuphys magfield - 2.0-SNAPSHOT + 12.0.0-SNAPSHOT cnuphys splot - 2.0-SNAPSHOT + 12.0.0-SNAPSHOT diff --git a/reconstruction/alert/pom.xml b/reconstruction/alert/pom.xml index b8c8017381..ffc2359c37 100644 --- a/reconstruction/alert/pom.xml +++ b/reconstruction/alert/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-alert - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/band/pom.xml b/reconstruction/band/pom.xml index 6956d88842..01b287a1d1 100644 --- a/reconstruction/band/pom.xml +++ b/reconstruction/band/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-band - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/bg/pom.xml b/reconstruction/bg/pom.xml index f681c5f4d0..1e9d6aa629 100644 --- a/reconstruction/bg/pom.xml +++ b/reconstruction/bg/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-bg - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/cnd/pom.xml b/reconstruction/cnd/pom.xml index 47d1910ba0..c18b6596be 100644 --- a/reconstruction/cnd/pom.xml +++ b/reconstruction/cnd/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-cnd - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar @@ -20,7 +18,7 @@ org.jlab.clas12.detector clas12detector-cvt - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT diff --git a/reconstruction/cvt/pom.xml b/reconstruction/cvt/pom.xml index 2dba1ea565..eff307bee9 100644 --- a/reconstruction/cvt/pom.xml +++ b/reconstruction/cvt/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-cvt - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar @@ -27,7 +25,7 @@ org.jlab.clas12.detector clas12detector-eb - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT test jar @@ -35,7 +33,7 @@ cnuphys swimmer - 2.0-SNAPSHOT + 12.0.0-SNAPSHOT diff --git a/reconstruction/dc/pom.xml b/reconstruction/dc/pom.xml index c95cf8ca4e..87317cd57d 100644 --- a/reconstruction/dc/pom.xml +++ b/reconstruction/dc/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-dc - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar @@ -22,7 +20,7 @@ org.jlab.clas12.detector clas12detector-urwell - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT @@ -52,19 +50,19 @@ cnuphys swimmer - 2.0-SNAPSHOT + 12.0.0-SNAPSHOT cnuphys snr - 2.0-SNAPSHOT + 12.0.0-SNAPSHOT cnuphys splot - 2.0-SNAPSHOT + 12.0.0-SNAPSHOT diff --git a/reconstruction/eb/pom.xml b/reconstruction/eb/pom.xml index 8547bcd164..4b9f4943ae 100644 --- a/reconstruction/eb/pom.xml +++ b/reconstruction/eb/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-eb - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar @@ -45,31 +43,31 @@ org.jlab.clas12.detector clas12detector-dc - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT org.jlab.clas12.detector clas12detector-ec - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT org.jlab.clas12.detector clas12detector-tof - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT org.jlab.clas12.detector clas12detector-htcc - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT org.jlab.clas12.detector clas12detector-ltcc - 1.1-SNAPSHOT + 12.0.0-SNAPSHOT diff --git a/reconstruction/ec/pom.xml b/reconstruction/ec/pom.xml index ecfa557382..e235e1f8ec 100644 --- a/reconstruction/ec/pom.xml +++ b/reconstruction/ec/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-ec - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/fmt/pom.xml b/reconstruction/fmt/pom.xml index f10cf89b1b..c93a08bed5 100644 --- a/reconstruction/fmt/pom.xml +++ b/reconstruction/fmt/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 clas12detector-fmt org.jlab.clas12.detector clas12detector-fmt - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/ft/pom.xml b/reconstruction/ft/pom.xml index b14f8a3c1f..45fc00fc4f 100644 --- a/reconstruction/ft/pom.xml +++ b/reconstruction/ft/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-ft - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/htcc/pom.xml b/reconstruction/htcc/pom.xml index d8dcaf4b4b..49fa81c27b 100644 --- a/reconstruction/htcc/pom.xml +++ b/reconstruction/htcc/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-htcc - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/ltcc/pom.xml b/reconstruction/ltcc/pom.xml index 28103f0261..20043d0016 100644 --- a/reconstruction/ltcc/pom.xml +++ b/reconstruction/ltcc/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-ltcc - 1.1-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/mc/pom.xml b/reconstruction/mc/pom.xml index 0672b27e3e..3c1d32cdf7 100644 --- a/reconstruction/mc/pom.xml +++ b/reconstruction/mc/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-mc - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/mltn/pom.xml b/reconstruction/mltn/pom.xml index a20898e6a3..d932d2ceba 100644 --- a/reconstruction/mltn/pom.xml +++ b/reconstruction/mltn/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-mltn - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/postproc/pom.xml b/reconstruction/postproc/pom.xml index 523ca3640f..dc2a8d2c88 100644 --- a/reconstruction/postproc/pom.xml +++ b/reconstruction/postproc/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-postproc - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/raster/pom.xml b/reconstruction/raster/pom.xml index 3e0f0c4139..5cb714e429 100644 --- a/reconstruction/raster/pom.xml +++ b/reconstruction/raster/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-raster - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/rich/pom.xml b/reconstruction/rich/pom.xml index aa5fee8843..2e55fa998a 100644 --- a/reconstruction/rich/pom.xml +++ b/reconstruction/rich/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-rich - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/rtpc/pom.xml b/reconstruction/rtpc/pom.xml index c2dafb0291..44cd812eae 100644 --- a/reconstruction/rtpc/pom.xml +++ b/reconstruction/rtpc/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-rtpc - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/swaps/pom.xml b/reconstruction/swaps/pom.xml index 8300485ceb..40decbde11 100644 --- a/reconstruction/swaps/pom.xml +++ b/reconstruction/swaps/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-swaps - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/tof/pom.xml b/reconstruction/tof/pom.xml index 23d3e269ec..5f63ccd7ed 100644 --- a/reconstruction/tof/pom.xml +++ b/reconstruction/tof/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-tof - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar @@ -27,7 +25,7 @@ org.jlab.clas12.detector clas12detector-dc - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT diff --git a/reconstruction/urwell/pom.xml b/reconstruction/urwell/pom.xml index 650a8b4f37..597aac23ea 100644 --- a/reconstruction/urwell/pom.xml +++ b/reconstruction/urwell/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-urwell - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar diff --git a/reconstruction/vtx/pom.xml b/reconstruction/vtx/pom.xml index e9834febd5..c6763cb558 100644 --- a/reconstruction/vtx/pom.xml +++ b/reconstruction/vtx/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.jlab.clas12.detector clas12detector-vtx - 1.0-SNAPSHOT + 12.0.0-SNAPSHOT jar From 44448f5e26e1020edd9edb7cab2156275a4eab34 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Fri, 28 Mar 2025 12:35:47 -0400 Subject: [PATCH 11/26] feat: `version-bump` makes a new git branch and commits --- version-bump.sh | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/version-bump.sh b/version-bump.sh index 101be8ba09..e2f2d71736 100755 --- a/version-bump.sh +++ b/version-bump.sh @@ -1,11 +1,49 @@ #!/usr/bin/env bash set -euo pipefail -[ $# -ne 1 ] && echo "USAGE: $0 [NEW_VERSION_NUMBER]" && exit 2 +main_branch=development -ver_num=$(echo $1|sed 's/-SNAPSHOT//g') -ver_pom=$ver_num-SNAPSHOT +if [ $# -ne 1 ]; then + echo """USAGE: $0 [NEW_VERSION_NUMBER] + BEFORE RUNNING: + - [ ] be on branch '$main_branch' before doing this, and it should + be up-to-date with the remote (run 'git pull') + - [ ] make sure you don't have any changes (run 'git status') + EFFECT: + - a new git branch for this version bump will be created, and a commit will be added + - at the end, all you have to do is run 'git push' and open a pull request + """ + exit 2 +fi + +# parse argument +ver_num=$(echo $1|sed 's/-SNAPSHOT//g') # remove '-SNAPSHOT', if the user included it +ver_pom=$ver_num-SNAPSHOT # append '-SNAPSHOT' for POM files + +# verify user is on the main branch +current_branch=$(git rev-parse --abbrev-ref HEAD) +if [ "$current_branch" != "$main_branch" ]; then + echo """ERROR: you are currently on branch '$current_branch', but you should be on branch '$main_branch'. + Please switch to branch '$main_branch' and (preferrably) run 'git pull'.""" >&2 + exit 1 +fi + +# switch to a new branch for this new version +new_branch=version/$ver_num +git switch -c $new_branch + +# bump the POM project version mvn --batch-mode release:update-versions -DdevelopmentVersion=$ver_pom +# bump `deployDistribution.sh`'s version sed -i "s/^VERSION=.*/VERSION=$ver_num/g" common-tools/coat-lib/deployDistribution.sh + +# commit to git +git commit -am "build: bump version number to $ver_num" +echo """======================== +Done. Now run your usual 'git push' command, which is probably + + git push -u origin $new_branch + +========================""" From d69f08e9084f790fe46f1e5e0e3032c202331a64 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Fri, 28 Mar 2025 12:41:03 -0400 Subject: [PATCH 12/26] style: better printout --- version-bump.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/version-bump.sh b/version-bump.sh index e2f2d71736..bd73907da5 100755 --- a/version-bump.sh +++ b/version-bump.sh @@ -40,10 +40,13 @@ mvn --batch-mode release:update-versions -DdevelopmentVersion=$ver_pom sed -i "s/^VERSION=.*/VERSION=$ver_num/g" common-tools/coat-lib/deployDistribution.sh # commit to git +echo """ +============================================""" git commit -am "build: bump version number to $ver_num" -echo """======================== -Done. Now run your usual 'git push' command, which is probably +echo """Done. +Now run your usual 'git push' command, which is probably: git push -u origin $new_branch -========================""" +============================================ +""" From ecf902ce26b0625aa376965cc788d8f89ac53eb0 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Fri, 28 Mar 2025 18:23:44 -0400 Subject: [PATCH 13/26] fix: ignore `jdtls` files --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 77c0fd6ff3..900361e56b 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,12 @@ hs_err_pid* *.iml .idea +# eclipse JDT language server +.classpath +.factorypath +.project +.settings + # no log files: *.log *.evio From 4e0c8977761bd91d995479036b2e7f4dfffea325 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Fri, 28 Mar 2025 18:38:08 -0400 Subject: [PATCH 14/26] build: make clean-build be optional --- build-coatjava.sh | 6 ++++-- install-clara | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build-coatjava.sh b/build-coatjava.sh index e76ac62bcd..31e66ce52a 100755 --- a/build-coatjava.sh +++ b/build-coatjava.sh @@ -4,10 +4,11 @@ set -e set -u set -o pipefail -usage='''build-coatjava.sh [-h] [--help] [--quiet] [--spotbugs] [--nomaps] [--unittests] +usage='''build-coatjava.sh [-h] [--help] [--quiet] [--clean] [--spotbugs] [--nomaps] [--unittests] - all other arguments will be passed to `mvn`, e.g., -T4 will build with 4 parallel threads''' quiet="no" +cleanBuild="no" runSpotBugs="no" downloadMaps="yes" runUnitTests="no" @@ -20,6 +21,7 @@ do --nomaps) downloadMaps="no" ;; --unittests) runUnitTests="yes" ;; --quiet) quiet="yes" ;; + --clean) cleanBuild="yes" ;; -h|--help) echo "$usage" exit 2 @@ -100,7 +102,7 @@ mkdir -p coatjava/lib/services cp external-dependencies/jclara-4.3-SNAPSHOT.jar coatjava/lib/utils ### clean up any cache copies ### -cd common-tools/coat-lib; $mvn clean; cd - +[ $cleanBuild == "yes" ] && $mvn clean unset CLAS12DIR if [ $runUnitTests == "yes" ]; then diff --git a/install-clara b/install-clara index bd29ae04ce..34f9b122ef 100755 --- a/install-clara +++ b/install-clara @@ -3,7 +3,13 @@ # Default versions: grapes=2.17 clara=5.0.2 -coatjava=11.1.1 +# FIXME +# FIXME +# FIXME +coatjava=11.1.1 # FIXME: does this need to be bumped? +# FIXME +# FIXME +# FIXME # Abort on any non-zero exit codes: set -e From 9aba908e90e96fd0cdf0d26ac8c6896dce1a0033 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Fri, 28 Mar 2025 20:27:07 -0400 Subject: [PATCH 15/26] fix: restore `coat-lib` shade deps --- common-tools/coat-lib/pom.xml | 69 +++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/common-tools/coat-lib/pom.xml b/common-tools/coat-lib/pom.xml index 912c86445f..73d57af288 100644 --- a/common-tools/coat-lib/pom.xml +++ b/common-tools/coat-lib/pom.xml @@ -90,6 +90,75 @@ 1.0 + + + org.jlab.clas + clas-io + 12.0.0-SNAPSHOT + + + + org.jlab.clas + clara-io + 12.0.0-SNAPSHOT + + + + org.jlab.clas + clas-reco + 12.0.0-SNAPSHOT + + + + org.jlab.clas + clas-utils + 12.0.0-SNAPSHOT + + + + org.jlab.clas + clas-jcsg + 12.0.0-SNAPSHOT + + + + org.jlab.clas + clas-detector + 12.0.0-SNAPSHOT + + + + org.jlab.clas + clas-analysis + 12.0.0-SNAPSHOT + + + + org.jlab.clas + clas-geometry + 12.0.0-SNAPSHOT + + + + org.jlab.clas + clas-physics + 12.0.0-SNAPSHOT + + + + org.jlab.clas + swim-tools + 12.0.0-SNAPSHOT + + + + org.jlab.clas + clas-tracking + 12.0.0-SNAPSHOT + + org.freehep jminuit From dc857e5456a9546dd468c723a462dc728c32e069 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Fri, 28 Mar 2025 20:28:42 -0400 Subject: [PATCH 16/26] test: script for dumping jar contents --- TEST_JARS.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 TEST_JARS.sh diff --git a/TEST_JARS.sh b/TEST_JARS.sh new file mode 100755 index 0000000000..a0cd761b6b --- /dev/null +++ b/TEST_JARS.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash + +# FIXME +# FIXME +# FIXME +# FIXME: remove before marking PR as ready +# FIXME +# FIXME +# FIXME +# + +set -e +[ $# -ne 2 ] && echo "input output" && exit 3 + +mkdir -p $2 +rm -r $2 +mkdir -p $2 + +for j in $(find $1 -type f -name "*.jar"|sort); do + jar tf $j | sort > $2/$(basename $j|sed 's/-1.*//g').out +done From 73747d692070435955a9d1e0e92f4a7e3c23806d Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Mon, 31 Mar 2025 10:43:26 -0400 Subject: [PATCH 17/26] fix: re-bump to 12.0.1t --- common-tools/clas-reco/pom.xml | 6 +-- common-tools/cnuphys/magfield/pom.xml | 2 +- common-tools/cnuphys/pom.xml | 2 +- common-tools/cnuphys/snr/pom.xml | 2 +- common-tools/cnuphys/splot/pom.xml | 2 +- common-tools/cnuphys/swimmer/pom.xml | 6 +-- common-tools/coat-lib/pom.xml | 2 +- reconstruction/alert/pom.xml | 2 +- reconstruction/band/pom.xml | 2 +- reconstruction/bg/pom.xml | 2 +- reconstruction/cnd/pom.xml | 4 +- reconstruction/cvt/pom.xml | 6 +-- reconstruction/dc/pom.xml | 10 ++--- reconstruction/eb/pom.xml | 12 ++--- reconstruction/ec/pom.xml | 2 +- reconstruction/fmt/pom.xml | 2 +- reconstruction/ft/pom.xml | 2 +- reconstruction/htcc/pom.xml | 2 +- reconstruction/ltcc/pom.xml | 2 +- reconstruction/mc/pom.xml | 2 +- reconstruction/mltn/pom.xml | 2 +- reconstruction/postproc/pom.xml | 2 +- reconstruction/raster/pom.xml | 2 +- reconstruction/rich/pom.xml | 2 +- reconstruction/rtpc/pom.xml | 2 +- reconstruction/swaps/pom.xml | 2 +- reconstruction/tof/pom.xml | 4 +- reconstruction/urwell/pom.xml | 2 +- reconstruction/vtx/pom.xml | 2 +- version-bump.sh | 65 +++++++++++++++++---------- 30 files changed, 88 insertions(+), 69 deletions(-) diff --git a/common-tools/clas-reco/pom.xml b/common-tools/clas-reco/pom.xml index 2885625b31..19b32967ba 100644 --- a/common-tools/clas-reco/pom.xml +++ b/common-tools/clas-reco/pom.xml @@ -24,19 +24,19 @@ cnuphys magfield - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT cnuphys swimmer - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT cnuphys snr - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT diff --git a/common-tools/cnuphys/magfield/pom.xml b/common-tools/cnuphys/magfield/pom.xml index 23083faf05..df1d895bb2 100644 --- a/common-tools/cnuphys/magfield/pom.xml +++ b/common-tools/cnuphys/magfield/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cnuphys magfield - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/common-tools/cnuphys/pom.xml b/common-tools/cnuphys/pom.xml index c89fc106bd..fd85d9978b 100644 --- a/common-tools/cnuphys/pom.xml +++ b/common-tools/cnuphys/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cnuphys clas12 - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT pom cnuphys diff --git a/common-tools/cnuphys/snr/pom.xml b/common-tools/cnuphys/snr/pom.xml index 83126caed6..490291fbec 100644 --- a/common-tools/cnuphys/snr/pom.xml +++ b/common-tools/cnuphys/snr/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cnuphys snr - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/common-tools/cnuphys/splot/pom.xml b/common-tools/cnuphys/splot/pom.xml index 3796fc6aa0..c4d5c2f030 100644 --- a/common-tools/cnuphys/splot/pom.xml +++ b/common-tools/cnuphys/splot/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cnuphys splot - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/common-tools/cnuphys/swimmer/pom.xml b/common-tools/cnuphys/swimmer/pom.xml index 02a3536e69..39f9850fde 100644 --- a/common-tools/cnuphys/swimmer/pom.xml +++ b/common-tools/cnuphys/swimmer/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cnuphys swimmer - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar @@ -17,13 +17,13 @@ cnuphys magfield - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT cnuphys splot - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT diff --git a/common-tools/coat-lib/pom.xml b/common-tools/coat-lib/pom.xml index dc758bfe9f..1f452a43c9 100644 --- a/common-tools/coat-lib/pom.xml +++ b/common-tools/coat-lib/pom.xml @@ -10,7 +10,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT diff --git a/reconstruction/alert/pom.xml b/reconstruction/alert/pom.xml index 89dfa2ac1f..101b4d7d2b 100644 --- a/reconstruction/alert/pom.xml +++ b/reconstruction/alert/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-alert - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/band/pom.xml b/reconstruction/band/pom.xml index a096d403fc..0b8e21a07d 100644 --- a/reconstruction/band/pom.xml +++ b/reconstruction/band/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-band - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/bg/pom.xml b/reconstruction/bg/pom.xml index 6752ebc797..bb8e5384f8 100644 --- a/reconstruction/bg/pom.xml +++ b/reconstruction/bg/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-bg - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/cnd/pom.xml b/reconstruction/cnd/pom.xml index 51aa7cfadf..22cff8efda 100644 --- a/reconstruction/cnd/pom.xml +++ b/reconstruction/cnd/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-cnd - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar @@ -18,7 +18,7 @@ org.jlab.clas12.detector clas12detector-cvt - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT diff --git a/reconstruction/cvt/pom.xml b/reconstruction/cvt/pom.xml index 5e9822bf06..596ca97218 100644 --- a/reconstruction/cvt/pom.xml +++ b/reconstruction/cvt/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-cvt - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar @@ -25,7 +25,7 @@ org.jlab.clas12.detector clas12detector-eb - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT test jar @@ -33,7 +33,7 @@ cnuphys swimmer - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT diff --git a/reconstruction/dc/pom.xml b/reconstruction/dc/pom.xml index 80e7f061f5..143173ccc8 100644 --- a/reconstruction/dc/pom.xml +++ b/reconstruction/dc/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-dc - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar @@ -20,7 +20,7 @@ org.jlab.clas12.detector clas12detector-urwell - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT @@ -50,19 +50,19 @@ cnuphys swimmer - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT cnuphys snr - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT cnuphys splot - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT diff --git a/reconstruction/eb/pom.xml b/reconstruction/eb/pom.xml index c016fb8b41..e92e6b4f4c 100644 --- a/reconstruction/eb/pom.xml +++ b/reconstruction/eb/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-eb - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar @@ -43,31 +43,31 @@ org.jlab.clas12.detector clas12detector-dc - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT org.jlab.clas12.detector clas12detector-ec - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT org.jlab.clas12.detector clas12detector-tof - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT org.jlab.clas12.detector clas12detector-htcc - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT org.jlab.clas12.detector clas12detector-ltcc - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT diff --git a/reconstruction/ec/pom.xml b/reconstruction/ec/pom.xml index e465ef4a70..055d00daf5 100644 --- a/reconstruction/ec/pom.xml +++ b/reconstruction/ec/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-ec - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/fmt/pom.xml b/reconstruction/fmt/pom.xml index fb0fa73aa5..0df1257c95 100644 --- a/reconstruction/fmt/pom.xml +++ b/reconstruction/fmt/pom.xml @@ -5,7 +5,7 @@ clas12detector-fmt org.jlab.clas12.detector clas12detector-fmt - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/ft/pom.xml b/reconstruction/ft/pom.xml index 1ec1c9e39f..94b145f16e 100644 --- a/reconstruction/ft/pom.xml +++ b/reconstruction/ft/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-ft - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/htcc/pom.xml b/reconstruction/htcc/pom.xml index 3835165b6e..fd540a8a96 100644 --- a/reconstruction/htcc/pom.xml +++ b/reconstruction/htcc/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-htcc - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/ltcc/pom.xml b/reconstruction/ltcc/pom.xml index af457de14e..3014c0e198 100644 --- a/reconstruction/ltcc/pom.xml +++ b/reconstruction/ltcc/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-ltcc - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/mc/pom.xml b/reconstruction/mc/pom.xml index 2dfd2ce1f2..459d788a04 100644 --- a/reconstruction/mc/pom.xml +++ b/reconstruction/mc/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-mc - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/mltn/pom.xml b/reconstruction/mltn/pom.xml index a959b16527..425567dbbb 100644 --- a/reconstruction/mltn/pom.xml +++ b/reconstruction/mltn/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-mltn - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/postproc/pom.xml b/reconstruction/postproc/pom.xml index e6b5d41d80..0c6bf3977c 100644 --- a/reconstruction/postproc/pom.xml +++ b/reconstruction/postproc/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-postproc - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/raster/pom.xml b/reconstruction/raster/pom.xml index 860eeac926..9828c98e06 100644 --- a/reconstruction/raster/pom.xml +++ b/reconstruction/raster/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-raster - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/rich/pom.xml b/reconstruction/rich/pom.xml index 4b9ffd512e..1a3e7b7214 100644 --- a/reconstruction/rich/pom.xml +++ b/reconstruction/rich/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-rich - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/rtpc/pom.xml b/reconstruction/rtpc/pom.xml index e17c4029e1..67ec2b41fc 100644 --- a/reconstruction/rtpc/pom.xml +++ b/reconstruction/rtpc/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-rtpc - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/swaps/pom.xml b/reconstruction/swaps/pom.xml index 183583b1fa..1a3a82d027 100644 --- a/reconstruction/swaps/pom.xml +++ b/reconstruction/swaps/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-swaps - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/tof/pom.xml b/reconstruction/tof/pom.xml index 2f3ff91adb..43d7d353d0 100644 --- a/reconstruction/tof/pom.xml +++ b/reconstruction/tof/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-tof - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar @@ -25,7 +25,7 @@ org.jlab.clas12.detector clas12detector-dc - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT diff --git a/reconstruction/urwell/pom.xml b/reconstruction/urwell/pom.xml index 224c7e946a..09ba62be44 100644 --- a/reconstruction/urwell/pom.xml +++ b/reconstruction/urwell/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-urwell - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/reconstruction/vtx/pom.xml b/reconstruction/vtx/pom.xml index dc78cf3bd6..14c0ca818f 100644 --- a/reconstruction/vtx/pom.xml +++ b/reconstruction/vtx/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-vtx - 12.0.0-SNAPSHOT + 12.0.1t-SNAPSHOT jar diff --git a/version-bump.sh b/version-bump.sh index bd73907da5..0631a25234 100755 --- a/version-bump.sh +++ b/version-bump.sh @@ -3,8 +3,9 @@ set -euo pipefail main_branch=development -if [ $# -ne 1 ]; then +if [ $# -lt 1 ]; then echo """USAGE: $0 [NEW_VERSION_NUMBER] + BEFORE RUNNING: - [ ] be on branch '$main_branch' before doing this, and it should be up-to-date with the remote (run 'git pull') @@ -13,25 +14,39 @@ if [ $# -ne 1 ]; then EFFECT: - a new git branch for this version bump will be created, and a commit will be added - at the end, all you have to do is run 'git push' and open a pull request + + OPTION: if you want to just run the version bump without involving 'git' in any way, + add the argument '--no-git'; this will ONLY bump the version numbers """ exit 2 fi +ver_arg=$1 +[ $# -ge 2 -a "${2-}" = "--no-git" ] && use_git=false || use_git=true # parse argument -ver_num=$(echo $1|sed 's/-SNAPSHOT//g') # remove '-SNAPSHOT', if the user included it -ver_pom=$ver_num-SNAPSHOT # append '-SNAPSHOT' for POM files - -# verify user is on the main branch -current_branch=$(git rev-parse --abbrev-ref HEAD) -if [ "$current_branch" != "$main_branch" ]; then - echo """ERROR: you are currently on branch '$current_branch', but you should be on branch '$main_branch'. - Please switch to branch '$main_branch' and (preferrably) run 'git pull'.""" >&2 - exit 1 -fi +ver_num=$(echo $ver_arg|sed 's/-SNAPSHOT//g') # remove '-SNAPSHOT', if the user included it +ver_pom=$ver_num-SNAPSHOT # append '-SNAPSHOT' for POM files -# switch to a new branch for this new version -new_branch=version/$ver_num -git switch -c $new_branch +# print arguments +echo """>>>>> +ver_num: $ver_num +ver_pom: $ver_pom +use_git: $use_git +<<<<<""" + +# if using git, make a new branch +if $use_git; then + # verify user is on the main branch + current_branch=$(git rev-parse --abbrev-ref HEAD) + if [ "$current_branch" != "$main_branch" ]; then + echo """ERROR: you are currently on branch '$current_branch', but you should be on branch '$main_branch'. + Please switch to branch '$main_branch' and (preferrably) run 'git pull'.""" >&2 + exit 1 + fi + # switch to a new branch for this new version + new_branch=version/$ver_num + git switch -c $new_branch +fi # bump the POM project version mvn --batch-mode release:update-versions -DdevelopmentVersion=$ver_pom @@ -39,14 +54,18 @@ mvn --batch-mode release:update-versions -DdevelopmentVersion=$ver_pom # bump `deployDistribution.sh`'s version sed -i "s/^VERSION=.*/VERSION=$ver_num/g" common-tools/coat-lib/deployDistribution.sh -# commit to git -echo """ -============================================""" -git commit -am "build: bump version number to $ver_num" -echo """Done. -Now run your usual 'git push' command, which is probably: +# commit to git (or not) +if $use_git; then + echo """ + ============================================""" + git commit -am "build: bump version number to $ver_num" + echo """Done. + Now run your usual 'git push' command, which is probably: - git push -u origin $new_branch + git push -u origin $new_branch -============================================ -""" + ============================================ + """ +else + echo "Done bumping version number; no git commit was created" +fi From 26602306a42f643620292a0cc4cbb9965a1a3771 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Mon, 31 Mar 2025 10:45:48 -0400 Subject: [PATCH 18/26] fix: remove FIXME comment --- install-clara | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/install-clara b/install-clara index 34f9b122ef..bd29ae04ce 100755 --- a/install-clara +++ b/install-clara @@ -3,13 +3,7 @@ # Default versions: grapes=2.17 clara=5.0.2 -# FIXME -# FIXME -# FIXME -coatjava=11.1.1 # FIXME: does this need to be bumped? -# FIXME -# FIXME -# FIXME +coatjava=11.1.1 # Abort on any non-zero exit codes: set -e From 3d89de33589f8322ed474acb37b09d4f45384d51 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Mon, 31 Mar 2025 10:47:29 -0400 Subject: [PATCH 19/26] fix: bump `install-clara` version --- install-clara | 2 +- version-bump.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/install-clara b/install-clara index bd29ae04ce..77c9800a5e 100755 --- a/install-clara +++ b/install-clara @@ -3,7 +3,7 @@ # Default versions: grapes=2.17 clara=5.0.2 -coatjava=11.1.1 +coatjava=12.0.1t # Abort on any non-zero exit codes: set -e diff --git a/version-bump.sh b/version-bump.sh index 0631a25234..43742ef8a4 100755 --- a/version-bump.sh +++ b/version-bump.sh @@ -54,6 +54,9 @@ mvn --batch-mode release:update-versions -DdevelopmentVersion=$ver_pom # bump `deployDistribution.sh`'s version sed -i "s/^VERSION=.*/VERSION=$ver_num/g" common-tools/coat-lib/deployDistribution.sh +# bump `install-clara`'s version +sed -i "s/^coatjava=.*/coatjava=$ver_num/g" install-clara + # commit to git (or not) if $use_git; then echo """ From b90416bd2de33cd5b03997b20d1f8c9b5f31db28 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Mon, 31 Mar 2025 10:54:03 -0400 Subject: [PATCH 20/26] fix: version bump should bump shade dependencies too --- common-tools/coat-lib/pom.xml | 3 --- version-bump.sh | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/common-tools/coat-lib/pom.xml b/common-tools/coat-lib/pom.xml index 1f452a43c9..5e91df3b0b 100644 --- a/common-tools/coat-lib/pom.xml +++ b/common-tools/coat-lib/pom.xml @@ -90,9 +90,6 @@ 1.0 - org.jlab.clas clas-io diff --git a/version-bump.sh b/version-bump.sh index 43742ef8a4..653b3ee1b5 100755 --- a/version-bump.sh +++ b/version-bump.sh @@ -49,7 +49,8 @@ if $use_git; then fi # bump the POM project version -mvn --batch-mode release:update-versions -DdevelopmentVersion=$ver_pom +mvn versions:set -DnewVersion=$ver_pom -DprocessAllModules +mvn versions:commit -DprocessAllModules # bump `deployDistribution.sh`'s version sed -i "s/^VERSION=.*/VERSION=$ver_num/g" common-tools/coat-lib/deployDistribution.sh From 2b1161820ea5146219537c3a49e23a07695ea3dd Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Mon, 31 Mar 2025 16:04:19 -0400 Subject: [PATCH 21/26] fix: remove test script --- TEST_JARS.sh | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100755 TEST_JARS.sh diff --git a/TEST_JARS.sh b/TEST_JARS.sh deleted file mode 100755 index a0cd761b6b..0000000000 --- a/TEST_JARS.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -# FIXME -# FIXME -# FIXME -# FIXME: remove before marking PR as ready -# FIXME -# FIXME -# FIXME -# - -set -e -[ $# -ne 2 ] && echo "input output" && exit 3 - -mkdir -p $2 -rm -r $2 -mkdir -p $2 - -for j in $(find $1 -type f -name "*.jar"|sort); do - jar tf $j | sort > $2/$(basename $j|sed 's/-1.*//g').out -done From c4b712b3213ec7b036c837103f7941b8e5597e20 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Mon, 31 Mar 2025 17:22:10 -0400 Subject: [PATCH 22/26] fix: be more careful with `rm`-ing `coatjava` --- build-coatjava.sh | 50 +++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/build-coatjava.sh b/build-coatjava.sh index 31e66ce52a..6860bbd8a4 100755 --- a/build-coatjava.sh +++ b/build-coatjava.sh @@ -30,14 +30,18 @@ do esac done -top="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)" +src_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)" +prefix_dir=$src_dir/coatjava + +# working directory should be the source code directory +cd $src_dir wget='wget' -mvn="mvn --settings $top/maven-settings.xml" +mvn="mvn --settings $src_dir/maven-settings.xml" if [ "$quiet" == "yes" ] then wget='wget --progress=dot:mega' - mvn="mvn -q -B --settings $top/maven-settings.xml" + mvn="mvn -q -B --settings $src_dir/maven-settings.xml" fi mvn+=" ${mvnArgs[*]:-}" @@ -65,7 +69,7 @@ download () { # download the default field maps, as defined in libexec/env.sh: # (and duplicated in etc/services/reconstruction.yaml): -source `dirname $0`/libexec/env.sh +source libexec/env.sh if [ $downloadMaps == "yes" ]; then echo 'Retrieving field maps ...' webDir=https://clasweb.jlab.org/clas12offline/magfield @@ -85,24 +89,32 @@ if [ $downloadMaps == "yes" ]; then cd - fi -rm -rf coatjava -mkdir -p coatjava -cp -r bin coatjava/ -cp -r etc coatjava/ -cp -r libexec coatjava/ +# always clean the installation prefix +rm -rf $prefix_dir + +# clean up any cache copies +if [ $cleanBuild == "yes" ]; then + $mvn clean + echo '''DONE CLEANING. + Now re-run without `--clean` to build.''' + exit +fi + +# start new installation tree +mkdir -p $prefix_dir +cp -r bin $prefix_dir/ +cp -r etc $prefix_dir/ +cp -r libexec $prefix_dir/ # create schema directories for partial reconstruction outputs which python3 >& /dev/null && python=python3 || python=python -$python etc/bankdefs/util/bankSplit.py coatjava/etc/bankdefs/hipo4 || exit 1 -mkdir -p coatjava/lib/clas -mkdir -p coatjava/lib/utils -mkdir -p coatjava/lib/services +$python etc/bankdefs/util/bankSplit.py $prefix_dir/etc/bankdefs/hipo4 || exit 1 +mkdir -p $prefix_dir/lib/clas +mkdir -p $prefix_dir/lib/utils +mkdir -p $prefix_dir/lib/services # FIXME: this is still needed by one of the tests -cp external-dependencies/jclara-4.3-SNAPSHOT.jar coatjava/lib/utils - -### clean up any cache copies ### -[ $cleanBuild == "yes" ] && $mvn clean +cp external-dependencies/jclara-4.3-SNAPSHOT.jar $prefix_dir/lib/utils unset CLAS12DIR if [ $runUnitTests == "yes" ]; then @@ -121,7 +133,7 @@ if [ $runSpotBugs == "yes" ]; then if [ $? != 0 ] ; then echo "spotbugs failure" ; exit 1 ; fi fi -cp common-tools/coat-lib/target/coat-libs-*-SNAPSHOT.jar coatjava/lib/clas/ -cp reconstruction/*/target/clas12detector-*-SNAPSHOT*.jar coatjava/lib/services/ +cp common-tools/coat-lib/target/coat-libs-*-SNAPSHOT.jar $prefix_dir/lib/clas/ +cp reconstruction/*/target/clas12detector-*-SNAPSHOT*.jar $prefix_dir/lib/services/ echo "COATJAVA SUCCESSFULLY BUILT !" From 16fb07579e096972c9113eb6f79c352448e92941 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Mon, 31 Mar 2025 18:05:24 -0400 Subject: [PATCH 23/26] fix: unbound `new_branch` --- version-bump.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version-bump.sh b/version-bump.sh index 653b3ee1b5..b1ba8908b6 100755 --- a/version-bump.sh +++ b/version-bump.sh @@ -23,7 +23,7 @@ fi ver_arg=$1 [ $# -ge 2 -a "${2-}" = "--no-git" ] && use_git=false || use_git=true -# parse argument +# parse version number argument ver_num=$(echo $ver_arg|sed 's/-SNAPSHOT//g') # remove '-SNAPSHOT', if the user included it ver_pom=$ver_num-SNAPSHOT # append '-SNAPSHOT' for POM files @@ -35,6 +35,7 @@ use_git: $use_git <<<<<""" # if using git, make a new branch +new_branch=version/$ver_num if $use_git; then # verify user is on the main branch current_branch=$(git rev-parse --abbrev-ref HEAD) @@ -44,7 +45,6 @@ if $use_git; then exit 1 fi # switch to a new branch for this new version - new_branch=version/$ver_num git switch -c $new_branch fi From 5a570d5286ef2aea5a31edb53d681304cc432bf6 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Mon, 31 Mar 2025 18:08:45 -0400 Subject: [PATCH 24/26] fix: clarify printout --- version-bump.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/version-bump.sh b/version-bump.sh index b1ba8908b6..106bdea6c3 100755 --- a/version-bump.sh +++ b/version-bump.sh @@ -64,6 +64,7 @@ if $use_git; then ============================================""" git commit -am "build: bump version number to $ver_num" echo """Done. + Currently on branch $new_branch Now run your usual 'git push' command, which is probably: git push -u origin $new_branch From 9d59e4edd1cd37fd1d9cf70fae34bd353e7f462f Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Mon, 5 May 2025 19:06:42 -0400 Subject: [PATCH 25/26] fix: sync version numbers --- common-tools/clas-reco/pom.xml | 6 +++--- common-tools/cnuphys/magfield/pom.xml | 2 +- common-tools/cnuphys/pom.xml | 2 +- common-tools/cnuphys/snr/pom.xml | 2 +- common-tools/cnuphys/splot/pom.xml | 2 +- common-tools/cnuphys/swimmer/pom.xml | 6 +++--- common-tools/coat-lib/pom.xml | 2 +- install-clara | 2 +- reconstruction/alert/pom.xml | 2 +- reconstruction/band/pom.xml | 2 +- reconstruction/bg/pom.xml | 2 +- reconstruction/cnd/pom.xml | 4 ++-- reconstruction/cvt/pom.xml | 6 +++--- reconstruction/dc/pom.xml | 10 +++++----- reconstruction/eb/pom.xml | 12 ++++++------ reconstruction/ec/pom.xml | 2 +- reconstruction/fmt/pom.xml | 2 +- reconstruction/ft/pom.xml | 2 +- reconstruction/htcc/pom.xml | 2 +- reconstruction/ltcc/pom.xml | 2 +- reconstruction/mc/pom.xml | 2 +- reconstruction/mltn/pom.xml | 2 +- reconstruction/postproc/pom.xml | 2 +- reconstruction/raster/pom.xml | 2 +- reconstruction/rich/pom.xml | 2 +- reconstruction/rtpc/pom.xml | 2 +- reconstruction/swaps/pom.xml | 2 +- reconstruction/tof/pom.xml | 4 ++-- reconstruction/urwell/pom.xml | 2 +- reconstruction/vtx/pom.xml | 2 +- 30 files changed, 47 insertions(+), 47 deletions(-) diff --git a/common-tools/clas-reco/pom.xml b/common-tools/clas-reco/pom.xml index bf4fc613f5..9eae5de691 100644 --- a/common-tools/clas-reco/pom.xml +++ b/common-tools/clas-reco/pom.xml @@ -24,19 +24,19 @@ cnuphys magfield - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT cnuphys swimmer - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT cnuphys snr - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT diff --git a/common-tools/cnuphys/magfield/pom.xml b/common-tools/cnuphys/magfield/pom.xml index 6e7b8bd2fe..6e8b7e3e36 100644 --- a/common-tools/cnuphys/magfield/pom.xml +++ b/common-tools/cnuphys/magfield/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cnuphys magfield - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/common-tools/cnuphys/pom.xml b/common-tools/cnuphys/pom.xml index fd85d9978b..4ab3867d93 100644 --- a/common-tools/cnuphys/pom.xml +++ b/common-tools/cnuphys/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cnuphys clas12 - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT pom cnuphys diff --git a/common-tools/cnuphys/snr/pom.xml b/common-tools/cnuphys/snr/pom.xml index 490291fbec..814dd29bd3 100644 --- a/common-tools/cnuphys/snr/pom.xml +++ b/common-tools/cnuphys/snr/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cnuphys snr - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/common-tools/cnuphys/splot/pom.xml b/common-tools/cnuphys/splot/pom.xml index c4d5c2f030..f8d5d37a02 100644 --- a/common-tools/cnuphys/splot/pom.xml +++ b/common-tools/cnuphys/splot/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cnuphys splot - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/common-tools/cnuphys/swimmer/pom.xml b/common-tools/cnuphys/swimmer/pom.xml index 2939e419d8..b8a49c2f13 100644 --- a/common-tools/cnuphys/swimmer/pom.xml +++ b/common-tools/cnuphys/swimmer/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cnuphys swimmer - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar @@ -17,13 +17,13 @@ cnuphys magfield - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT cnuphys splot - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT diff --git a/common-tools/coat-lib/pom.xml b/common-tools/coat-lib/pom.xml index 3b2c03ccf3..7226921587 100644 --- a/common-tools/coat-lib/pom.xml +++ b/common-tools/coat-lib/pom.xml @@ -10,7 +10,7 @@ org.jlab.clas clas12rec ../../parent/pom.xml - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT diff --git a/install-clara b/install-clara index 77c9800a5e..343519df16 100755 --- a/install-clara +++ b/install-clara @@ -3,7 +3,7 @@ # Default versions: grapes=2.17 clara=5.0.2 -coatjava=12.0.1t +coatjava=12.0.6t # Abort on any non-zero exit codes: set -e diff --git a/reconstruction/alert/pom.xml b/reconstruction/alert/pom.xml index 22b0b5456c..61b9abe2c2 100644 --- a/reconstruction/alert/pom.xml +++ b/reconstruction/alert/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-alert - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/band/pom.xml b/reconstruction/band/pom.xml index ff31ffb461..b04b747e7c 100644 --- a/reconstruction/band/pom.xml +++ b/reconstruction/band/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-band - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/bg/pom.xml b/reconstruction/bg/pom.xml index 10cf829e47..df931bfa30 100644 --- a/reconstruction/bg/pom.xml +++ b/reconstruction/bg/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-bg - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/cnd/pom.xml b/reconstruction/cnd/pom.xml index 17a3c98491..f6b048e7d4 100644 --- a/reconstruction/cnd/pom.xml +++ b/reconstruction/cnd/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-cnd - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar @@ -18,7 +18,7 @@ org.jlab.clas12.detector clas12detector-cvt - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT diff --git a/reconstruction/cvt/pom.xml b/reconstruction/cvt/pom.xml index 2251190250..6422e82425 100644 --- a/reconstruction/cvt/pom.xml +++ b/reconstruction/cvt/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-cvt - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar @@ -25,7 +25,7 @@ org.jlab.clas12.detector clas12detector-eb - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT test jar @@ -33,7 +33,7 @@ cnuphys swimmer - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT diff --git a/reconstruction/dc/pom.xml b/reconstruction/dc/pom.xml index c827f6d93c..22a4a95b6d 100644 --- a/reconstruction/dc/pom.xml +++ b/reconstruction/dc/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-dc - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar @@ -20,7 +20,7 @@ org.jlab.clas12.detector clas12detector-urwell - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT @@ -50,19 +50,19 @@ cnuphys swimmer - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT cnuphys snr - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT cnuphys splot - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT diff --git a/reconstruction/eb/pom.xml b/reconstruction/eb/pom.xml index fb3517f6e7..766afb1cb5 100644 --- a/reconstruction/eb/pom.xml +++ b/reconstruction/eb/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-eb - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar @@ -43,31 +43,31 @@ org.jlab.clas12.detector clas12detector-dc - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT org.jlab.clas12.detector clas12detector-ec - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT org.jlab.clas12.detector clas12detector-tof - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT org.jlab.clas12.detector clas12detector-htcc - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT org.jlab.clas12.detector clas12detector-ltcc - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT diff --git a/reconstruction/ec/pom.xml b/reconstruction/ec/pom.xml index 7ae4bed19f..89c2380ab1 100644 --- a/reconstruction/ec/pom.xml +++ b/reconstruction/ec/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-ec - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/fmt/pom.xml b/reconstruction/fmt/pom.xml index 2ad8fa6429..1a499c39dc 100644 --- a/reconstruction/fmt/pom.xml +++ b/reconstruction/fmt/pom.xml @@ -5,7 +5,7 @@ clas12detector-fmt org.jlab.clas12.detector clas12detector-fmt - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/ft/pom.xml b/reconstruction/ft/pom.xml index f80b61cf1b..fd98ec80eb 100644 --- a/reconstruction/ft/pom.xml +++ b/reconstruction/ft/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-ft - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/htcc/pom.xml b/reconstruction/htcc/pom.xml index a72d5dc7d7..7346644f39 100644 --- a/reconstruction/htcc/pom.xml +++ b/reconstruction/htcc/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-htcc - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/ltcc/pom.xml b/reconstruction/ltcc/pom.xml index f0d5ecb6e5..4e7915abe6 100644 --- a/reconstruction/ltcc/pom.xml +++ b/reconstruction/ltcc/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-ltcc - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/mc/pom.xml b/reconstruction/mc/pom.xml index a1a878276f..236d9a8276 100644 --- a/reconstruction/mc/pom.xml +++ b/reconstruction/mc/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-mc - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/mltn/pom.xml b/reconstruction/mltn/pom.xml index 2609892a7f..b954569941 100644 --- a/reconstruction/mltn/pom.xml +++ b/reconstruction/mltn/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-mltn - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/postproc/pom.xml b/reconstruction/postproc/pom.xml index 99b5f92ba4..046653a26b 100644 --- a/reconstruction/postproc/pom.xml +++ b/reconstruction/postproc/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-postproc - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/raster/pom.xml b/reconstruction/raster/pom.xml index e2709c241d..99f22e55cd 100644 --- a/reconstruction/raster/pom.xml +++ b/reconstruction/raster/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-raster - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/rich/pom.xml b/reconstruction/rich/pom.xml index d43014da28..64ec446670 100644 --- a/reconstruction/rich/pom.xml +++ b/reconstruction/rich/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-rich - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/rtpc/pom.xml b/reconstruction/rtpc/pom.xml index f40eb56fd7..4ee60f309c 100644 --- a/reconstruction/rtpc/pom.xml +++ b/reconstruction/rtpc/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-rtpc - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/swaps/pom.xml b/reconstruction/swaps/pom.xml index 29d5514cfc..d3452b1e7a 100644 --- a/reconstruction/swaps/pom.xml +++ b/reconstruction/swaps/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-swaps - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/tof/pom.xml b/reconstruction/tof/pom.xml index 0c3425df21..feadabaaa2 100644 --- a/reconstruction/tof/pom.xml +++ b/reconstruction/tof/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-tof - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar @@ -25,7 +25,7 @@ org.jlab.clas12.detector clas12detector-dc - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT diff --git a/reconstruction/urwell/pom.xml b/reconstruction/urwell/pom.xml index 27085dda93..ec271f6683 100644 --- a/reconstruction/urwell/pom.xml +++ b/reconstruction/urwell/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-urwell - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar diff --git a/reconstruction/vtx/pom.xml b/reconstruction/vtx/pom.xml index ac6acf220c..45df81cfac 100644 --- a/reconstruction/vtx/pom.xml +++ b/reconstruction/vtx/pom.xml @@ -4,7 +4,7 @@ org.jlab.clas12.detector clas12detector-vtx - 12.0.1t-SNAPSHOT + 12.0.6t-SNAPSHOT jar From 9b4da9a5bfde5625e3279313ec46de0d64a66601 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Tue, 6 May 2025 13:26:58 -0400 Subject: [PATCH 26/26] fix: `install-clara` version check of `coatjava` should allow `/.*t$/` --- install-clara | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-clara b/install-clara index 343519df16..9c5a068dde 100755 --- a/install-clara +++ b/install-clara @@ -105,7 +105,7 @@ if compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null then coatjava=$(cd $coatjava && pwd) echo -e "\nUsing local COATJAVA installation:\n\t$coatjava" -elif ! [[ "$coatjava" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] +elif ! [[ "$coatjava" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)t?$ ]] # must be semver, or semver+"t" then echo -e "\n\nWARNING: COATJAVA doesn't look like a local installation nor version number: $coatjava" fi