diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 0000000000..69ce3c8df3
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,28 @@
+name: deploy
+on:
+ workflow_dispatch:
+ push:
+ branches:
+ - master
+ # Ignore release tags
+ tags-ignore:
+ - hps-java-*
+
+jobs:
+ deploy:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout source code
+ uses: actions/checkout@v2
+
+ - name: Set up JDK 1.8
+ uses: actions/setup-java@v1
+ with:
+ java-version: 1.8
+
+ - name: Deploy Snapshots with Maven
+ run: mvn -B deploy -s .maven_settings.xml -DretryFailedDeploymentCount=10
+ env:
+ CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
+ CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
deleted file mode 100644
index 1f73be5758..0000000000
--- a/.github/workflows/maven.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-# Author: PF
-
-name: Java CI with Maven
-
-on:
- push:
- branches: [ master ]
- pull_request:
- branches: [ master ]
-
-jobs:
- build:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v2
- - name: Set up JDK 1.8
- uses: actions/setup-java@v1
- with:
- java-version: 1.8
- - name: Build hps-java (do not run tests)
- run: mvn clean install -DskipTests=true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000000..d82911f914
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,166 @@
+name: release
+
+permissions: write-all
+
+on:
+ workflow_dispatch:
+ inputs:
+ branch:
+ description: "Branch to use for release"
+ required: true
+ default: "master"
+ release_version:
+ description: "Release version"
+ required: true
+ default: "auto"
+ development_version:
+ description: "New development version"
+ required: true
+ default: "auto"
+ dry_run:
+ description: "Perform a dry run for testing"
+ required: false
+ type: boolean
+ default: false
+ skip_tests:
+ description: "Skip running the tests"
+ required: false
+ type: boolean
+ default: false
+ skip_javadoc:
+ description: "Skip javadoc generation"
+ required: false
+ type: boolean
+ default: true
+ quiet:
+ description: "Quiet output - only show errors"
+ required: false
+ type: boolean
+ default: false
+ generate_release_notes:
+ description: "Generate release notes"
+ required: false
+ type: boolean
+ default: true
+ deploy_site:
+ description: "Update the project website"
+ required: false
+ type: boolean
+ default: true
+ secrets:
+ SSH_PRIVATE_KEY:
+ required: true
+ CI_DEPLOY_USERNAME:
+ required: true
+ CI_DEPLOY_PASSWORD:
+ required: true
+
+jobs:
+ # TODO: Add test here for a sanity check
+ release:
+ runs-on: ubuntu-latest
+ outputs:
+ release_tag: ${{ steps.maven_release_step.outputs.release_tag }}
+ steps:
+ - name: Check release version
+ if: inputs.release_version != 'auto' && inputs.development_version == 'auto'
+ run: |
+ echo "ERROR: Release version was provided but next development version was set to auto."
+ exit 1
+
+ - name: Checkout source code
+ uses: actions/checkout@v2
+ with:
+ ref: ${{ inputs.branch }}
+
+ - name: Create Maven args file
+ run: |
+ touch .maven_args
+ echo "MAVEN_ARGS_FILE=.maven_args" >> $GITHUB_ENV
+
+ - name: Set input release version
+ if: inputs.release_version != 'auto'
+ run: |
+ echo -n "-DreleaseVersion=${{ inputs.release_version }}" >> ${{ env.MAVEN_ARGS_FILE }}
+ echo "MAVEN_RELEASE_VERSION=${{ inputs.release_version }}" >> $GITHUB_ENV
+
+ - name: Set default input release version
+ if: inputs.release_version == 'auto'
+ run: echo "MAVEN_RELEASE_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed s/-SNAPSHOT//g)" >> $GITHUB_ENV
+
+ - name: Set input development version
+ if: inputs.development_version != 'auto'
+ run: |
+ if [[ "${{ inputs.development_version}}" != *-SNAPSHOT ]]
+ then
+ echo "ERROR: Development version must end with -SNAPSHOT."
+ exit 1
+ fi
+ echo -n " -DdevelopmentVersion=${{ inputs.development_version }}" >> ${{ env.MAVEN_ARGS_FILE }}
+ shell: bash
+
+ - uses: webfactory/ssh-agent@v0.7.0
+ with:
+ ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
+ - name: Set up JDK 1.8
+ uses: actions/setup-java@v1
+ with:
+ java-version: 1.8
+
+ - name: Get email
+ id: get_email
+ uses: evvanErb/get-github-email-by-username-action@v1.25
+ with:
+ github-username: ${{ github.actor }}
+
+ - name: Configure Git user
+ run: |
+ git config user.email "${{ steps.get_email.outputs.email }}"
+ git config user.name "${{ github.actor }}"
+ echo "Username: ${{ github.actor }}"
+ echo "Email: ${{ steps.get_email.outputs.email }}"
+
+ - name: Set Maven quiet
+ if: inputs.quiet
+ run: echo -n " -q" >> ${{ env.MAVEN_ARGS_FILE }}
+
+ - name: Set Maven arguments variable
+ run: |
+ echo "Extra Maven args: $(cat ${{ env.MAVEN_ARGS_FILE }})"
+ echo "MAVEN_ARGS=$(cat ${{ env.MAVEN_ARGS_FILE }})" >> $GITHUB_ENV
+
+ - name: Perform Maven release
+ id: maven_release_step
+ run: |
+ mvn release:prepare release:perform \
+ -DdryRun=${{ inputs.dry_run }} \
+ -DskipTests=${{ inputs.skip_tests }} \
+ -Darguments="-DskipTests=${{ inputs.skip_tests }} -Dmaven.javadoc.skip=${{ inputs.skip_javadoc }} \
+ -Dmaven.site.skip=true -Dmaven.site.deploy.skip=true -DgenerateReports=false" \
+ -B -e -s .maven_settings.xml \
+ ${{ env.MAVEN_ARGS }}
+ echo "release_tag=${{ github.event.repository.name }}-${{ env.MAVEN_RELEASE_VERSION }}" >> $GITHUB_OUTPUT
+ env:
+ CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
+ CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
+
+ - name: Make Github release
+ id: github_release
+ if: ${{ !inputs.dry_run }}
+ uses: softprops/action-gh-release@v1
+ with:
+ tag_name: ${{ github.event.repository.name }}-${{ env.MAVEN_RELEASE_VERSION }}
+ name: ${{ github.event.repository.name }} ${{ env.MAVEN_RELEASE_VERSION }}
+ generate_release_notes: ${{ inputs.generate_release_notes }}
+ draft: false
+ prerelease: false
+ files: |
+ ./distribution/target/hps-distribution-${{ env.MAVEN_RELEASE_VERSION }}-bin.jar
+ site:
+ needs: release
+ if: ${{ !inputs.dry_run && inputs.deploy_site }}
+ uses: JeffersonLab/hps-java/.github/workflows/site.yml@master
+ with:
+ tag: ${{ needs.release.outputs.release_tag }}
+ secrets: inherit
diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml
new file mode 100644
index 0000000000..f3a71281a8
--- /dev/null
+++ b/.github/workflows/site.yml
@@ -0,0 +1,63 @@
+name: site
+
+permissions:
+ deployments: write
+ pages: write
+
+on:
+ workflow_call:
+ inputs:
+ tag:
+ description: "Tag to use for site deployment"
+ required: true
+ type: string
+ workflow_dispatch:
+ inputs:
+ tag:
+ description: "Tag to use for site deployment"
+ required: true
+ type: string
+
+jobs:
+ deploy-site:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout source code
+ uses: actions/checkout@v3
+ with:
+ ref: ${{ inputs.tag }}
+
+ - name: Validate tag
+ run: |
+ if [ "$(git name-rev --name-only --tags HEAD)" == "undefined" ]; then
+ echo "ERROR: Reference used as input is not a valid tag."
+ exit 1
+ fi
+
+ - uses: webfactory/ssh-agent@v0.7.0
+ with:
+ ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
+ - name: Set up JDK 1.8
+ uses: actions/setup-java@v1
+ with:
+ java-version: 1.8
+
+ - name: Get email
+ id: get_email
+ uses: evvanErb/get-github-email-by-username-action@v1.25
+ with:
+ github-username: ${{ github.actor }}
+
+ - name: Configure Git user
+ run: |
+ git config --global user.email "${{ steps.get_email.outputs.email }}"
+ git config --global user.name "${{ github.actor }}"
+ echo "Username: ${{ github.actor }}"
+ echo "Email: ${{ steps.get_email.outputs.email }}"
+
+ - name: Build project and run tests
+ run: mvn clean install verify
+
+ - name: Build and deploy the site
+ run: mvn site site:stage scm-publish:publish-scm -q
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000000..cccecf95b7
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,22 @@
+name: test
+
+on:
+ workflow_dispatch:
+ pull_request:
+ branches: [master]
+
+jobs:
+ test:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout source code
+ uses: actions/checkout@v3
+
+ - name: Set up JDK 1.8
+ uses: actions/setup-java@v1
+ with:
+ java-version: 1.8
+
+ - name: Build and run tests
+ run: |
+ mvn -B install -T4
diff --git a/.gitignore b/.gitignore
index 254e982cd0..0ee10663da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,9 @@ target/
# editor swap files
.*.swp
+
+# local Maven repository
+.m2repo
+
+# ignore user VS Code settings
+.vscode
diff --git a/.maven_settings.xml b/.maven_settings.xml
new file mode 100644
index 0000000000..b7afd695ce
--- /dev/null
+++ b/.maven_settings.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ lcsim-repo-releases
+ ${env.CI_DEPLOY_USERNAME}
+ ${env.CI_DEPLOY_PASSWORD}
+
+
+ lcsim-repo-snapshots
+ ${env.CI_DEPLOY_USERNAME}
+ ${env.CI_DEPLOY_PASSWORD}
+
+
+
\ No newline at end of file
diff --git a/analysis/pom.xml b/analysis/pom.xml
index af7f983b20..51df23cccc 100644
--- a/analysis/pom.xml
+++ b/analysis/pom.xml
@@ -1,21 +1,25 @@
4.0.0
+
hps-analysis
analysis
common analysis code
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
org.hps
hps-recon
+
@@ -29,4 +33,5 @@
-
+
+
\ No newline at end of file
diff --git a/conditions/pom.xml b/conditions/pom.xml
index aa3bc64001..06673b7f27 100644
--- a/conditions/pom.xml
+++ b/conditions/pom.xml
@@ -1,15 +1,18 @@
4.0.0
+
hps-conditions
conditions
extensions to the org.lcsim conditions framework
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
@@ -23,6 +26,7 @@
+
org.hps
@@ -40,13 +44,11 @@
mysql
mysql-connector-java
- 5.1.26
runtime
org.xerial
sqlite-jdbc
- 3.25.2
runtime
@@ -56,7 +58,7 @@
org.apache.commons
commons-csv
- 1.1
-
+
+
\ No newline at end of file
diff --git a/deps.sh b/deps.sh
deleted file mode 100755
index 9abc1e9b1d..0000000000
--- a/deps.sh
+++ /dev/null
@@ -1 +0,0 @@
-mvn dependency:tree -DoutputFile=deps.txt
diff --git a/detector-data/pom.xml b/detector-data/pom.xml
index 7520c632b0..6170b67efb 100644
--- a/detector-data/pom.xml
+++ b/detector-data/pom.xml
@@ -1,15 +1,18 @@
4.0.0
+
hps-detector-data
detector-data
detector conditions data including text based conditions and compact XML files
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
@@ -22,4 +25,5 @@
-
+
+
\ No newline at end of file
diff --git a/detector-model/pom.xml b/detector-model/pom.xml
index d70af3f9a7..64b34dc79a 100644
--- a/detector-model/pom.xml
+++ b/detector-model/pom.xml
@@ -4,12 +4,14 @@
hps-detector-model
detector-model
detector modeling code based on lcsim framework
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
@@ -50,6 +52,7 @@
+
org.hps
@@ -60,4 +63,5 @@
hps-detector-data
-
+
+
\ No newline at end of file
diff --git a/digi/pom.xml b/digi/pom.xml
index 08cde301b8..c0454392a8 100644
--- a/digi/pom.xml
+++ b/digi/pom.xml
@@ -10,7 +10,7 @@
../pom.xml
5.2.1-SNAPSHOT
-
+
org.hps
@@ -21,7 +21,7 @@
hps-recon
-
+
-
+
\ No newline at end of file
diff --git a/distribution/pom.xml b/distribution/pom.xml
index e84673b532..1b9285cd98 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -1,20 +1,24 @@
4.0.0
+
hps-distribution
distribution
module for creating a standalone runnable bin jar for HPS Java
+
true
${maven.build.timestamp}
yyyy-MM-dd HH:mm
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
install
@@ -24,6 +28,12 @@
+
+ maven-deploy-plugin
+
+ false
+
+
org.apache.maven.plugins
maven-shade-plugin
@@ -34,6 +44,7 @@
shade
+ false
true
bin
@@ -64,7 +75,6 @@
org.codehaus.mojo
appassembler-maven-plugin
- 1.10
install
@@ -120,6 +130,7 @@
+
org.hps
@@ -154,4 +165,5 @@
hps-digi
-
+
+
\ No newline at end of file
diff --git a/ecal-readout-sim/pom.xml b/ecal-readout-sim/pom.xml
index 120b302e85..3b0112dba6 100644
--- a/ecal-readout-sim/pom.xml
+++ b/ecal-readout-sim/pom.xml
@@ -1,15 +1,18 @@
4.0.0
+
hps-ecal-readout-sim
ecal-readout-sim
MC readout simulation
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
org.hps
@@ -20,4 +23,5 @@
hps-conditions
-
+
+
\ No newline at end of file
diff --git a/ecal-recon/pom.xml b/ecal-recon/pom.xml
index 834c650b89..e89de9beb9 100644
--- a/ecal-recon/pom.xml
+++ b/ecal-recon/pom.xml
@@ -1,15 +1,18 @@
4.0.0
+
hps-ecal-recon
ecal-recon
ECAL reconstruction algorithms
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
org.hps
@@ -20,4 +23,5 @@
hps-record-util
-
+
+
\ No newline at end of file
diff --git a/evio/pom.xml b/evio/pom.xml
index 0733afe491..e2341981a6 100644
--- a/evio/pom.xml
+++ b/evio/pom.xml
@@ -1,15 +1,18 @@
4.0.0
+
hps-evio
evio
EVIO utilities including EVIO to LCIO event builders
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
org.hps
@@ -28,6 +31,7 @@
hps-logging
+
@@ -42,4 +46,5 @@
-
+
+
\ No newline at end of file
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index cacde2ede9..bc2ebeb9e8 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -1,14 +1,17 @@
4.0.0
+
hps-integration-tests
integration-tests
integration test suite
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
org.hps
@@ -29,9 +32,7 @@
- org.apache.maven.plugins
maven-failsafe-plugin
- 2.19.1
false
-server -Xmx2g
@@ -69,4 +70,5 @@
-
+
+
\ No newline at end of file
diff --git a/job/pom.xml b/job/pom.xml
index c90246537e..37135c6fc0 100644
--- a/job/pom.xml
+++ b/job/pom.xml
@@ -1,14 +1,17 @@
4.0.0
+
hps-job
job
job processing
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
org.hps
@@ -19,4 +22,5 @@
lcsim-job-manager
-
+
+
\ No newline at end of file
diff --git a/logging/pom.xml b/logging/pom.xml
index 274d6d5394..ae1c8518e7 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -1,14 +1,17 @@
4.0.0
+
hps-logging
logging
global logging configuration
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
@@ -22,4 +25,5 @@
-
+
+
\ No newline at end of file
diff --git a/logging/src/main/resources/log4j.properties b/logging/src/main/resources/log4j.properties
new file mode 100644
index 0000000000..f1714d1514
--- /dev/null
+++ b/logging/src/main/resources/log4j.properties
@@ -0,0 +1,10 @@
+# Boilerplate log4j config to get rid of warning messages during the ITs
+log4j.rootLogger=WARN, file, console
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+logrj.appender.console.Target=System.out
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=/dev/null
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d %d{Z} [%t] %-5p (%F:%L) - %m%n
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %c{1} - %m%n
\ No newline at end of file
diff --git a/online-monitoring/pom.xml b/online-monitoring/pom.xml
index 7ef0d189d2..b750643eee 100644
--- a/online-monitoring/pom.xml
+++ b/online-monitoring/pom.xml
@@ -1,14 +1,17 @@
4.0.0
+
hps-online-monitoring
online-monitoring
online monitoring tools
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
@@ -22,6 +25,7 @@
+
org.hps
@@ -50,7 +54,7 @@
com.itextpdf
itextpdf
- 5.5.12
-
+
+
\ No newline at end of file
diff --git a/online-recon/pom.xml b/online-recon/pom.xml
index 394be8d10b..ecf4779ca1 100644
--- a/online-recon/pom.xml
+++ b/online-recon/pom.xml
@@ -3,12 +3,14 @@
hps-online-recon
online-recon
online recon tools
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
org.hps
@@ -29,48 +31,38 @@
org.json
json
- 20180813
-
commons-io
commons-io
- 2.6
org.freehep
freehep-jaida-remote
- 3.4.13
-
org.sonatype.nexus
google-guava-eventbus
- 3.2.0-01
org.java-websocket
Java-WebSocket
- 1.5.2
org.slf4j
slf4j-api
- 1.7.5
org.slf4j
slf4j-log4j12
- 1.7.5
+
-
org.codehaus.mojo
appassembler-maven-plugin
- 1.10
install
@@ -95,7 +87,8 @@
1g
128m
- java.util.logging.config.class=org.hps.online.recon.logging.ServerLoggingConfig
+
+ java.util.logging.config.class=org.hps.online.recon.logging.ServerLoggingConfig
-XX:+UnlockExperimentalVMOptions
@@ -114,7 +107,8 @@
200m
- java.util.logging.config.class=org.hps.online.recon.logging.ClientLoggingConfig
+
+ java.util.logging.config.class=org.hps.online.recon.logging.ClientLoggingConfig
@@ -124,7 +118,8 @@
1g
- java.util.logging.config.class=org.hps.online.recon.logging.LoggingConfig
+
+ java.util.logging.config.class=org.hps.online.recon.logging.LoggingConfig
@@ -140,4 +135,5 @@
-
+
+
\ No newline at end of file
diff --git a/plugin/pom.xml b/plugin/pom.xml
index 5eee4b2cf6..9c89800702 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -3,12 +3,14 @@
hps-plugin
plugin
JAS3 Plugin
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
@@ -47,7 +49,8 @@
https://srs.slac.stanford.edu/nexus/content/groups/lcsim-maven2-public/
- https://srs.slac.stanford.edu/nexus/service/local/artifact/maven/redirect?r=lcsim-maven2-public
+
+ https://srs.slac.stanford.edu/nexus/service/local/artifact/maven/redirect?r=lcsim-maven2-public
@@ -68,6 +71,7 @@
+
org.hps
@@ -86,47 +90,5 @@
lcsim-event-heprep
-
-
-
- test-release
-
-
-
- org.freehep
- freehep-jas-plugin
-
- true
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index cc589b069f..12a33009da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,39 +1,43 @@
4.0.0
+
hps-java
org.hps
pom
5.2.1-SNAPSHOT
HPS Java
HPS Java Maven Project
- http://www.lcsim.org/sites/hps/
-
+ https://jeffersonlab.github.io/hps-java/
+
+
+ Heavy Photon Search (HPS)
+ https://confluence.slac.stanford.edu/display/hpsg/Heavy+Photon+Search+Experiment
+
+
- hps-java-github
+ 1.8
+ false
+ true
+ true
+ 4.4.0
+ 14.1
+ 4.4.6
+ 4.13.1
+ github
UTF-8
UTF-8
false
- 4.4.0
- false
- false
- -Xdoclint:none
false
- 4.13.1
- 14.1
- 2.5.3
-
+
- scm:git:ssh://git@github.com:JeffersonLab/hps-java.git
- scm:git:ssh://git@github.com/JeffersonLab/hps-java.git
- https://github.com/jeffersonlab/hps-java
+ https://github.com/JeffersonLab/hps-java.git
+ scm:git:${project.scm.url}
+ scm:git:git@github.com:JeffersonLab/hps-java.git
HEAD
+
-
- lcsim-site
- dav:https://srs.slac.stanford.edu/nexus/content/sites/lcsim-site/hps/
-
lcsim-repo-releases
LCSIM Releases maven repository
@@ -44,7 +48,12 @@
LCSIM Snapshots maven repository
https://srs.slac.stanford.edu/nexus/content/repositories/lcsim-maven2-snapshot/
+
+ github
+ scm:git:${project.scm.url}
+
+
maven-central-repo
@@ -77,7 +86,7 @@
CODA
https://coda.jlab.org/maven/
-
+
glassfish-repo
Glassfish repository
@@ -89,7 +98,31 @@
false
+
+ codehaus-repo
+ Codehaus Repository
+ http://repository.codehaus.org/
+
+ false
+
+
+ false
+
+
+
+ codehaus-snapshot-repo
+ Codehaus Repository
+ http://snapshots.repository.codehaus.org/
+
+ false
+
+
+ false
+
+
+
+
freehep-maven-plugin-repo
@@ -102,6 +135,7 @@
https://repo1.maven.org/maven2/
+
analysis
conditions
@@ -124,6 +158,7 @@
util
integration-tests
+
junit
@@ -132,6 +167,7 @@
test
+
@@ -242,12 +278,12 @@
org.jlab.coda
jevio
- 4.4.6
+ ${evioVersion}
org.jlab.coda
et
-
+
${etVersion}
@@ -284,17 +320,78 @@
junit
junit
${junitVersion}
-
+
org.jdom
jdom
1.1
-
+
commons-cli
commons-cli
1.3
+
+ org.apache.commons
+ commons-csv
+ 1.1
+
+
+ com.itextpdf
+ itextpdf
+ 5.5.12
+
+
+ org.sonatype.nexus
+ google-guava-eventbus
+ 3.2.0-01
+
+
+ org.java-websocket
+ Java-WebSocket
+ 1.5.2
+
+
+ org.slf4j
+ slf4j-api
+ 1.7.5
+
+
+ org.slf4j
+ slf4j-log4j12
+ 1.7.5
+
+
+ org.json
+ json
+ 20180813
+
+
+ commons-io
+ commons-io
+ 2.6
+
+
+ org.freehep
+ freehep-jaida-remote
+ 3.4.13
+
+
+ jdom
+ jdom
+
+
+
+
+ mysql
+ mysql-connector-java
+ 5.1.26
+
+
+ org.xerial
+ sqlite-jdbc
+ 3.25.2
+
org.lcsim
@@ -323,15 +420,15 @@
- org.lcsim
- lcsim-job-manager
- ${lcsimVersion}
-
-
- jdom
- jdom
-
-
+ org.lcsim
+ lcsim-job-manager
+ ${lcsimVersion}
+
+
+ jdom
+ jdom
+
+
org.lcsim
@@ -368,97 +465,114 @@
+
install
-
-
- org.apache.maven.wagon
- wagon-webdav-jackrabbit
- 2.8
-
-
- org.apache.maven.plugins
- maven-eclipse-plugin
- 2.9
+ maven-compiler-plugin
+ 3.11.0
- org.apache.maven.plugins
- maven-deploy-plugin
- 2.8.2
+ maven-clean-plugin
+ 3.2.0
- maven-antrun-plugin
- 1.8
+ maven-release-plugin
+ 3.0.0
+
+
+ maven-surefire-plugin
+ 3.0.0
+
+
+ maven-failsafe-plugin
+ 3.0.0
- org.eclipse.m2e
- lifecycle-mapping
- 1.0.0
+ maven-deploy-plugin
+ 3.1.1
+
+
+ maven-site-plugin
+ 4.0.0-M6
-
-
-
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
-
- [2.17,)
-
-
- check
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
- [1.7,)
-
- run
-
-
-
-
- false
-
-
-
-
-
+ ${project.basedir}/site
+
+ true
+
+ maven-scm-publish-plugin
+ 3.2.1
+
+
+ maven-antrun-plugin
+ 3.1.0
+
+
+ maven-shade-plugin
+ 3.4.1
+
+
+ maven-resources-plugin
+ 3.0.2
+
+
+ maven-checkstyle-plugin
+ 3.2.1
+
+
+ maven-project-info-reports-plugin
+ 3.4.2
+
+
+ maven-jxr-plugin
+ 3.3.0
+
+
+ maven-javadoc-plugin
+ 3.5.0
+
+
+ org.codehaus.mojo
+ appassembler-maven-plugin
+ 1.10
+
- org.apache.maven.plugins
- maven-scm-plugin
- 1.9.5
+ maven-compiler-plugin
- connection
+
+ ${javaVersion}
+ true
+ true
- maven-compiler-plugin
- 3.6.1
+ maven-release-plugin
-
- 1.8
- true
- true
+ [hps-release skip]
+
+
+
+ maven-deploy-plugin
+
+ true
+
+
+
+ maven-scm-publish-plugin
+
+ gh-pages
+ ${project.scm.developerConnection}
- org.apache.maven.plugins
maven-surefire-plugin
- 2.19.1
false
false
@@ -472,15 +586,6 @@
- org.apache.maven.plugins
- maven-release-plugin
- ${maven-release-plugin.version}
-
- [hps-release skip]
-
-
-
- org.apache.maven.plugins
maven-antrun-plugin
@@ -497,19 +602,9 @@
- org.apache.maven.plugins
- maven-shade-plugin
- 3.0.0
-
-
- maven-resources-plugin
- 3.0.2
-
-
- org.apache.maven.plugins
maven-checkstyle-plugin
- 2.17
+ ${skipCheckstyle}
true
true
true
@@ -543,72 +638,58 @@
+
- org.apache.maven.plugins
maven-site-plugin
- 3.6
- ${basedir}/site/src/site
${project.build.directory}/site
false
true
true
true
${skipSite}
- ${skipSite}
+ true
- org.apache.maven.plugins
maven-project-info-reports-plugin
- 2.9
false
false
- non-aggregate
-
- dependencies
- index
- scm
- summary
-
+
+ true
+
aggregate
false
- cim
- dependency-convergence
+ ci-management
index
- issue-tracking
- mailing-list
- modules
- plugin-management
- plugins
- project-team
+ issue-management
+ mailing-lists
+ scm
+ summary
+ team
-
+
- org.apache.maven.plugins
maven-jxr-plugin
- 2.5
true
- non-aggregate
-
- jxr
- test-jxr
-
+
+ true
+
aggregate
@@ -618,30 +699,27 @@
test-aggregate
-
+
- org.apache.maven.plugins
maven-javadoc-plugin
- 2.10.4
- non-aggregate
-
- javadoc
- test-javadoc
-
-
+
+ true
+
+
aggregate
false
aggregate
+ test-aggregate
-
+
-
+
private
true
true
@@ -650,17 +728,24 @@
false
-Xdoclint:none
+ http://www.lcsim.org/sites/lcsim/apidocs/
http://java.freehep.org/freehep-physics/apidocs/
http://java.freehep.org/heprep/apidocs/
- http://www.jdom.org/docs/apidocs/
- http://www.lcsim.org/sites/lcsim/apidocs/index.html
- https://coda.jlab.org/drupal/content/evio-java-api-javadoc
- https://coda.jlab.org/drupal/system/files/coda/et/et-16.1-docs/javadoc/
+ https://javadoc.io/doc/org.jdom/jdom/1.1/
+ https://junit.org/junit4/javadoc/4.13/
+
+
Jeremy McCormick
@@ -732,16 +817,6 @@
-8
-
- Sho Uemura
- meeg@slac.stanford.edu
- SLAC National Accelerator Laboratory
- http://www.slac.stanford.edu/
-
- developer
-
- -8
-
Omar Moreno
omoreno1@ucsc.edu
@@ -751,26 +826,6 @@
-8
-
- Per Hansson
- phansson@slac.stanford.edu
- SLAC National Accelerator Laboratory
- http://www.slac.stanford.edu/
-
- developer
-
- -8
-
-
- Holly Szumila-Vance
- hvanc001@odu.edu
- Old Dominion University
- http://www.odu.edu/physics/
-
- developer
-
- -5
-
Andrea Celentano
andrea.celentano@ge.infn.it
@@ -791,20 +846,8 @@
-5
-
- Sebouh Paul
- sebouh.paul@gmail.com
- Thomas Jefferson National Accelerator Laboratory
- http://www.jlab.org/
-
- developer
-
- -5
-
- SebouhPaul314
-
-
+
hps-software
@@ -814,14 +857,17 @@
https://listserv.slac.stanford.edu/cgi-bin/wa?A0=HPS-SOFTWARE
+
Github
https://github.com/JeffersonLab/hps-java/issues/
+
- Jenkins
- http://srs.slac.stanford.edu/hudson/view/HPS/
+ Github Actions
+ https://github.com/JeffersonLab/hps-java/actions
+
default-cache-dir
@@ -834,14 +880,6 @@
${user.home}
-
- no-plugin
-
- false
-
-
- true
-
-
+
diff --git a/recon/pom.xml b/recon/pom.xml
index 8bdf6f3de0..18476fb9b3 100644
--- a/recon/pom.xml
+++ b/recon/pom.xml
@@ -1,15 +1,18 @@
4.0.0
+
hps-recon
recon
reconstruction algorithms
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
@@ -21,6 +24,7 @@
lcsim-vertexing
+
@@ -34,4 +38,5 @@
-
+
+
\ No newline at end of file
diff --git a/record-util/pom.xml b/record-util/pom.xml
index 8766ce25dc..3310cb1c27 100644
--- a/record-util/pom.xml
+++ b/record-util/pom.xml
@@ -1,14 +1,17 @@
4.0.0
+
hps-record-util
record-util
record processing utilities for EVIO, LCIO and ET events
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
@@ -22,6 +25,7 @@
+
org.jlab.coda
@@ -36,4 +40,5 @@
hps-conditions
-
+
+
\ No newline at end of file
diff --git a/site/src/site/apt/index.apt b/site/apt/index.apt
similarity index 100%
rename from site/src/site/apt/index.apt
rename to site/apt/index.apt
diff --git a/site/src/site/apt/install.apt b/site/apt/install.apt
similarity index 100%
rename from site/src/site/apt/install.apt
rename to site/apt/install.apt
diff --git a/site/src/site/apt/wiki.apt b/site/apt/wiki.apt
similarity index 100%
rename from site/src/site/apt/wiki.apt
rename to site/apt/wiki.apt
diff --git a/site/build.sh b/site/build.sh
deleted file mode 100755
index 315d995126..0000000000
--- a/site/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-rm -rf /scratch/hps_site/
-mvn clean site:site site:stage -DstagingDirectory=/scratch/hps_site/
diff --git a/site/site.xml b/site/site.xml
new file mode 100644
index 0000000000..8d9b1198c0
--- /dev/null
+++ b/site/site.xml
@@ -0,0 +1,49 @@
+
+
+
+
+ org.apache.maven.skins
+ maven-fluido-skin
+ 1.11.1
+
+
+
+ HPS
+ https://confluence.slac.stanford.edu/download/attachments/84248493/heavy_photon_logo_50.jpg
+ https://jeffersonlab.github.io/hps-java/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/site/src/site/site.xml b/site/src/site/site.xml
deleted file mode 100644
index b5dbebcd2f..0000000000
--- a/site/src/site/site.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/steering-files/pom.xml b/steering-files/pom.xml
index c8d248c02a..67b1698c47 100644
--- a/steering-files/pom.xml
+++ b/steering-files/pom.xml
@@ -1,15 +1,18 @@
4.0.0
+
hps-steering-files
steering-files
org.lcsim XML steering file resources
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
@@ -29,4 +32,5 @@
-
+
+
\ No newline at end of file
diff --git a/tracking/pom.xml b/tracking/pom.xml
index 3af26fdc7a..d5755749f0 100644
--- a/tracking/pom.xml
+++ b/tracking/pom.xml
@@ -1,15 +1,18 @@
4.0.0
+
hps-tracking
tracking
tracking reconstruction algorithms
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
@@ -23,6 +26,7 @@
+
org.hps
@@ -51,4 +55,5 @@
lcsim-tracking
-
+
+
\ No newline at end of file
diff --git a/util/pom.xml b/util/pom.xml
index 69056c2629..ef185f1e7c 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -1,14 +1,17 @@
4.0.0
+
hps-util
util
various utility classes
+
org.hps
hps-java
../pom.xml
5.2.1-SNAPSHOT
+
org.apache.commons
@@ -35,4 +38,5 @@
lcsim-tracking
-
+
+
\ No newline at end of file