Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,9 @@ jobs:
- 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
run: libexec/dependency-tree.sh
- name: dependency analysis
run: libexec/dependency-analysis.sh

# documentation
#############################################################################
Expand Down Expand Up @@ -245,7 +245,7 @@ jobs:
distribution: ${{ env.java_distribution }}
- name: build coatjava javadocs # javadoc:aggregate output dir cannot be controlled, so assume the latest "standard" path and `mv` it
run: |
mvn javadoc:aggregate -pl '!org.jlab.coat:coat-libs' --no-transfer-progress
libexec/build-javadocs.sh
mv target/reports/apidocs pages/javadoc
### upload artifacts
- uses: actions/upload-pages-artifact@v4
Expand Down
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ depana:
stage: test-stage
dependencies: [build]
script:
- mvn dependency:tree -Ddetail=true --no-transfer-progress
- mvn dependency:analyze -DfailOnWarning=true -pl '!org.jlab.coat:coat-libs' --no-transfer-progress
- libexec/dependency-tree.sh
- libexec/dependency-analysis.sh

eb:
stage: test-stage
Expand Down Expand Up @@ -72,7 +72,7 @@ docs:
script:
- python3 -m pip install -r docs/mkdocs/requirements.txt
- ./docs/mkdocs/generate.sh pages
- mvn javadoc:aggregate -pl '!org.jlab.coat:coat-libs' --no-transfer-progress
- libexec/build-javadocs.sh
- mv target/reports/apidocs pages/javadoc
- mv publish pages/jacoco
artifacts:
Expand Down
7 changes: 4 additions & 3 deletions build-coatjava.sh
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,11 @@ if [ $cleanBuild == "yes" ]; then
exit
fi

# run dependency analysis and exit
if [ $anaDepends == "yes" ]; then
mvn dependency:analyze -DfailOnWarning=true -pl '!org.jlab.coat:coat-libs' --no-transfer-progress
mvn dependency:tree -Ddetail=true --no-transfer-progress
exit 0
libexec/dependency-analysis.sh
libexec/dependency-tree.sh
exit 0
fi

# start new installation tree
Expand Down
5 changes: 5 additions & 0 deletions libexec/build-javadocs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env bash
# analyze maven dependencies
# NOTE: skips `coat-libs`, the shaded JAR module
set -euo pipefail
mvn javadoc:aggregate -pl '!org.jlab.coat:coat-libs' --no-transfer-progress
5 changes: 5 additions & 0 deletions libexec/dependency-analysis.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/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
4 changes: 4 additions & 0 deletions libexec/dependency-tree.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# print the maven dependency tree
set -euo pipefail
mvn dependency:tree -Ddetail=true --no-transfer-progress