java 21

.github/workflows/maven.yml

@@ -21,9 +21,9 @@ defaults:
     shell: bash
 
 env:
-  java_version: 17
+  java_version: 21
   java_distribution: zulu
-  groovy_version: 4.0.3
+  groovy_version: 4.0
 
 jobs:
 

common-tools/clas-geometry/pom.xml

@@ -17,7 +17,7 @@
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
-      <version>22.0.2</version>
+      <version>24-ea+5</version>
     </dependency>
     <dependency>
       <groupId>org.jlab.ccdbrcdb</groupId>

common-tools/clas-jcsg/pom.xml

@@ -17,12 +17,12 @@
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
-      <version>22.0.2</version>
+      <version>24-ea+5</version>
     </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-fxml</artifactId>
-      <version>22.0.2</version>
+      <version>24-ea+5</version>
     </dependency>
     <dependency>
       <groupId>org.jlab.clas</groupId>

common-tools/cnuphys/parent/pom.xml

@@ -49,7 +49,7 @@
         <version>3.13.0</version>
         <configuration>
           <encoding>UTF-8</encoding>
-          <release>17</release>
+          <release>21</release>
         </configuration>
       </plugin>
       <plugin>

common-tools/coat-lib/pom.xml

@@ -187,7 +187,7 @@
               <version>3.8.0</version>
               <configuration>
                   <encoding>UTF-8</encoding>
-                  <release>17</release>
+                  <release>21</release>
               </configuration>
           </plugin>
           <plugin>

common-tools/parent/pom.xml

@@ -31,7 +31,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
-                <release>17</release>
+                <release>21</release>
             </configuration>
         </plugin>
     </plugins>

install-clara

@@ -92,13 +92,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"
 
 # Detect local COATJAVA installation and convert into an absolute path:
 if compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null
@@ -107,12 +108,11 @@ then
     echo -e "\nUsing local COATJAVA installation:\n\t$coatjava"
 elif ! [[ "$coatjava" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]
 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"
@@ -131,15 +131,15 @@ 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
 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
 mv -f clara-cre/plugins/grapes/bin/clara-grapes clara-cre/bin/

parent/pom.xml

@@ -83,7 +83,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.13.0</version>
         <configuration>
-            <release>17</release>
+            <release>21</release>
             <encoding>UTF-8</encoding>
         </configuration>
       </plugin>

reconstruction/vtx/pom.xml

@@ -16,19 +16,6 @@
     <version>11.0.5-SNAPSHOT</version>
   </parent>
 
-  <build>
-      <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <configuration>
-                  <source>1.8</source>
-                  <target>1.8</target>
-              </configuration>
-          </plugin>
-      </plugins>
-  </build>
-
   <dependencies>
     <dependency>
       <groupId>org.jlab.clas</groupId>
@@ -44,9 +31,4 @@
     </dependency>
   </dependencies>
 
-  <properties>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
-  </properties>
-
  </project>