build!: cleanup dependency tree, shaded JAR, and deploy properly

.github/dependabot.yml

@@ -18,6 +18,7 @@ updates:
       - jhep
     ignore:
       - dependency-name: "org.jlab:groot" # since version numbers are not in order
+      - dependency-name: "org.ejml:ejml-simple" # keep version the same as `j4ml:j4ml-clas12:jar:0.9-SNAPSHOT`; see pull requests #636 and #632
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/issue_release.md

@@ -0,0 +1,4 @@
+---
+title: Release build failed for tag ${{ env.TAG_NAME }}
+---
+Workflow Run: {{ env.REPO_URL }}/actions/runs/{{ env.RUN_ID }}

.github/workflows/ci.yml

@@ -26,6 +26,7 @@ env:
   javadoc_version: 24 # newer than `java_version` for better javadoc
   groovy_version: 4.x
   CCDB_CONNECTION: 'sqlite:////cvmfs/oasis.opensciencegrid.org/jlab/hallb/clas12/sw/noarch/data/ccdb/ccdb_latest.sqlite'
+  nthreads: 4
 
 jobs:
 
@@ -51,35 +52,48 @@ jobs:
           cvmfs_repositories: 'oasis.opensciencegrid.org'
       - name: cvmfs
         run: ls /cvmfs/oasis.opensciencegrid.org/jlab/hallb/clas12/sw/noarch/data/ccdb/ccdb_latest.sqlite
-      - name: echo CCDB_CONNECTION
-        run: echo $CCDB_CONNECTION
+      - name: bump version to tag if tag trigger
+        if: ${{ github.ref_type == 'tag' }}
+        run: libexec/version-bump.sh ${{ github.ref_name }}
       - name: build
-        run: ./build-coatjava.sh --spotbugs --unittests --no-progress -T4
+        run: ./build-coatjava.sh --no-progress -T${{ env.nthreads }}
       - name: tar # tarball to preserve permissions
         run: tar czvf coatjava.tar.gz coatjava
       - uses: actions/upload-artifact@v4
         with:
           name: build_${{ matrix.runner }}
           retention-days: 1
           path: coatjava.tar.gz
+
+  # tests
+  #############################################################################
+
+  unit_tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          java-version: ${{ env.java_version }}
+          distribution: ${{ env.java_distribution }}
+      - uses: cvmfs-contrib/github-action-cvmfs@v5
+        with:
+          cvmfs_repositories: 'oasis.opensciencegrid.org'
+      - name: unit tests and spotbugs
+        run: ./build-coatjava.sh --spotbugs --unittests --no-progress -T${{ env.nthreads }}
       - name: collect jacoco report
-        if: ${{ matrix.runner == 'ubuntu-latest' }}
         run: validation/jacoco-aggregate.sh
       - name: publish jacoco report
-        if: ${{ matrix.runner == 'ubuntu-latest' }}
         uses: actions/upload-artifact@v4
         with:
           name: jacoco_report
           path: publish/
           retention-days: 1
 
-  # tests
-  #############################################################################
-
   test_coatjava:
     needs: [ build ]
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         runner:
           - ubuntu-latest
@@ -116,8 +130,6 @@ jobs:
           cvmfs_repositories: 'oasis.opensciencegrid.org'
       - name: untar build
         run: tar xzvf coatjava.tar.gz
-      - name: echo CCDB_CONNECTION
-        run: echo $CCDB_CONNECTION
       - name: run test
         run: |
           cd validation/advanced-tests
@@ -146,39 +158,32 @@ jobs:
       - name: test run-groovy
         run: coatjava/bin/run-groovy validation/advanced-tests/test-run-groovy.groovy
 
-  release:
+  dependency_analysis:
     needs: [ build ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ env.java_version }}
+          distribution: ${{ env.java_distribution }}
       - uses: actions/download-artifact@v4
         with:
           name: build_ubuntu-latest
-      - name: Release
-        uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          files: coatjava.tar.gz
-        env:
-          GITHUB_TOKEN:  ${{ secrets.GITHUB_TOKEN }}
-
-  final:
-    needs:
-      - build
-      - test_coatjava
-      - test_run-groovy
-      - release
-    runs-on: ubuntu-latest
-    steps:
-      - name: pass
-        run: exit 0
+      - name: untar build
+        run: tar xzvf coatjava.tar.gz
+      - name: print dependency tree
+        run: mvn dependency:tree -Ddetail=true --no-transfer-progress
+      - name: dependency analysis # note: skips `coat-libs`, since shaded JAR dependencies are "unused" according to `dependency:analyze`
+        run: mvn dependency:analyze -DfailOnWarning=true -pl '!org.jlab.coat:coat-libs' --no-transfer-progress
 
   # documentation
   #############################################################################
 
   generate_documentation:
     runs-on: ubuntu-latest
-    needs: [ build ]
+    needs: [ unit_tests ]
     steps:
       ### mkdocs
       - uses: actions/checkout@v4
@@ -198,10 +203,10 @@ jobs:
         with:
           java-version: ${{ env.javadoc_version }}
           distribution: ${{ env.java_distribution }}
-      - name: build coatjava
+      - name: build coatjava javadocs # javadoc:aggregate output dir cannot be controlled, so assume the latest "standard" path and `mv` it
         run: |
-          ./build-coatjava.sh --no-progress --docs
-          mv coatjava/share/doc/coatjava/html pages/javadoc
+          mvn javadoc:aggregate -pl '!org.jlab.coat:coat-libs' --no-transfer-progress
+          mv target/reports/apidocs pages/javadoc
       ### upload artifacts
       - uses: actions/upload-pages-artifact@v3
         with:
@@ -222,3 +227,49 @@ jobs:
       - name: deployment
         id: deployment
         uses: actions/deploy-pages@v4
+
+  # finalize
+  #############################################################################
+
+  release_build:
+    if: ${{ github.ref_type == 'tag' }}
+    needs: [ build ]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      issues: write
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      REPO_URL: ${{ github.event.repository.html_url }}
+      RUN_ID: ${{ github.run_id }}
+      TAG_NAME: ${{ github.ref_name }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+        with:
+          name: build_ubuntu-latest
+      - name: rename artifact
+        run: |
+          tar xzf coatjava.tar.gz
+          mv coatjava{,-${{ env.TAG_NAME }}}
+          tar czf coatjava-${{ env.TAG_NAME }}{.tar.gz,}
+      - name: release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: coatjava-${{ env.TAG_NAME }}.tar.gz
+      - name: open issue if failed
+        if: ${{ cancelled() || failure() }}
+        uses: JasonEtco/create-an-issue@v2
+        with:
+          filename: .github/issue_release.md
+
+  final:
+    needs:
+      - test_coatjava
+      - dependency_analysis
+      - test_run-groovy
+      - generate_documentation
+    runs-on: ubuntu-latest
+    steps:
+      - name: pass
+        run: exit 0

.gitignore

@@ -1,12 +1,16 @@
 # installed:
 /coatjava
-/myLocalMvnRepo
 target
 /publish
 /docs/javadoc/*
 /clara-home
 tmp
 
+# deployment
+/myLocalMvnRepo
+/coatjava-*.tar.gz
+dependency-reduced-pom.xml
+
 *.class
 *lundfiles*.dat
 .DS_Store

README.md

@@ -5,6 +5,7 @@
 
 - [**Documentation Homepage**](https://jeffersonlab.github.io/coatjava)
 - [API Documentation (Javadoc)](https://jeffersonlab.github.io/coatjava/javadoc)
+- [Developer notes](/docs/dev_notes.md)
 
 ----
 

bin/bg-merger

@@ -7,7 +7,7 @@ export MALLOC_ARENA_MAX=1
 split_cli $@
 
 java -Xmx1536m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.eventmerger.EventMerger \
     ${class_options[@]}
 

bin/bos2hipo

@@ -3,6 +3,6 @@
 . `dirname $0`/../libexec/env.sh
 
 java -Xms1024m -XX:+UseSerialGC \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.io.utils.Bos2HipoEventBank \
     $*

bin/cvt-compare

@@ -5,6 +5,6 @@
 export MALLOC_ARENA_MAX=1
 
 java -Xmx1536m -Xms1024m -XX:+UseSerialGC \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.rec.cvt.Geometry \
     $*

bin/daqEventViewer

@@ -3,6 +3,6 @@
 . `dirname $0`/../libexec/env.sh
 
 java -Xms1024m \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.detector.examples.RawEventViewer \
     $*

bin/dclayereffs-ana

@@ -3,6 +3,6 @@
 . `dirname $0`/../libexec/env.sh
 
 java -Dsun.java2d.pmoffscreen=false -Xmx2048m -Xms1024m \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/utils/*:$CLAS12DIR/lib/services/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.service.dc.LayerEfficiencyAnalyzer \
     $*

bin/decoder

@@ -7,7 +7,7 @@ split_cli $@
 export MALLOC_ARENA_MAX=1
 
 java -Xmx1536m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.detector.decode.CLASDecoder4 \
     ${class_options[@]}
 

bin/dict-generator

@@ -5,6 +5,6 @@
 export MALLOC_ARENA_MAX=1
 
 java -Xmx1536m -Xms1024m -XX:+UseSerialGC \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.roads.DictionaryGenerator \
     $*

bin/dict-maker

@@ -5,6 +5,6 @@
 export MALLOC_ARENA_MAX=1
 
 java -Xmx1536m -Xms1024m -XX:+UseSerialGC \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.roads.DictionaryCreator \
     $*

bin/dict-merger

@@ -5,6 +5,6 @@
 export MALLOC_ARENA_MAX=1
 
 java -Xmx1536m -Xms1024m \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.roads.DictionaryMerger \
     $*

bin/dict-validator

@@ -5,6 +5,6 @@
 export MALLOC_ARENA_MAX=1
 
 java -Xmx1536m -Xms1024m \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.roads.DictionaryValidator \
     $*

bin/evio-viewer

@@ -2,4 +2,4 @@
 
 . `dirname $0`/../libexec/env.sh
 
-java -cp "$CLAS12DIR/lib/clas/*" org.jlab.coda.eventViewer.EventTreeFrame $*
+java -cp ${COATJAVA_CLASSPATH:-''} org.jlab.coda.eventViewer.EventTreeFrame $*

bin/evio2hipo

@@ -5,6 +5,6 @@
 export MALLOC_ARENA_MAX=1
 
 java -Xmx1536m -Xms1024m -XX:+UseSerialGC \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.clas.reco.io.EvioHipoEvent4 \
     $*

bin/eviocure

@@ -5,5 +5,5 @@
 export MALLOC_ARENA_MAX=1
 
 java -Xmx1536m -Xms1024m \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.io.utils.EvioCure $*

bin/eviodump

@@ -3,6 +3,6 @@
 . `dirname $0`/../libexec/env.sh
 
 java -Xms1024m \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.io.utils.DataSourceDump \
     $*

bin/hipo-browser

@@ -3,6 +3,6 @@
 . `dirname $0`/../libexec/env.sh
 
 java -Xms1024m \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.groot.ui.TBrowser \
     $*

bin/hipo-diff

@@ -5,6 +5,6 @@
 export MALLOC_ARENA_MAX=1
 
 java -Xmx1536m -Xms1024m -XX:+UseSerialGC \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.utils.HipoDiff \
     $*

bin/hipo-json

@@ -3,6 +3,6 @@
 . `dirname $0`/../libexec/env.sh
 
 java -Xms1024m \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.utils.JsonUtils \
     $*

bin/hipo-merge-histograms

@@ -4,7 +4,7 @@
 
 split_cli $@
 
-cmd="java -Xms1024m ${jvm_options[@]} -cp $CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/* org.jlab.groot.data.TDirectory"
+cmd="java -Xms1024m ${jvm_options[@]} -cp ${COATJAVA_CLASSPATH:-''} org.jlab.groot.data.TDirectory"
 
 if [ $# -eq 0 ]; then
   echo """

bin/hipo-utils

@@ -7,7 +7,7 @@ split_cli $@
 export MALLOC_ARENA_MAX=1
 
 java -Xmx2048m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/plugins/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.jnp.hipo4.utils.HipoUtilities \
     ${class_options[@]}
 

bin/postprocess

@@ -5,6 +5,6 @@
 export MALLOC_ARENA_MAX=1
 
 java -Xmx768m -Xms768m -XX:+UseSerialGC \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.postprocess.Tag1ToEvent \
     $*

bin/rebuild-scalers

@@ -5,6 +5,6 @@
 export MALLOC_ARENA_MAX=1
 
 java -Xmx768m -Xms768m -XX:+UseSerialGC \
-    -cp "$CLAS12DIR/lib/clas/*:$CLAS12DIR/lib/services/*:$CLAS12DIR/lib/utils/*" \
+    -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.postprocess.RebuildScalers \
     $*