From 2eb0b654507b4c4c6b0b62d920e47b6b76b13d34 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Wed, 13 Dec 2023 20:50:11 -0500 Subject: [PATCH] DRYD-1268: UCB Maven Contribs (#383) Co-authored-by: Richard Millet --- .../nuxeo-platform-elasticsearch/pom.xml | 1 - build.properties | 2 +- pom.xml | 36 ++++++++++++++++-- services/JaxRsServiceProvider/pom.xml | 4 ++ services/acquisition/jaxb/pom.xml | 4 ++ services/authority/jaxb/pom.xml | 27 ++----------- services/authorization-mgt/service/pom.xml | 4 ++ services/authorization/jaxb/pom.xml | 4 ++ services/batch/jaxb/pom.xml | 4 ++ services/blob/jaxb/pom.xml | 4 ++ services/citation/client/pom.xml | 2 - services/citation/jaxb/pom.xml | 4 ++ services/citation/pom.xml | 11 +----- services/claim/jaxb/pom.xml | 4 ++ services/collectionobject/jaxb/pom.xml | 4 ++ .../lib/slf4j/jcl-over-slf4j-1.7.25.jar | Bin 16515 -> 0 bytes .../lib/slf4j/jcl-over-slf4j-1.7.32.jar | Bin 0 -> 16630 bytes .../common/lib/slf4j/slf4j-api-1.7.25.jar | Bin 41203 -> 0 bytes .../common/lib/slf4j/slf4j-api-1.7.32.jar | Bin 0 -> 41513 bytes services/common/pom.xml | 9 ++++- services/concept/jaxb/pom.xml | 4 ++ services/concept/pom.xml | 11 +----- services/conditioncheck/jaxb/pom.xml | 4 ++ services/config/pom.xml | 9 ++++- services/conservation/jaxb/pom.xml | 4 ++ services/contact/jaxb/pom.xml | 4 ++ services/dimension/jaxb/pom.xml | 4 ++ services/exhibition/jaxb/pom.xml | 4 ++ services/group/jaxb/pom.xml | 4 ++ services/hyperjaxb/pom.xml | 5 ++- services/id/jaxb/pom.xml | 5 ++- services/imports/jaxb/pom.xml | 4 ++ services/index/jaxb/pom.xml | 4 ++ services/intake/jaxb/pom.xml | 4 ++ services/jaxb/pom.xml | 4 ++ services/loanin/jaxb/pom.xml | 4 ++ services/loanout/jaxb/pom.xml | 4 ++ services/location/client/pom.xml | 2 - services/location/jaxb/pom.xml | 4 ++ services/location/pom.xml | 11 +----- services/material/client/pom.xml | 2 - services/material/jaxb/pom.xml | 4 ++ services/material/pom.xml | 11 +----- services/material/service/pom.xml | 2 - services/media/jaxb/pom.xml | 4 ++ services/movement/jaxb/pom.xml | 4 ++ services/note/jaxb/pom.xml | 4 ++ services/objectexit/jaxb/pom.xml | 4 ++ services/organization/jaxb/pom.xml | 15 +++++--- services/osteology/jaxb/pom.xml | 4 ++ services/person/jaxb/pom.xml | 4 ++ services/place/client/pom.xml | 2 - services/place/jaxb/pom.xml | 19 +++------ services/place/pom.xml | 11 +----- services/place/service/pom.xml | 2 - services/pom.xml | 24 ++++++++++++ .../services/PottagJAXBSchema.class | Bin 442 -> 0 bytes .../services/PottagListItemJAXBSchema.class | Bin 399 -> 0 bytes services/pottag/jaxb/pom.xml | 4 ++ .../jaxb/bin/META-INF/sun-jaxb.episode | 34 ----------------- .../services/PropagationJAXBSchema.class | Bin 429 -> 0 bytes .../PropagationListItemJAXBSchema.class | Bin 441 -> 0 bytes .../services/propagation/ObjectFactory.class | Bin 1791 -> 0 bytes .../propagation/PropActivityGroup.class | Bin 7148 -> 0 bytes .../propagation/PropActivityGroupList.class | Bin 3282 -> 0 bytes .../propagation/PropagationsCommon.class | Bin 10621 -> 0 bytes .../services/propagation/ScarStratGroup.class | Bin 4091 -> 0 bytes .../propagation/ScarStratGroupList.class | Bin 3258 -> 0 bytes .../propagation/StructuredDateGroup.class | Bin 13057 -> 0 bytes .../services/propagation/package-info.class | Bin 293 -> 0 bytes services/propagation/jaxb/pom.xml | 4 ++ services/publicitem/jaxb/pom.xml | 4 ++ services/report/jaxb/pom.xml | 4 ++ services/servicegroup/jaxb/pom.xml | 4 ++ services/structureddate/jaxb/pom.xml | 4 ++ services/systeminfo/jaxb/pom.xml | 4 ++ services/taxonomy/jaxb/pom.xml | 4 ++ services/uoc/jaxb/pom.xml | 4 ++ services/valuationcontrol/jaxb/pom.xml | 4 ++ services/vocabulary/jaxb/pom.xml | 4 ++ services/work/client/pom.xml | 2 - services/work/jaxb/pom.xml | 19 +++------ services/work/pom.xml | 11 +----- services/work/service/pom.xml | 2 - services/workflow/jaxb/pom.xml | 4 ++ 85 files changed, 280 insertions(+), 175 deletions(-) delete mode 100644 services/common/lib/slf4j/jcl-over-slf4j-1.7.25.jar create mode 100644 services/common/lib/slf4j/jcl-over-slf4j-1.7.32.jar delete mode 100644 services/common/lib/slf4j/slf4j-api-1.7.25.jar create mode 100644 services/common/lib/slf4j/slf4j-api-1.7.32.jar delete mode 100644 services/pottag/jaxb/bin/org/collectionspace/services/PottagJAXBSchema.class delete mode 100644 services/pottag/jaxb/bin/org/collectionspace/services/PottagListItemJAXBSchema.class delete mode 100644 services/propagation/jaxb/bin/META-INF/sun-jaxb.episode delete mode 100644 services/propagation/jaxb/bin/org/collectionspace/services/PropagationJAXBSchema.class delete mode 100644 services/propagation/jaxb/bin/org/collectionspace/services/PropagationListItemJAXBSchema.class delete mode 100644 services/propagation/jaxb/bin/org/collectionspace/services/propagation/ObjectFactory.class delete mode 100644 services/propagation/jaxb/bin/org/collectionspace/services/propagation/PropActivityGroup.class delete mode 100644 services/propagation/jaxb/bin/org/collectionspace/services/propagation/PropActivityGroupList.class delete mode 100644 services/propagation/jaxb/bin/org/collectionspace/services/propagation/PropagationsCommon.class delete mode 100644 services/propagation/jaxb/bin/org/collectionspace/services/propagation/ScarStratGroup.class delete mode 100644 services/propagation/jaxb/bin/org/collectionspace/services/propagation/ScarStratGroupList.class delete mode 100644 services/propagation/jaxb/bin/org/collectionspace/services/propagation/StructuredDateGroup.class delete mode 100644 services/propagation/jaxb/bin/org/collectionspace/services/propagation/package-info.class diff --git a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml index 0db70f89f..f32a31cc2 100644 --- a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml +++ b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/pom.xml @@ -19,7 +19,6 @@ org.nuxeo.ecm.core nuxeo-core-api - ${nuxeo.core.version} org.nuxeo.ecm.automation diff --git a/build.properties b/build.properties index aa0fe54f4..ddfe6f4a9 100644 --- a/build.properties +++ b/build.properties @@ -60,7 +60,7 @@ dist.deploy.nuxeo.system=${dist.deploy.nuxeo}/${nuxeo.system} dist.deploy.nuxeo.plugins=${dist.deploy.nuxeo}/${nuxeo.plugins} #JEE Application Server -jee.release=apache-tomcat-8.5.40 +jee.release=apache-tomcat-8.5.51 jee.dir=${env.CSPACE_JEESERVER_HOME} jee.home=${jee.dir} jee.bin=${jee.home}/bin diff --git a/pom.xml b/pom.xml index 5a7f39845..9742f134d 100644 --- a/pom.xml +++ b/pom.xml @@ -326,6 +326,32 @@ + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.codehaus.mojo + flatten-maven-plugin + [1.1.0,) + + flatten + + + + + false + + + + + + + @@ -333,7 +359,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.1.0 + 1.2.2 true @@ -358,7 +384,7 @@ before we perform any build related tasks. --> maven-antrun-plugin - 1.7 + 1.8 check-environment-vars @@ -426,7 +452,7 @@ org.slf4j slf4j-api - 1.7.21 + 1.7.32 provided @@ -472,6 +498,10 @@ xml-apis xml-apis + + xalan + xalan + diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index e16103047..a41bcb7bc 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -152,6 +152,10 @@ jaxb-impl com.sun.xml.bind + + javassist + javassist + diff --git a/services/acquisition/jaxb/pom.xml b/services/acquisition/jaxb/pom.xml index cfda06d9d..6cfb2412d 100644 --- a/services/acquisition/jaxb/pom.xml +++ b/services/acquisition/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/authority/jaxb/pom.xml b/services/authority/jaxb/pom.xml index 4da7d9615..cd38021b2 100644 --- a/services/authority/jaxb/pom.xml +++ b/services/authority/jaxb/pom.xml @@ -7,11 +7,11 @@ org.collectionspace.services ${revision} - + 4.0.0 org.collectionspace.services.authority.jaxb services.authority.jaxb - + com.sun.xml.bind @@ -21,31 +21,10 @@ org.jvnet.jaxb2-commons property-listener-injector - org.collectionspace.services org.collectionspace.services.jaxb ${project.version} - + - - - diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml index 006e0a852..2cd2f0886 100644 --- a/services/authorization-mgt/service/pom.xml +++ b/services/authorization-mgt/service/pom.xml @@ -132,6 +132,10 @@ ${project.version} provided + + javax.xml.bind + jaxb-api + org.collectionspace.services org.collectionspace.services.authorization.jaxb diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml index a3efdfa5a..f6d096318 100644 --- a/services/authorization/jaxb/pom.xml +++ b/services/authorization/jaxb/pom.xml @@ -51,6 +51,10 @@ org.collectionspace.services.hyperjaxb ${project.version} + + javax.xml.bind + jaxb-api + - - - - + diff --git a/services/conditioncheck/jaxb/pom.xml b/services/conditioncheck/jaxb/pom.xml index 988e3fa8e..0682c762d 100644 --- a/services/conditioncheck/jaxb/pom.xml +++ b/services/conditioncheck/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/config/pom.xml b/services/config/pom.xml index 6a413d742..1adf618ee 100644 --- a/services/config/pom.xml +++ b/services/config/pom.xml @@ -26,7 +26,10 @@ commons-io commons-io - + + javax.xml.bind + jaxb-api + org.jvnet.jaxb2_commons jaxb2-basics @@ -54,6 +57,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/conservation/jaxb/pom.xml b/services/conservation/jaxb/pom.xml index bcd4d0b39..22d256ddd 100644 --- a/services/conservation/jaxb/pom.xml +++ b/services/conservation/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/contact/jaxb/pom.xml b/services/contact/jaxb/pom.xml index d311262af..8e1b6f950 100644 --- a/services/contact/jaxb/pom.xml +++ b/services/contact/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/dimension/jaxb/pom.xml b/services/dimension/jaxb/pom.xml index 14b429ce2..50d13aa8b 100644 --- a/services/dimension/jaxb/pom.xml +++ b/services/dimension/jaxb/pom.xml @@ -34,6 +34,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/exhibition/jaxb/pom.xml b/services/exhibition/jaxb/pom.xml index e25aff6d7..93624fd48 100644 --- a/services/exhibition/jaxb/pom.xml +++ b/services/exhibition/jaxb/pom.xml @@ -29,6 +29,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/group/jaxb/pom.xml b/services/group/jaxb/pom.xml index c4a286a34..5ac3e2e1f 100644 --- a/services/group/jaxb/pom.xml +++ b/services/group/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/hyperjaxb/pom.xml b/services/hyperjaxb/pom.xml index 0c285d843..e5da60c0c 100644 --- a/services/hyperjaxb/pom.xml +++ b/services/hyperjaxb/pom.xml @@ -48,6 +48,10 @@ jaxb2-basics-runtime --> + + javax.xml.bind + jaxb-api + javax.persistence @@ -81,4 +85,3 @@ - diff --git a/services/id/jaxb/pom.xml b/services/id/jaxb/pom.xml index 1a448e41f..0f1712e46 100644 --- a/services/id/jaxb/pom.xml +++ b/services/id/jaxb/pom.xml @@ -48,8 +48,11 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + - diff --git a/services/imports/jaxb/pom.xml b/services/imports/jaxb/pom.xml index 946a2bd4b..358d9efd8 100644 --- a/services/imports/jaxb/pom.xml +++ b/services/imports/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/index/jaxb/pom.xml b/services/index/jaxb/pom.xml index 06102f1ae..932d01f50 100644 --- a/services/index/jaxb/pom.xml +++ b/services/index/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/intake/jaxb/pom.xml b/services/intake/jaxb/pom.xml index 12b7fa981..d79d575ef 100644 --- a/services/intake/jaxb/pom.xml +++ b/services/intake/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/jaxb/pom.xml b/services/jaxb/pom.xml index d39d49e52..8905e189e 100644 --- a/services/jaxb/pom.xml +++ b/services/jaxb/pom.xml @@ -40,6 +40,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/loanin/jaxb/pom.xml b/services/loanin/jaxb/pom.xml index e8c675dd2..764068b5d 100644 --- a/services/loanin/jaxb/pom.xml +++ b/services/loanin/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/loanout/jaxb/pom.xml b/services/loanout/jaxb/pom.xml index f077d2307..99f53bbfc 100644 --- a/services/loanout/jaxb/pom.xml +++ b/services/loanout/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/location/client/pom.xml b/services/location/client/pom.xml index 7f6a1120c..966fb2549 100644 --- a/services/location/client/pom.xml +++ b/services/location/client/pom.xml @@ -69,7 +69,5 @@ collectionspace-services-location-client - - diff --git a/services/location/jaxb/pom.xml b/services/location/jaxb/pom.xml index daf08d12e..94bc73f7f 100644 --- a/services/location/jaxb/pom.xml +++ b/services/location/jaxb/pom.xml @@ -38,6 +38,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/location/pom.xml b/services/location/pom.xml index e1079380e..61c421b4f 100644 --- a/services/location/pom.xml +++ b/services/location/pom.xml @@ -20,15 +20,6 @@ 3rdparty client - - - - samples - - - - - - + diff --git a/services/material/client/pom.xml b/services/material/client/pom.xml index 2399a75ca..78d910503 100644 --- a/services/material/client/pom.xml +++ b/services/material/client/pom.xml @@ -65,7 +65,5 @@ collectionspace-services-material-client - - diff --git a/services/material/jaxb/pom.xml b/services/material/jaxb/pom.xml index 7954249ae..d0a9a4cd7 100644 --- a/services/material/jaxb/pom.xml +++ b/services/material/jaxb/pom.xml @@ -52,6 +52,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/material/pom.xml b/services/material/pom.xml index eb02073a1..7f67de082 100644 --- a/services/material/pom.xml +++ b/services/material/pom.xml @@ -27,15 +27,6 @@ 3rdparty client - - - - samples - - - - - - + diff --git a/services/material/service/pom.xml b/services/material/service/pom.xml index da1b95b01..9a80fbd0c 100644 --- a/services/material/service/pom.xml +++ b/services/material/service/pom.xml @@ -108,7 +108,5 @@ collectionspace-services-material - - diff --git a/services/media/jaxb/pom.xml b/services/media/jaxb/pom.xml index f5d03d98c..83334c752 100644 --- a/services/media/jaxb/pom.xml +++ b/services/media/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/movement/jaxb/pom.xml b/services/movement/jaxb/pom.xml index aec51de91..5c87d3293 100644 --- a/services/movement/jaxb/pom.xml +++ b/services/movement/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/note/jaxb/pom.xml b/services/note/jaxb/pom.xml index 28cb1dcf1..f05f71e18 100644 --- a/services/note/jaxb/pom.xml +++ b/services/note/jaxb/pom.xml @@ -33,6 +33,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/objectexit/jaxb/pom.xml b/services/objectexit/jaxb/pom.xml index f4cf95b54..20ace344d 100644 --- a/services/objectexit/jaxb/pom.xml +++ b/services/objectexit/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/organization/jaxb/pom.xml b/services/organization/jaxb/pom.xml index 50e647db1..db829b4bd 100644 --- a/services/organization/jaxb/pom.xml +++ b/services/organization/jaxb/pom.xml @@ -7,11 +7,11 @@ org.collectionspace.services ${revision} - + 4.0.0 org.collectionspace.services.organization.jaxb services.organization.jaxb - + org.collectionspace.services @@ -21,14 +21,14 @@ org.collectionspace.services org.collectionspace.services.jaxb ${project.version} - + org.collectionspace.services org.collectionspace.services.authority.jaxb ${project.version} - + - + collectionspace-services-organization-jaxb install @@ -37,7 +37,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + - diff --git a/services/osteology/jaxb/pom.xml b/services/osteology/jaxb/pom.xml index 45061802f..cad2f68a4 100644 --- a/services/osteology/jaxb/pom.xml +++ b/services/osteology/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/person/jaxb/pom.xml b/services/person/jaxb/pom.xml index 4a32e562d..e1e10aa17 100644 --- a/services/person/jaxb/pom.xml +++ b/services/person/jaxb/pom.xml @@ -34,6 +34,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/place/client/pom.xml b/services/place/client/pom.xml index 95f8b4d3a..44e900a5d 100644 --- a/services/place/client/pom.xml +++ b/services/place/client/pom.xml @@ -65,7 +65,5 @@ collectionspace-services-place-client - - diff --git a/services/place/jaxb/pom.xml b/services/place/jaxb/pom.xml index 76b19776b..3e9dfb386 100644 --- a/services/place/jaxb/pom.xml +++ b/services/place/jaxb/pom.xml @@ -21,27 +21,17 @@ com.sun.xml.bind jaxb-core - org.collectionspace.services org.collectionspace.services.jaxb ${project.version} - + org.collectionspace.services org.collectionspace.services.authority.jaxb true ${project.version} - + @@ -52,7 +42,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + - diff --git a/services/place/pom.xml b/services/place/pom.xml index 2680c42df..eb228ee66 100644 --- a/services/place/pom.xml +++ b/services/place/pom.xml @@ -26,15 +26,6 @@ 3rdparty client - - - - samples - - - - - - + diff --git a/services/place/service/pom.xml b/services/place/service/pom.xml index 4fc72012e..911e1217f 100644 --- a/services/place/service/pom.xml +++ b/services/place/service/pom.xml @@ -108,7 +108,5 @@ collectionspace-services-place - - diff --git a/services/pom.xml b/services/pom.xml index 270c9320e..383ccb5b1 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -133,6 +133,25 @@ + + org.codehaus.mojo + build-helper-maven-plugin + 3.2.0 + + + add-source + generate-sources + + add-source + + + + ${basedir}/target/generated-sources/xjc + + + + + org.apache.maven.plugins maven-surefire-plugin @@ -414,6 +433,11 @@ jaxb-impl ${jaxb.version} + + javax.xml.bind + jaxb-api + ${jaxb.version} + javax.persistence persistence-api diff --git a/services/pottag/jaxb/bin/org/collectionspace/services/PottagJAXBSchema.class b/services/pottag/jaxb/bin/org/collectionspace/services/PottagJAXBSchema.class deleted file mode 100644 index 6de202cf70f73a5e0a6700e308ade93d36f3d2e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 442 zcmZ9I%TB{E5JkrY+BBu56w31(Ad4;bH=xGgLg%p~v{F)-L}$e_3h5Lw-y}j7&aE~E;~PF7hT=)4 z*nn*Y-4$-oQJBR}uvn3gL4C@-Yxj{s&;1ialP6hx#h^W+V1t=?K(&?@G|8~UG*Pb% zTBE@80zdM(H?d%sfh}~J>dePfQkxr$xJ$ww-IW%osA$jl{MXTA&@}k+W3XL5oVd}L z&$tDB(iASF8lypaw}0;qCwEaWjlR1=3r-kxvUR$Ud9ZZL&Vu4Yz0QT4CgrUD{|#K0 x|En`#uti&}!zt|0$)G`01B=+MaErKI;SO=P!u!Mr6+R?Bs_-$TGOCr?XJ4)5T^;}c diff --git a/services/pottag/jaxb/bin/org/collectionspace/services/PottagListItemJAXBSchema.class b/services/pottag/jaxb/bin/org/collectionspace/services/PottagListItemJAXBSchema.class deleted file mode 100644 index 08477a86d0e3cfd5c0fadac71b6392d760aa15e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 399 zcmZ|LOHRWu5C-6XN@+tMP|AD3703dyV%3&b3Q8YpD1uex8aKFdk}7d3aWxhkfI}e$ zBp@3Wmi)={&)9zdczpwKiPI`dgsUVCU6~l8q}55Bt%X!>rqYd;Dsv}^wIcL&W<9H- z+s;Ebkk2X-Rg?*>mDmW^h&Xh|ixuYyl|g6d`HzIQ|92SJRL9{pq1odBR>byRm|Qv7 z;lNTv+Pn}Nlc_hloBN$^-wzx#2=z6`tS=VIWISv%8+QBC`FQYKvq#vC^Jt;c@$#pv z+zY%L2W>)GX8MV+HJf@4j(C%&hENNVJe6vojUt@?_q>a*%U1}T;;-7q8LtYf$|}KO a*9xw)n+5N(TLtg44+=iyE`;OnUMHVj!B>p{ diff --git a/services/pottag/jaxb/pom.xml b/services/pottag/jaxb/pom.xml index 5e35e2d07..6e23a4054 100644 --- a/services/pottag/jaxb/pom.xml +++ b/services/pottag/jaxb/pom.xml @@ -29,6 +29,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/propagation/jaxb/bin/META-INF/sun-jaxb.episode b/services/propagation/jaxb/bin/META-INF/sun-jaxb.episode deleted file mode 100644 index 31e71a54b..000000000 --- a/services/propagation/jaxb/bin/META-INF/sun-jaxb.episode +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/propagation/jaxb/bin/org/collectionspace/services/PropagationJAXBSchema.class b/services/propagation/jaxb/bin/org/collectionspace/services/PropagationJAXBSchema.class deleted file mode 100644 index 4dcf73a1c436a98412596ef51f5e58d01f796e17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 429 zcmZvY%T9wp6o${K+EUuuTJJuDB)W7(TQoIt382wcGbIzGff+JD6JO1R58y)?4@4si z7qj^C&-u>$^ZE7u0RY!<)`Jehl~l12$u#9rnMhIOEaFDN)i#NEVR%aBEM|3bZ$8h0 z=#^)z2fGN94cjs!Wg<4*^@fHK2A=PFE9cRkSw6z_;qOLJszk&$2%|ZzD48gqSXyxn z`UrYXJDe(8bM>q6Ei-T(4Te9d&siY_LcduMzIc`fV+5_94Bv82-X@v5wrx3KpurSj zSf_KDWn7d6z4y-Y?WJReOV?Q~%#akv2;-QmED=q?1uMy<2eMKTzfDqti+}rH*2TIA p2s`wVdvH#tOVlIkfJUshctAXA@jmgS#RtTPEj}U(!b#&g{RUUKV*UUC diff --git a/services/propagation/jaxb/bin/org/collectionspace/services/PropagationListItemJAXBSchema.class b/services/propagation/jaxb/bin/org/collectionspace/services/PropagationListItemJAXBSchema.class deleted file mode 100644 index a425c021c177c29a8c07fbd3abf8a1bca1be6c4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 441 zcmaKo&rZTX5XNT_p@ImaC|-R4d+?^G@<*};+NLc;PtCG!>XQD;c1z-`dGG;zDC3li zJ$cw#5G5O~N`Wb!PI1=li5i=1&`7DDYM7lrAnEN2m`I!jq- zszvf_y-a-mE)v#;CV|0@?U@;~G%}s-4owJjUC(htd%c>>Jp#k!pTgHlrqLsT-V{e^ zmg)_QOJTqXfliLI>@wL3MPPieu%-ds(BL&(c+T1lm(&joI3+Nuq!#AgOZ~A>S(#Vi zFw0`@t*C7U)Um^v70eCj6X-`mB{DrMF=JW~Xij}PGhm1nFXS76qqRp37-3PW7^C=E zsknHOF^X^hy}@0zT#EpH#iJg>4Zapq8>s;Xa;L^!kOwtBN4}`>CAtu}I(S|G E0?k8b(EtDd diff --git a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/ObjectFactory.class b/services/propagation/jaxb/bin/org/collectionspace/services/propagation/ObjectFactory.class deleted file mode 100644 index 0fa02dacf4aed4c05748e9ea5fea5de41a0e5ca7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1791 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�cPGfhp%&rV1bKL-MR*UHo+xHI znapZx@%$Ks>pckFJba)*_(_Yf3bO|xY}#fuKhhxldV0Q?fdR y&!R)JLf>u?-sc>*aR)hC-c|Sl_rAxp!i+*%VGj3619(WESvp`}VjY{+Pw{N^npQ}xyxcOSe{a#CIQ3wYG=?zeXd zh2f0Oh>}bz5$YQmc=lkEp|UAE5jTA$7``2Qz1%vcQOy-XKDjI-X;v6c)EnCjr91JC zaB!Mo?!eMDrD9da96RyXgGdP-2LrL=`f=EkLE^1Tp0@)L>RWELvegx?412LME*ZA8 zJBWmFeI7-zaofTjo&R63AUtb7_j#amBIlae<*wQ9iE8B@*Ik>k0N?M@YNb$MDs|tiKKydR0|Txkrvk24rU}$2_Ako)Defi@AsI7>Y_27=u;=ZCf!CJNj+e|8>B#jk3|4)b z!*r~+=;KI?F+1QvpLC^UQgCW?=I;7h>nnyUM{62Nmm(foe$38r))^Yw>^yj1?FdC} zupap|FVen<%snX-SAKWj!6(EoX^lJhjAp@Xy*nT$%A@Q!xJ|?1Xf^ukIQX35bf(rA zY8z5(qH}Ad#v-U5Xo{ur4zoB(cZXIpC@0SqRB7iF?c5|OM)&Gt)P7hv^E>AMOypjo zt33tG<7K+mQYoCnd0J5_agoqc%u6{)ujC+Y*9mWA%PgU%wp`9Z*m?$ndkA6X z3BqCyg3Lv@f~$uRY}`^C-pWA;pMmhsA%ug7)^iZ{au7;*m$c5{8s4M(WqP_!cuN8v jZs2`dexT_e$<3d@H0ARnk^#P;UyW8D<5S$iGFJWrI&;}0 diff --git a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/StructuredDateGroup.class b/services/propagation/jaxb/bin/org/collectionspace/services/propagation/StructuredDateGroup.class deleted file mode 100644 index 2eb4ce971924ead1b706145def94ca66b70817f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13057 zcmeHNO>h)d5bn1LY_ds6NJ2;m!tx^|psWgt8U#ZUAhP@hA_RY!%szJqXJ?jqvyq63 zKlqD3Ra%w@4<0;l^x(lNtPg^S3*b?b+-@iz=%2ke@f*{dK>7 z{eHUN`{|!=zXyQb@KF*H4EC8;KBJnt&Q)784N+25o)O$y&{QrmCCe-+dBve*W^Ajh z+GUI9CKa0>w#;%V39SrzE-4F2Mpuk{=EVFZgkjK~Lyk#Jlyqg$VP?>qt#TodX5_~h z44p0;wpQe`n$YHTK5iJM?dlQ?wz&dVGFOUvW?nOL8KpwaoGa>6Ixlj=Mvyj(UoLBC zRSWit`MSr2FjdXPVld!XGo@I%#)UnDs&#&zD;5$wql$`M$Q;!2(}vCS+(OK?wGzin z!!9sbQ%jjt7Rm2Zmcn4TmVbgR)!u9dA&XBEASZrxai<*cFM zP^@w|viKuxuhZ_>cpv;ebyZp1zJ%ItANs2FknN$b6{{EwR(UI5eOq0pdWtI~&&HG^ zbdp<|nZxmP8plm1XrjZQD!O9%SfionKz_wuEb+{_W7)$N&zqK}7!!)ljhx~PW|)_V zq#3oqi^>@UK;BkEDWc+5#|D2;J&R|;+WSSdB__;bscdt!oXs&>Z)`}(5 zveP(KcU@XAxSdwr*^r*+=|H~8xQu(IF5}D+gy+(>nO4$H1f|-KD5BsD*)nY2I+rz7 z#Wt<~k=L^k*GCM${NggezWTGaMs_RJ-ehnlR?`pO0@L(E(+|-Nqq#oZLFD%qNzM{y);26snYSs}0hvzN4)i4FO_ zUMl7IdmX9HPq){RpgwVslyuYbK~l~mky38*PD{C@4Wv{k#os_`3^R}jmF%7YjSynk zQXj!j_qULSRA79r&GoUoTEpi0P#)82AIZ!8y}HS2UoiYF2te0w&Trv}mQIiLdSxi*M? zlGx>I4QfGMzMi1n;nThHP=`n<80_@txK~eHu3{9}NJ8D?&HF}>oTVU` z&|ZHdWu#zg5~Kl5gjhp0CM+vqm1!;ZoTj&q%sERYf!{Q@xPkjasw}@NL-Fn<|>;yym&zxsPcU6sSskbA7m7 z>%)?i$KS%7Eer3@t~an{No_5+QdYqWt%854z+h|5ZoD+#8ylT&g9X-NH(NbN|I9d7%W0!M= z#~degCr;dRkE{5gLztF-)4gKBdqJ?w?YJiu$Q+uU%1$!aQeTtL-6v{IWzg zVpSZWJC4v3r(<;-p*N1u7pJ2?PGU`*#6TQjZ5&}RPRCFjVO<^mVK0erM8bv%5@A}xh7%;h6OG3MyFelw zm57HtiIA1>gCG%(N%-L!iEv!P4>w4J6B2&-j6^soVZ)as!YK(Gz9JD$OW5!oi7+E! z!;d7w8HsrKg+w?j5f8tS2(uD4{6Qi-DPhB3B*MAIZAi3`2Yk$#Z<7emN!aiSiIA7D;R_O>09vRQ_5E;@M7RXchY;%ffnKY1D25PL zR8Hnb?b$x@HEDwmr4T~ZhRd}GEgzBy0_+fillgktL771KI0oT`5JJ_HS85SjI|zhU zcoDTG;HsNxU&Q}jLcEtbyaLzYRcvD3^%}f>0k1bjVr7STEo%fiDhVqkydf?uIu|8^DM7(}@}Wb$AQjf%oA3e*p-{ Bz8wGn diff --git a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/package-info.class b/services/propagation/jaxb/bin/org/collectionspace/services/propagation/package-info.class deleted file mode 100644 index bdc1fc2ca792e663489af390c0574f963a040c9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 293 zcmZvXJx&8b427S=&yu8p28jbu5*LUDDjF&zBqAYN?_f3)=4Z7tiE=gy4#1%hGg}~p zuw=XV-n0BZzurFpTw>l}Lb!@U$0jy&Wv+p(x(!r9{{Wb5_GCfho_4I$?7d?K9RSIv%h z-f?Tg3(F7XXYZC~rCx3b(;!~QM+v;jxxePW2^KZge<@A@!d}T=Yl4Gu9-=9GUdU1D HX~OIqGp<org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/publicitem/jaxb/pom.xml b/services/publicitem/jaxb/pom.xml index 5e289073f..ab3f7d5e0 100644 --- a/services/publicitem/jaxb/pom.xml +++ b/services/publicitem/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/report/jaxb/pom.xml b/services/report/jaxb/pom.xml index 5810c1fb6..6ee0189ac 100644 --- a/services/report/jaxb/pom.xml +++ b/services/report/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/servicegroup/jaxb/pom.xml b/services/servicegroup/jaxb/pom.xml index e809e7de3..cc8e9c51a 100644 --- a/services/servicegroup/jaxb/pom.xml +++ b/services/servicegroup/jaxb/pom.xml @@ -29,6 +29,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/structureddate/jaxb/pom.xml b/services/structureddate/jaxb/pom.xml index 876560f74..2518f5bc2 100644 --- a/services/structureddate/jaxb/pom.xml +++ b/services/structureddate/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/systeminfo/jaxb/pom.xml b/services/systeminfo/jaxb/pom.xml index 8125e267f..8b91cc996 100644 --- a/services/systeminfo/jaxb/pom.xml +++ b/services/systeminfo/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/taxonomy/jaxb/pom.xml b/services/taxonomy/jaxb/pom.xml index 7800673d6..e02ca10a6 100644 --- a/services/taxonomy/jaxb/pom.xml +++ b/services/taxonomy/jaxb/pom.xml @@ -37,6 +37,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/uoc/jaxb/pom.xml b/services/uoc/jaxb/pom.xml index 58a963f6f..7da14c652 100644 --- a/services/uoc/jaxb/pom.xml +++ b/services/uoc/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/valuationcontrol/jaxb/pom.xml b/services/valuationcontrol/jaxb/pom.xml index 773284bcd..8aacc9883 100644 --- a/services/valuationcontrol/jaxb/pom.xml +++ b/services/valuationcontrol/jaxb/pom.xml @@ -29,6 +29,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/vocabulary/jaxb/pom.xml b/services/vocabulary/jaxb/pom.xml index 285900f45..7f96d589c 100644 --- a/services/vocabulary/jaxb/pom.xml +++ b/services/vocabulary/jaxb/pom.xml @@ -33,6 +33,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + diff --git a/services/work/client/pom.xml b/services/work/client/pom.xml index 0de9ea937..1755a5ff0 100644 --- a/services/work/client/pom.xml +++ b/services/work/client/pom.xml @@ -65,7 +65,5 @@ collectionspace-services-work-client - - diff --git a/services/work/jaxb/pom.xml b/services/work/jaxb/pom.xml index 958a78333..487c989c2 100644 --- a/services/work/jaxb/pom.xml +++ b/services/work/jaxb/pom.xml @@ -21,27 +21,17 @@ com.sun.xml.bind jaxb-core - org.collectionspace.services org.collectionspace.services.jaxb ${project.version} - + org.collectionspace.services org.collectionspace.services.authority.jaxb true ${project.version} - + @@ -52,7 +42,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + - diff --git a/services/work/pom.xml b/services/work/pom.xml index 720b2361f..fa8b939d8 100644 --- a/services/work/pom.xml +++ b/services/work/pom.xml @@ -27,15 +27,6 @@ 3rdparty client - - - - samples - - - - - - + diff --git a/services/work/service/pom.xml b/services/work/service/pom.xml index 4f59cab7b..6f43e809b 100644 --- a/services/work/service/pom.xml +++ b/services/work/service/pom.xml @@ -108,7 +108,5 @@ collectionspace-services-work - - diff --git a/services/workflow/jaxb/pom.xml b/services/workflow/jaxb/pom.xml index 4c08c8df2..a477e6518 100644 --- a/services/workflow/jaxb/pom.xml +++ b/services/workflow/jaxb/pom.xml @@ -28,6 +28,10 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin + + org.codehaus.mojo + build-helper-maven-plugin + -- 2.47.3