diff --git a/.gitignore b/.gitignore index 0903b15f91..e06912d790 100644 --- a/.gitignore +++ b/.gitignore @@ -9,8 +9,8 @@ tmp # deployment /myLocalMvnRepo /coatjava-*.tar.gz -/common-tools/coat-libs/dependency-reduced-pom.xml -/common-tools/coat-libs/.flattened-pom.xml +dependency-reduced-pom.xml +.flattened-pom.xml *.class *lundfiles*.dat diff --git a/common-tools/clara-io/pom.xml b/common-tools/clara-io/pom.xml index c2d1b5d5c9..0b989ccd5d 100644 --- a/common-tools/clara-io/pom.xml +++ b/common-tools/clara-io/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + org.jlab.clas clara-io 13.0.2-SNAPSHOT @@ -8,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT diff --git a/common-tools/clas-analysis/pom.xml b/common-tools/clas-analysis/pom.xml index 925b284fec..0e1d98b757 100644 --- a/common-tools/clas-analysis/pom.xml +++ b/common-tools/clas-analysis/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + org.jlab.clas clas-analysis 13.0.2-SNAPSHOT @@ -8,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT diff --git a/common-tools/clas-decay-tools/pom.xml b/common-tools/clas-decay-tools/pom.xml index 87609a09db..ed19932f66 100644 --- a/common-tools/clas-decay-tools/pom.xml +++ b/common-tools/clas-decay-tools/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + org.jlab.clas clas-decay-tools 13.0.2-SNAPSHOT @@ -8,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT diff --git a/common-tools/clas-detector/pom.xml b/common-tools/clas-detector/pom.xml index b7db01fc92..296d885580 100644 --- a/common-tools/clas-detector/pom.xml +++ b/common-tools/clas-detector/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + org.jlab.clas clas-detector 13.0.2-SNAPSHOT @@ -8,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT diff --git a/common-tools/clas-geometry/pom.xml b/common-tools/clas-geometry/pom.xml index 643c92a4f9..7ea9b67ed5 100644 --- a/common-tools/clas-geometry/pom.xml +++ b/common-tools/clas-geometry/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + org.jlab.clas clas-geometry 13.0.2-SNAPSHOT @@ -8,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT diff --git a/common-tools/clas-io/pom.xml b/common-tools/clas-io/pom.xml index af4fe0a4dd..740ccb6485 100644 --- a/common-tools/clas-io/pom.xml +++ b/common-tools/clas-io/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + org.jlab.clas clas-io 13.0.2-SNAPSHOT @@ -8,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT diff --git a/common-tools/clas-jcsg/pom.xml b/common-tools/clas-jcsg/pom.xml index 67b1c20738..31387a98d4 100644 --- a/common-tools/clas-jcsg/pom.xml +++ b/common-tools/clas-jcsg/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + org.jlab.clas clas-jcsg 13.0.2-SNAPSHOT @@ -8,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT diff --git a/common-tools/clas-logging/pom.xml b/common-tools/clas-logging/pom.xml index 53b6efead6..67cf1b1373 100644 --- a/common-tools/clas-logging/pom.xml +++ b/common-tools/clas-logging/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + org.jlab.clas clas-logging 13.0.2-SNAPSHOT @@ -8,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT diff --git a/common-tools/clas-math/pom.xml b/common-tools/clas-math/pom.xml index 1bd328bffd..94410ff9f5 100644 --- a/common-tools/clas-math/pom.xml +++ b/common-tools/clas-math/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + org.jlab.clas clas-math 13.0.2-SNAPSHOT @@ -8,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT diff --git a/common-tools/clas-physics/pom.xml b/common-tools/clas-physics/pom.xml index 4a47907fb3..0bd837d366 100644 --- a/common-tools/clas-physics/pom.xml +++ b/common-tools/clas-physics/pom.xml @@ -9,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT diff --git a/common-tools/clas-reco/pom.xml b/common-tools/clas-reco/pom.xml index 3944457a97..19f2fdb032 100644 --- a/common-tools/clas-reco/pom.xml +++ b/common-tools/clas-reco/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + org.jlab.clas clas-reco 13.0.2-SNAPSHOT @@ -8,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT diff --git a/common-tools/clas-tracking/pom.xml b/common-tools/clas-tracking/pom.xml index 2e5a362357..2b0945c8fe 100644 --- a/common-tools/clas-tracking/pom.xml +++ b/common-tools/clas-tracking/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + org.jlab.clas clas-tracking 13.0.2-SNAPSHOT @@ -8,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT diff --git a/common-tools/clas-utils/pom.xml b/common-tools/clas-utils/pom.xml index f3ca1bdddf..6b42865d26 100644 --- a/common-tools/clas-utils/pom.xml +++ b/common-tools/clas-utils/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + org.jlab.clas clas-utils 13.0.2-SNAPSHOT @@ -8,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT diff --git a/common-tools/cnuphys/magfield/pom.xml b/common-tools/cnuphys/magfield/pom.xml index 7cde07a36c..cc2852b622 100644 --- a/common-tools/cnuphys/magfield/pom.xml +++ b/common-tools/cnuphys/magfield/pom.xml @@ -1,15 +1,15 @@ 4.0.0 + cnuphys magfield 13.0.2-SNAPSHOT jar - org.jlab.clas - coatjava - ../../../parent/pom.xml + cnuphys + clas12 13.0.2-SNAPSHOT diff --git a/common-tools/cnuphys/pom.xml b/common-tools/cnuphys/pom.xml index 51f0c40671..8c575d18bf 100644 --- a/common-tools/cnuphys/pom.xml +++ b/common-tools/cnuphys/pom.xml @@ -1,7 +1,7 @@ - 4.0.0 + cnuphys clas12 13.0.2-SNAPSHOT @@ -9,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT diff --git a/common-tools/cnuphys/snr/pom.xml b/common-tools/cnuphys/snr/pom.xml index c054da8841..bc0cce95f4 100644 --- a/common-tools/cnuphys/snr/pom.xml +++ b/common-tools/cnuphys/snr/pom.xml @@ -1,15 +1,15 @@ 4.0.0 + cnuphys snr 13.0.2-SNAPSHOT jar - org.jlab.clas - coatjava - ../../../parent/pom.xml + cnuphys + clas12 13.0.2-SNAPSHOT diff --git a/common-tools/cnuphys/splot/pom.xml b/common-tools/cnuphys/splot/pom.xml index f4694848a4..b2b2c49534 100644 --- a/common-tools/cnuphys/splot/pom.xml +++ b/common-tools/cnuphys/splot/pom.xml @@ -1,15 +1,15 @@ 4.0.0 + cnuphys splot 13.0.2-SNAPSHOT jar - org.jlab.clas - coatjava - ../../../parent/pom.xml + cnuphys + clas12 13.0.2-SNAPSHOT diff --git a/common-tools/cnuphys/swimmer/pom.xml b/common-tools/cnuphys/swimmer/pom.xml index 7405ab97a3..85869010a4 100644 --- a/common-tools/cnuphys/swimmer/pom.xml +++ b/common-tools/cnuphys/swimmer/pom.xml @@ -1,15 +1,15 @@ 4.0.0 + cnuphys swimmer 13.0.2-SNAPSHOT jar - org.jlab.clas - coatjava - ../../../parent/pom.xml + cnuphys + clas12 13.0.2-SNAPSHOT diff --git a/common-tools/coat-libs/pom.xml b/common-tools/coat-libs/pom.xml index df61d0c972..1cb68ed8f9 100644 --- a/common-tools/coat-libs/pom.xml +++ b/common-tools/coat-libs/pom.xml @@ -1,7 +1,7 @@ - 4.0.0 + org.jlab.coat coat-libs 13.0.2-SNAPSHOT @@ -9,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT @@ -244,34 +243,14 @@ - + org.codehaus.mojo flatten-maven-plugin - 1.7.1 - - fatjar - - - - flatten - package - - flatten - - - - - org.apache.maven.plugins maven-deploy-plugin - 3.1.4 - - - ${project.build.directory}/.flattened-pom.xml - @@ -280,8 +259,8 @@ - coat-libs - file://myLocalMvnRepo + ${project.artifactId} + ${coat.deployment.url} diff --git a/common-tools/pom.xml b/common-tools/pom.xml index 6337de9c3a..d6733dd67b 100644 --- a/common-tools/pom.xml +++ b/common-tools/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + org.jlab.clas common-tools 13.0.2-SNAPSHOT @@ -9,7 +10,6 @@ org.jlab.clas coatjava - ../parent/pom.xml 13.0.2-SNAPSHOT diff --git a/common-tools/swim-tools/pom.xml b/common-tools/swim-tools/pom.xml index f553692508..533a1c8df6 100644 --- a/common-tools/swim-tools/pom.xml +++ b/common-tools/swim-tools/pom.xml @@ -1,6 +1,7 @@ 4.0.0 + org.jlab.clas swim-tools 13.0.2-SNAPSHOT @@ -8,8 +9,7 @@ org.jlab.clas - coatjava - ../../parent/pom.xml + common-tools 13.0.2-SNAPSHOT diff --git a/deploy-coatjava.sh b/deploy-coatjava.sh index fad3ac98f2..5917610e13 100755 --- a/deploy-coatjava.sh +++ b/deploy-coatjava.sh @@ -140,11 +140,21 @@ log "cleanly rebuild coatjava" $src_dir/build-coatjava.sh --clean $src_dir/build-coatjava.sh -# deploy locally +# deploy locally; no need to `clean deploy`, since we have already cleaned and re-built log "local deployment of coatjava version $ver_deploy" -mvn clean deploy -f $src_dir/common-tools/coat-libs/pom.xml +pom_files=( + $src_dir/common-tools/coat-libs/pom.xml + $src_dir/reconstruction/pom.xml +) +for pom_file in ${pom_files[@]}; do + mvn deploy -Dmaven.test.skip=true -f $pom_file +done + +# make a tarball too deploy_tarball=coatjava-${ver_deploy}.tar.gz tar czf $deploy_tarball coatjava + +# say what we did print_deployment() { log "========================" log "local deployments:" @@ -154,7 +164,6 @@ print_deployment() { } print_deployment - # deploy remotely if ! $dry_run; then log "now deploying..." diff --git a/libexec/version-bump.sh b/libexec/version-bump.sh index 42fe4fa61f..3d610dd992 100755 --- a/libexec/version-bump.sh +++ b/libexec/version-bump.sh @@ -4,6 +4,6 @@ set -euo pipefail ver=$1 echo ">>> bumping version number to: $ver" pom_file=$(cd $(dirname ${BASH_SOURCE[0]:-$0})/.. && pwd -P)/pom.xml -mvn versions:set -DnewVersion=$ver -DprocessAllModules -f $pom_file -mvn versions:commit -DprocessAllModules -f $pom_file +mvn versions:set -DnewVersion=$ver -DprocessAllModules=true -f $pom_file +mvn versions:commit -DprocessAllModules=true -f $pom_file echo ">>> bumped version number to: $ver" diff --git a/parent/pom.xml b/parent/pom.xml deleted file mode 100644 index cec54d2a7b..0000000000 --- a/parent/pom.xml +++ /dev/null @@ -1,315 +0,0 @@ - - - 4.0.0 - - org.jlab.clas - coatjava - 13.0.2-SNAPSHOT - pom - - - - clas12maven - https://clasweb.jlab.org/.clas12maven - - - jnp-maven - https://clasweb.jlab.org/.jhep/maven - - - - - - - - com.github.spotbugs - spotbugs - 4.9.1 - - - - junit - junit - 4.13.2 - test - - - - org.json - json - 20250517 - - - - org.yaml - snakeyaml - 2.4 - - - - org.openjfx - javafx-base - 22.0.2 - linux - - - - org.openjfx - javafx-graphics - 22.0.2 - linux - - - - org.openjfx - javafx-fxml - 22.0.2 - linux - - - - org.slf4j - slf4j-api - 2.0.17 - - - - org.apache.commons - commons-math3 - 3.6.1 - - - - org.apache.commons - commons-lang3 - 3.17.0 - - - - org.jlab - groot - 4.0.5 - - - - org.freehep - jminuit - 1.0 - - - - org.jlab.coda - jclara - 4.3-SNAPSHOT - - - - org.jlab.coda - jevio - jar-with-dependencies - 6.2-SNAPSHOT - - - net.jpountz.lz4 - lz4-java - - - com.aha.compression - AHACompressionAPI - - - com.lmax - disruptor - - - proguard - proguard - - - - - - org.jlab.jnp - jnp-hipo - 2.0-SNAPSHOT - - - - org.jlab.jnp - jnp-hipo4 - 4.3-SNAPSHOT - - - - org.jlab.ccdbrcdb - ccdbrcdb - 2.0 - - - - gov.nist.math - jama - 1.0.3 - - - - ai.djl - bom - 0.32.0 - pom - import - - - - - - - net.objecthunter - exp4j - 0.4.8 - - - - com.google.code.gson - gson - 2.13.1 - - - - org.ejml - ejml-simple - 0.40 - - - - - - - - - - - - org.apache.maven.wagon - wagon-ssh-external - 3.5.3 - - - - - - - com.github.spotbugs - spotbugs-maven-plugin - 4.9.3.0 - - spotbugs-exclude.xml - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.11.2 - - COATJAVA - API documentation - version ${project.version} - COATJAVA - API documentation - version ${project.version} - UTF-8 - none - - - - aggregate - - aggregate - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.14.0 - - 17 - UTF-8 - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.3.1 - - UTF-8 - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.4.2 - - - - true - true - - - - ${project.name} - - ${project.groupId} - ${project.artifactId} - ${project.version} - - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.5.0 - - - enforce-dependency-convergence - - enforce - - - - - - - com.google.protobuf:protobuf-java - - - - - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.13 - - - - prepare-agent - report - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 581906e90d..d788afb382 100644 --- a/pom.xml +++ b/pom.xml @@ -1,28 +1,370 @@ - - - UTF-8 - UTF-8 - - 4.0.0 + org.jlab.clas - clas12 + coatjava 13.0.2-SNAPSHOT pom - - org.jlab.clas - coatjava - parent/pom.xml - 13.0.2-SNAPSHOT - + + UTF-8 + UTF-8 + file://myLocalMvnRepo + - parent common-tools reconstruction + + + clas12maven + https://clasweb.jlab.org/.clas12maven + + + jnp-maven + https://clasweb.jlab.org/.jhep/maven + + + + + + + + + + com.github.spotbugs + spotbugs + 4.9.1 + + + + junit + junit + 4.13.2 + test + + + + org.json + json + 20250517 + + + + org.yaml + snakeyaml + 2.4 + + + + org.openjfx + javafx-base + 22.0.2 + linux + + + + org.openjfx + javafx-graphics + 22.0.2 + linux + + + + org.openjfx + javafx-fxml + 22.0.2 + linux + + + + org.slf4j + slf4j-api + 2.0.17 + + + + org.apache.commons + commons-math3 + 3.6.1 + + + + org.apache.commons + commons-lang3 + 3.17.0 + + + + org.jlab + groot + 4.0.5 + + + + org.freehep + jminuit + 1.0 + + + + org.jlab.coda + jclara + 4.3-SNAPSHOT + + + + org.jlab.coda + jevio + jar-with-dependencies + 6.2-SNAPSHOT + + + net.jpountz.lz4 + lz4-java + + + com.aha.compression + AHACompressionAPI + + + com.lmax + disruptor + + + proguard + proguard + + + + + + org.jlab.jnp + jnp-hipo + 2.0-SNAPSHOT + + + + org.jlab.jnp + jnp-hipo4 + 4.3-SNAPSHOT + + + + org.jlab.ccdbrcdb + ccdbrcdb + 2.0 + + + + gov.nist.math + jama + 1.0.3 + + + + ai.djl + bom + 0.32.0 + pom + import + + + + + + + net.objecthunter + exp4j + 0.4.8 + + + + com.google.code.gson + gson + 2.13.1 + + + + org.ejml + ejml-simple + 0.40 + + + + + + + + + + + + + + org.apache.maven.wagon + wagon-ssh-external + 3.5.3 + + + + + + + + + com.github.spotbugs + spotbugs-maven-plugin + 4.9.3.0 + + spotbugs-exclude.xml + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.11.2 + + COATJAVA - API documentation - version ${project.version} + COATJAVA - API documentation - version ${project.version} + UTF-8 + none + + + + aggregate + + aggregate + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.14.0 + + 17 + UTF-8 + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + UTF-8 + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.4.2 + + + + true + true + + + + ${project.name} + + ${project.groupId} + ${project.artifactId} + ${project.version} + + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.5.0 + + + enforce-dependency-convergence + + enforce + + + + + + + com.google.protobuf:protobuf-java + + + + + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.13 + + + + prepare-agent + report + + + + + + + + + + + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.7.1 + + fatjar + + + + flatten + package + + flatten + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.4 + + + ${project.build.directory}/.flattened-pom.xml + + + + + + + + diff --git a/reconstruction/alert/pom.xml b/reconstruction/alert/pom.xml index 1e028b2116..bfd9fbf2bb 100644 --- a/reconstruction/alert/pom.xml +++ b/reconstruction/alert/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT @@ -130,22 +129,7 @@ - - - org.apache.maven.plugins - maven-dependency-plugin - 3.6.1 - - - 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-dependency-plugin @@ -163,10 +147,16 @@ + + + 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 + + - - - diff --git a/reconstruction/band/pom.xml b/reconstruction/band/pom.xml index 85dd299418..a8acadc83a 100644 --- a/reconstruction/band/pom.xml +++ b/reconstruction/band/pom.xml @@ -1,16 +1,15 @@ - 4.0.0 + 4.0.0 - org.jlab.clas12.detector - clas12detector-band - 13.0.2-SNAPSHOT - jar + org.jlab.clas12.detector + clas12detector-band + 13.0.2-SNAPSHOT + jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT diff --git a/reconstruction/bg/pom.xml b/reconstruction/bg/pom.xml index e73d907379..bd391ed8bd 100644 --- a/reconstruction/bg/pom.xml +++ b/reconstruction/bg/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT @@ -35,4 +34,5 @@ + diff --git a/reconstruction/cnd/pom.xml b/reconstruction/cnd/pom.xml index b001f444fd..d7e13dd912 100644 --- a/reconstruction/cnd/pom.xml +++ b/reconstruction/cnd/pom.xml @@ -1,16 +1,15 @@ - 4.0.0 + 4.0.0 - org.jlab.clas12.detector - clas12detector-cnd - 13.0.2-SNAPSHOT - jar + org.jlab.clas12.detector + clas12detector-cnd + 13.0.2-SNAPSHOT + jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT diff --git a/reconstruction/cvt/pom.xml b/reconstruction/cvt/pom.xml index d6b2c60d21..cba92aadf8 100644 --- a/reconstruction/cvt/pom.xml +++ b/reconstruction/cvt/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT diff --git a/reconstruction/dc/pom.xml b/reconstruction/dc/pom.xml index 6f8aceb206..b81b76d186 100644 --- a/reconstruction/dc/pom.xml +++ b/reconstruction/dc/pom.xml @@ -5,14 +5,12 @@ org.jlab.clas12.detector clas12detector-dc 13.0.2-SNAPSHOT - jar - org.jlab.clas - coatjava - ../../parent/pom.xml - 13.0.2-SNAPSHOT + org.jlab.clas12 + reconstruction + 13.0.2-SNAPSHOT diff --git a/reconstruction/eb/pom.xml b/reconstruction/eb/pom.xml index 6b0c774b2f..78cdd22110 100644 --- a/reconstruction/eb/pom.xml +++ b/reconstruction/eb/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT @@ -107,4 +106,5 @@ + diff --git a/reconstruction/ec/pom.xml b/reconstruction/ec/pom.xml index 21fd4d5710..c1264e449a 100644 --- a/reconstruction/ec/pom.xml +++ b/reconstruction/ec/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT diff --git a/reconstruction/fmt/pom.xml b/reconstruction/fmt/pom.xml index 948286af72..d550549ccf 100644 --- a/reconstruction/fmt/pom.xml +++ b/reconstruction/fmt/pom.xml @@ -2,17 +2,14 @@ 4.0.0 - clas12detector-fmt org.jlab.clas12.detector clas12detector-fmt 13.0.2-SNAPSHOT - jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT diff --git a/reconstruction/ft/pom.xml b/reconstruction/ft/pom.xml index 715d47cfd3..2b4bc8b073 100644 --- a/reconstruction/ft/pom.xml +++ b/reconstruction/ft/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT diff --git a/reconstruction/htcc/pom.xml b/reconstruction/htcc/pom.xml index 4db2ffd094..3bcb9f3ead 100644 --- a/reconstruction/htcc/pom.xml +++ b/reconstruction/htcc/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT diff --git a/reconstruction/ltcc/pom.xml b/reconstruction/ltcc/pom.xml index 21ed98a165..ceeca949fc 100644 --- a/reconstruction/ltcc/pom.xml +++ b/reconstruction/ltcc/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT diff --git a/reconstruction/mc/pom.xml b/reconstruction/mc/pom.xml index d1b1b127cd..32360b54ee 100644 --- a/reconstruction/mc/pom.xml +++ b/reconstruction/mc/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT diff --git a/reconstruction/mltn/pom.xml b/reconstruction/mltn/pom.xml index 8594d1906c..b76fa17027 100644 --- a/reconstruction/mltn/pom.xml +++ b/reconstruction/mltn/pom.xml @@ -1,57 +1,55 @@ - 4.0.0 + 4.0.0 - org.jlab.clas12.detector - clas12detector-mltn + org.jlab.clas12.detector + clas12detector-mltn + 13.0.2-SNAPSHOT + jar + + + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT - jar - - - - org.jlab.clas - coatjava - ../../parent/pom.xml - 13.0.2-SNAPSHOT - - - - - - org.jlab.jnp - jnp-hipo4 - - - - j4ml - j4ml-neuroph - 0.9-SNAPSHOT - - - - j4ml - j4ml-data - 0.9-SNAPSHOT - - - - j4ml - j4ml-clas12 - 0.9-SNAPSHOT - - - - org.jlab.clas - clas-io - 13.0.2-SNAPSHOT - - - - org.jlab.clas - clas-reco - 13.0.2-SNAPSHOT - - - + + + + + + org.jlab.jnp + jnp-hipo4 + + + + j4ml + j4ml-neuroph + 0.9-SNAPSHOT + + + + j4ml + j4ml-data + 0.9-SNAPSHOT + + + + j4ml + j4ml-clas12 + 0.9-SNAPSHOT + + + + org.jlab.clas + clas-io + 13.0.2-SNAPSHOT + + + + org.jlab.clas + clas-reco + 13.0.2-SNAPSHOT + + + diff --git a/reconstruction/pom.xml b/reconstruction/pom.xml index 4e9b196698..daef0aa947 100644 --- a/reconstruction/pom.xml +++ b/reconstruction/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.jlab.clas + org.jlab.clas12 reconstruction 13.0.2-SNAPSHOT pom @@ -10,7 +10,6 @@ org.jlab.clas coatjava - ../parent/pom.xml 13.0.2-SNAPSHOT @@ -39,4 +38,30 @@ postproc recoil + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + org.codehaus.mojo + flatten-maven-plugin + + + + + + + ${project.artifactId} + ${coat.deployment.url} + + + diff --git a/reconstruction/postproc/pom.xml b/reconstruction/postproc/pom.xml index 4eeaa2ae3f..8283039110 100644 --- a/reconstruction/postproc/pom.xml +++ b/reconstruction/postproc/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT @@ -35,4 +34,5 @@ + diff --git a/reconstruction/raster/pom.xml b/reconstruction/raster/pom.xml index 9ff24f2ed3..7310a5c4a0 100644 --- a/reconstruction/raster/pom.xml +++ b/reconstruction/raster/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT @@ -40,4 +39,5 @@ 13.0.2-SNAPSHOT + diff --git a/reconstruction/recoil/pom.xml b/reconstruction/recoil/pom.xml index 5d9b04632e..5f431260c1 100644 --- a/reconstruction/recoil/pom.xml +++ b/reconstruction/recoil/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT diff --git a/reconstruction/rich/pom.xml b/reconstruction/rich/pom.xml index 94fefea668..af6d00a5b7 100644 --- a/reconstruction/rich/pom.xml +++ b/reconstruction/rich/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT diff --git a/reconstruction/rtpc/pom.xml b/reconstruction/rtpc/pom.xml index c95e55a99c..ec49b1f9c5 100644 --- a/reconstruction/rtpc/pom.xml +++ b/reconstruction/rtpc/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT diff --git a/reconstruction/swaps/pom.xml b/reconstruction/swaps/pom.xml index cedecae991..66a6de11da 100644 --- a/reconstruction/swaps/pom.xml +++ b/reconstruction/swaps/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT @@ -35,4 +34,5 @@ + diff --git a/reconstruction/tof/pom.xml b/reconstruction/tof/pom.xml index 7a1a655656..d692697530 100644 --- a/reconstruction/tof/pom.xml +++ b/reconstruction/tof/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT diff --git a/reconstruction/urwell/pom.xml b/reconstruction/urwell/pom.xml index f9764f3f16..24ccca3ac8 100644 --- a/reconstruction/urwell/pom.xml +++ b/reconstruction/urwell/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT diff --git a/reconstruction/vtx/pom.xml b/reconstruction/vtx/pom.xml index e40687784d..f396abc7b4 100644 --- a/reconstruction/vtx/pom.xml +++ b/reconstruction/vtx/pom.xml @@ -8,9 +8,8 @@ jar - org.jlab.clas - coatjava - ../../parent/pom.xml + org.jlab.clas12 + reconstruction 13.0.2-SNAPSHOT