diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8d6ab22ac..5c46dbf34e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -303,27 +303,6 @@ jobs: - name: test run-groovy run: coatjava/bin/run-groovy validation/advanced-tests/test-run-groovy.groovy - dependency_analysis: - needs: [ build ] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v6 - - name: Set up JDK - uses: actions/setup-java@v5 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: ${{ env.java_distribution }} - cache: maven - - uses: actions/download-artifact@v7 - with: - name: build_ubuntu-latest - - name: untar build - run: tar xzvf coatjava.tar.gz - - name: print dependency tree - run: libexec/dependency-tree.sh - - name: dependency analysis - run: libexec/dependency-analysis.sh - # documentation ############################################################################# @@ -413,7 +392,6 @@ jobs: final: needs: - test_coatjava - - dependency_analysis - test_run-groovy - generate_documentation runs-on: ubuntu-latest diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ed41cf162..b4cae92810 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,13 +60,6 @@ build: - coatjava.tar.gz - clara.tar.gz -.depana: - allow_failure: true - stage: build - script: - - libexec/dependency-tree.sh - - libexec/dependency-analysis.sh - download: stage: build script: diff --git a/build-coatjava.sh b/build-coatjava.sh index b0f1f34017..be368ab0d7 100755 --- a/build-coatjava.sh +++ b/build-coatjava.sh @@ -10,7 +10,6 @@ set -o pipefail ################################################################################ cleanBuild=false -anaDepends=false runSpotBugs=false downloadMaps=true downloadNets=true @@ -46,7 +45,6 @@ DATA RETRIEVAL OPTIONS TESTING OPTIONS --spotbugs also run spotbugs plugin --unittests also run unit tests - --depana run dependency analysis (only) --data download test data (requires option `--lfs`) MAVEN OPTIONS @@ -70,7 +68,10 @@ do --nonets) downloadNets=false ;; --unittests) runUnitTests=true ;; --clean) cleanBuild=true ;; - --depana) anaDepends=true ;; + --depana) + echo "ERROR: option \`$xx\` has been removed; dependency tree printout and analysis now happen automatically in the Maven build lifecycle" >&2 + exit 1 + ;; --quiet) mvnArgs+=(--quiet --batch-mode) wgetArgs+=(--quiet) @@ -86,7 +87,7 @@ do --clara) installClara=true ;; --data) downloadData=true ;; --xrootd) - echo "ERROR: option \`$xx\` is deprecated; use \`--help\` for guidance" >&2 + echo "ERROR: option \`$xx\` has been removed; use \`--help\` for guidance" >&2 exit 1 ;; -h|--help) @@ -149,13 +150,6 @@ if $cleanBuild || [ "$dataRetrieval" = "wipe" ]; then exit fi -# run dependency analysis and exit -if $anaDepends; then - libexec/dependency-analysis.sh - libexec/dependency-tree.sh - exit 0 -fi - ################################################################################ # download field maps, NN models, etc. diff --git a/common-tools/coat-libs/pom.xml b/common-tools/coat-libs/pom.xml index e677ce799b..a326c0575f 100644 --- a/common-tools/coat-libs/pom.xml +++ b/common-tools/coat-libs/pom.xml @@ -257,6 +257,15 @@ maven-deploy-plugin + + + org.apache.maven.plugins + maven-dependency-plugin + + true + + + diff --git a/libexec/dependency-analysis.sh b/libexec/dependency-analysis.sh deleted file mode 100755 index 9330057e2a..0000000000 --- a/libexec/dependency-analysis.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# analyze maven dependencies -# NOTE: skips `coat-libs`, since shaded JAR dependencies are "unused" according to `dependency:analyze` -set -euo pipefail -mvn dependency:analyze -DfailOnWarning=true -pl '!org.jlab.coat:coat-libs' --no-transfer-progress diff --git a/libexec/dependency-tree.sh b/libexec/dependency-tree.sh deleted file mode 100755 index 056976afdb..0000000000 --- a/libexec/dependency-tree.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -# print the maven dependency tree -set -euo pipefail -mvn dependency:tree -Ddetail=true --no-transfer-progress diff --git a/pom.xml b/pom.xml index 75403d19eb..62c2a0aa3d 100644 --- a/pom.xml +++ b/pom.xml @@ -251,6 +251,7 @@ + com.github.spotbugs spotbugs-maven-plugin @@ -260,6 +261,7 @@ + org.apache.maven.plugins maven-javadoc-plugin @@ -280,6 +282,7 @@ + org.apache.maven.plugins maven-compiler-plugin @@ -289,7 +292,6 @@ UTF-8 - org.apache.maven.plugins maven-resources-plugin @@ -299,6 +301,7 @@ + org.apache.maven.plugins maven-jar-plugin @@ -323,6 +326,35 @@ + + + org.apache.maven.plugins + maven-dependency-plugin + 3.10.0 + + + analyze + verify + + tree + analyze-only + + + true + + + ai.djl:model-zoo + ai.djl.pytorch:pytorch-model-zoo + ai.djl.pytorch:pytorch-engine + ai.djl.pytorch:pytorch-native-cpu + ai.djl.pytorch:pytorch-jni + + + + + + + org.apache.maven.plugins maven-enforcer-plugin @@ -347,6 +379,7 @@ + org.jacoco jacoco-maven-plugin diff --git a/reconstruction/alert/pom.xml b/reconstruction/alert/pom.xml index da37a38210..81068d3819 100644 --- a/reconstruction/alert/pom.xml +++ b/reconstruction/alert/pom.xml @@ -127,7 +127,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.9.0 + 3.10.0 copy-dependencies @@ -141,15 +141,6 @@ - - - ai.djl:model-zoo - ai.djl.pytorch:pytorch-model-zoo - ai.djl.pytorch:pytorch-engine - ai.djl.pytorch:pytorch-native-cpu - ai.djl.pytorch:pytorch-jni - -