From 329b3f931faf4aec0615c18c4995a40750c43456 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 21 Aug 2024 14:49:16 -0400 Subject: [PATCH 1/5] goto 21 --- common-tools/parent/pom.xml | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 common-tools/parent/pom.xml diff --git a/common-tools/parent/pom.xml b/common-tools/parent/pom.xml new file mode 100644 index 0000000000..025d59cf3c --- /dev/null +++ b/common-tools/parent/pom.xml @@ -0,0 +1,40 @@ + + 4.0.0 + + org.jlab.clas + common-tools + 12.0.5t-SNAPSHOT + pom + + + + + clas12maven + https://clasweb.jlab.org/clas12maven + + + jnp-maven + https://clasweb.jlab.org/jhep/maven + + + + + + + org.apache.maven.wagon + wagon-ssh-external + 2.8 + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 21 + + + + + + From 0b80688ca88c5a0fda8a3152cd2633eec54cbb10 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Mon, 26 Aug 2024 10:33:01 -0400 Subject: [PATCH 2/5] more java versions in POMs --- common-tools/cnuphys/parent/pom.xml | 73 +++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 common-tools/cnuphys/parent/pom.xml diff --git a/common-tools/cnuphys/parent/pom.xml b/common-tools/cnuphys/parent/pom.xml new file mode 100644 index 0000000000..3f28f73917 --- /dev/null +++ b/common-tools/cnuphys/parent/pom.xml @@ -0,0 +1,73 @@ + + 4.0.0 + cnuphys + cnuphys-clas12 + 2.0-SNAPSHOT + pom + + + + clas12maven + https://clasweb.jlab.org/clas12maven + + + + mvnrepository + http://central.maven.org/maven2/ + + + + + + com.github.spotbugs + spotbugs + 4.9.1 + + + + + + + org.apache.maven.wagon + wagon-ssh-external + 3.5.3 + + + + + + com.github.spotbugs + spotbugs-maven-plugin + 4.9.3.0 + + spotbugs-exclude.xml + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.14.0 + + UTF-8 + 21 + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + UTF-8 + + + + + + + + ssh-clasweb + scpexe://clas12@jlabl1.jlab.org/group/clas/www/clasweb/html/clas12maven + + + + From a1d4923ef2411294e5bc5fa46e26ac6182a805cb Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Mon, 26 Aug 2024 10:48:18 -0400 Subject: [PATCH 3/5] container to 21 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d7c1d5e17..93de459dac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ defaults: shell: bash env: - java_version: 17 + java_version: 21 java_distribution: zulu javadoc_version: 24 # newer than `java_version` for better javadoc groovy_version: 4.x From c834f8ead2f5eda6e0b1c75680f8504a820dc8c2 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Mon, 26 Aug 2024 13:09:19 -0400 Subject: [PATCH 4/5] use similar path, reduce checks --- install-clara | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/install-clara b/install-clara index 640d8f0e38..03589ba8a6 100755 --- a/install-clara +++ b/install-clara @@ -87,13 +87,14 @@ do esac done -# Check requested installation path: +# Check installation path: clara_home="$args" -[ "${#args[@]}" -lt 1 ] && error "Missing PATH argument" +[ "${#args[@]}" -lt 1 ] && error "Missing PATH argument." [ "${#args[@]}" -gt 1 ] && error "Extra PATH arguments: ${args[@]:1}" [ -e "$clara_home" ] && error "Installation PATH already exists: $clara_home" mkdir -p $clara_home || error "Cannot create installation PATH: $clara_home" clara_home=$(cd $clara_home && pwd) && rmdir $clara_home +echo -e "\nConfigured for a CLARA_HOME installation at:\n\t$clara_home" # If the user didn't specify a coatjava version, try auto-detect the version: if [ -z ${coatjava+x} ] @@ -109,12 +110,11 @@ then echo -e "\nUsing local COATJAVA installation:\n\t$coatjava" 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" + echo -e "\nWARNING: COATJAVA doesn't look like a local installation nor version number: $coatjava" fi # Do everything inside a new, temporary directory: -[ -w "." ] || error "Current working directory is not writeable: \$PWD=$PWD" -tmp_dir=$(mktemp -d tmp.install-clara.XXXXXX) +tmp_dir=$(mktemp -d $clara_home.tmp.XXXXXX) [ $? -ne 0 ] && error "Cannot create temporary directory: $tmp_dir" tmp_dir=$(cd $tmp_dir && pwd) echo -e "\nCreating temporary build directory:\n\t$tmp_dir" @@ -133,7 +133,7 @@ fi # COATJAVA: if ! compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null then - echo -e "\nRetrieving COATJAVA version $coatjava ..." + echo -e "\nRetrieving COATJAVA/$coatjava ..." get https://clasweb.jlab.org/clas12offline/distribution/coatjava/coatjava-$coatjava.tar.gz coatjava=./coatjava fi @@ -141,7 +141,7 @@ mkdir -p clara-cre/plugins/clas12/config cp -Lr $coatjava/etc $coatjava/bin $coatjava/lib* clara-cre/plugins/clas12 # GRAPES: -echo -e "\nRetrieving GRAPES version $grapes ..." +echo -e "\nRetrieving GRAPES/$grapes ..." get https://clasweb.jlab.org/clas12offline/distribution/grapes/grapes-$grapes.tar.gz mv grapes-$grapes clara-cre/plugins/grapes From 416c3a3ce0ce91109c344b7f6fed32b6db329609 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Fri, 30 May 2025 20:17:43 -0400 Subject: [PATCH 5/5] fix rebase mistake --- common-tools/cnuphys/parent/pom.xml | 73 ----------------------------- common-tools/parent/pom.xml | 40 ---------------- 2 files changed, 113 deletions(-) delete mode 100644 common-tools/cnuphys/parent/pom.xml delete mode 100644 common-tools/parent/pom.xml diff --git a/common-tools/cnuphys/parent/pom.xml b/common-tools/cnuphys/parent/pom.xml deleted file mode 100644 index 3f28f73917..0000000000 --- a/common-tools/cnuphys/parent/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - 4.0.0 - cnuphys - cnuphys-clas12 - 2.0-SNAPSHOT - pom - - - - clas12maven - https://clasweb.jlab.org/clas12maven - - - - mvnrepository - http://central.maven.org/maven2/ - - - - - - com.github.spotbugs - spotbugs - 4.9.1 - - - - - - - org.apache.maven.wagon - wagon-ssh-external - 3.5.3 - - - - - - com.github.spotbugs - spotbugs-maven-plugin - 4.9.3.0 - - spotbugs-exclude.xml - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.14.0 - - UTF-8 - 21 - - - - org.apache.maven.plugins - maven-resources-plugin - 3.3.1 - - UTF-8 - - - - - - - - ssh-clasweb - scpexe://clas12@jlabl1.jlab.org/group/clas/www/clasweb/html/clas12maven - - - - diff --git a/common-tools/parent/pom.xml b/common-tools/parent/pom.xml deleted file mode 100644 index 025d59cf3c..0000000000 --- a/common-tools/parent/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - 4.0.0 - - org.jlab.clas - common-tools - 12.0.5t-SNAPSHOT - pom - - - - - clas12maven - https://clasweb.jlab.org/clas12maven - - - jnp-maven - https://clasweb.jlab.org/jhep/maven - - - - - - - org.apache.maven.wagon - wagon-ssh-external - 2.8 - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 21 - - - - - -