From: Michael Ritter <mikejritter@users.noreply.github.com>
Date: Thu, 14 Dec 2023 01:50:11 +0000 (-0500)
Subject: DRYD-1268: UCB Maven Contribs (#383)
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=2eb0b654507b4c4c6b0b62d920e47b6b76b13d34;p=tmp%2Fjakarta-migration.git

DRYD-1268: UCB Maven Contribs (#383)

Co-authored-by: Richard Millet <richard.millet@berkeley.edu>
---

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 @@
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-api</artifactId>
-            <version>${nuxeo.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.automation</groupId>
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 @@
 						</execution>
                 	</executions>
 				</plugin>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.codehaus.mojo</groupId>
+										<artifactId>flatten-maven-plugin</artifactId>
+										<versionRange>[1.1.0,)</versionRange>
+										<goals>
+											<goal>flatten</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<execute>
+											<runOnIncremental>false</runOnIncremental>
+										</execute>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 
@@ -333,7 +359,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>flatten-maven-plugin</artifactId>
-				<version>1.1.0</version>
+				<version>1.2.2</version>
 				<configuration>
 					<updatePomFile>true</updatePomFile>
 				</configuration>
@@ -358,7 +384,7 @@
 				before we perform any build related tasks. -->
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
+				<version>1.8</version> <!-- Most recent version is 3.0.0 -->
 				<executions>
 					<execution>
 						<id>check-environment-vars</id>
@@ -426,7 +452,7 @@
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
-				<version>1.7.21</version>
+				<version>1.7.32</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
@@ -472,6 +498,10 @@
 						<groupId>xml-apis</groupId>
 						<artifactId>xml-apis</artifactId>
 					</exclusion>
+					<exclusion>
+						<groupId>xalan</groupId>
+						<artifactId>xalan</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
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 @@
 					<artifactId>jaxb-impl</artifactId>
 					<groupId>com.sun.xml.bind</groupId>
 				</exclusion>
+				<exclusion>
+					<groupId>javassist</groupId>
+					<artifactId>javassist</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
         <dependency>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
         <groupId>org.collectionspace.services</groupId>
         <version>${revision}</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
     <name>services.authority.jaxb</name>
-    
+
     <dependencies>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
@@ -21,31 +21,10 @@
             <groupId>org.jvnet.jaxb2-commons</groupId>
             <artifactId>property-listener-injector</artifactId>
         </dependency>
-		<!--
-        <dependency>
-            <groupId>org.jvnet.jaxb2_commons</groupId>
-            <artifactId>runtime</artifactId>
-			<version>${jaxb2-basics.version}</version>
-        </dependency>
-		-->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
     </dependencies>
-    
-		<!-- until we have schemas to compile, we can omit the plugin
-    <build>
-        <finalName>collectionspace-services-authority-jaxb</finalName>
-        <defaultGoal>install</defaultGoal>
-        <plugins>
-            <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-            </plugin>
-        </plugins>
-		</build>
-		-->
 </project>
-
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 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authorization.jaxb</artifactId>
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 @@
 			<artifactId>org.collectionspace.services.hyperjaxb</artifactId>
 			<version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
 <!--
         <dependency>
             <groupId>javax.persistence</groupId>
diff --git a/services/batch/jaxb/pom.xml b/services/batch/jaxb/pom.xml
index b53bd2637..2fa0df460 100644
--- a/services/batch/jaxb/pom.xml
+++ b/services/batch/jaxb/pom.xml
@@ -33,6 +33,10 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/services/blob/jaxb/pom.xml b/services/blob/jaxb/pom.xml
index ba93f455b..3782e8678 100644
--- a/services/blob/jaxb/pom.xml
+++ b/services/blob/jaxb/pom.xml
@@ -29,6 +29,10 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/services/citation/client/pom.xml b/services/citation/client/pom.xml
index 054911d66..2ab4202a1 100644
--- a/services/citation/client/pom.xml
+++ b/services/citation/client/pom.xml
@@ -66,7 +66,5 @@
 
     <build>
         <finalName>collectionspace-services-citation-client</finalName>
-        <plugins>
-        </plugins>
     </build>
 </project>
diff --git a/services/citation/jaxb/pom.xml b/services/citation/jaxb/pom.xml
index b6954e377..52784c552 100644
--- a/services/citation/jaxb/pom.xml
+++ b/services/citation/jaxb/pom.xml
@@ -38,6 +38,10 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/services/citation/pom.xml b/services/citation/pom.xml
index e6da3e8a0..ab861ddf1 100644
--- a/services/citation/pom.xml
+++ b/services/citation/pom.xml
@@ -29,15 +29,6 @@
         <module>3rdparty</module>
         <module>client</module>
     </modules>
-    
-    <profiles>
-        <profile>
-            <id>samples</id>
-	    <modules>
-                <module>sample</module>
-	    </modules>
-        </profile>
-    </profiles>
-    
+
 </project>
 
diff --git a/services/claim/jaxb/pom.xml b/services/claim/jaxb/pom.xml
index c9fdf4dde..eb8396a4a 100644
--- a/services/claim/jaxb/pom.xml
+++ b/services/claim/jaxb/pom.xml
@@ -29,6 +29,10 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml
index 43f6e9dd2..c6a6292ee 100644
--- a/services/collectionobject/jaxb/pom.xml
+++ b/services/collectionobject/jaxb/pom.xml
@@ -28,6 +28,10 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>             
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/services/common/lib/slf4j/jcl-over-slf4j-1.7.25.jar b/services/common/lib/slf4j/jcl-over-slf4j-1.7.25.jar
deleted file mode 100644
index 8e7fec880..000000000
Binary files a/services/common/lib/slf4j/jcl-over-slf4j-1.7.25.jar and /dev/null differ
diff --git a/services/common/lib/slf4j/jcl-over-slf4j-1.7.32.jar b/services/common/lib/slf4j/jcl-over-slf4j-1.7.32.jar
new file mode 100644
index 000000000..a8dd6b73c
Binary files /dev/null and b/services/common/lib/slf4j/jcl-over-slf4j-1.7.32.jar differ
diff --git a/services/common/lib/slf4j/slf4j-api-1.7.25.jar b/services/common/lib/slf4j/slf4j-api-1.7.25.jar
deleted file mode 100644
index 0143c0996..000000000
Binary files a/services/common/lib/slf4j/slf4j-api-1.7.25.jar and /dev/null differ
diff --git a/services/common/lib/slf4j/slf4j-api-1.7.32.jar b/services/common/lib/slf4j/slf4j-api-1.7.32.jar
new file mode 100644
index 000000000..b16a0785b
Binary files /dev/null and b/services/common/lib/slf4j/slf4j-api-1.7.32.jar differ
diff --git a/services/common/pom.xml b/services/common/pom.xml
index 5e46126d1..73ff2f71d 100644
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -172,7 +172,10 @@
 			<artifactId>tomcat-servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>javax.security</groupId>
 			<artifactId>jaas</artifactId>
@@ -414,6 +417,10 @@
 				<groupId>org.jvnet.jaxb2.maven2</groupId>
 				<artifactId>maven-jaxb2-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/services/concept/jaxb/pom.xml b/services/concept/jaxb/pom.xml
index 896c08460..af24038e3 100644
--- a/services/concept/jaxb/pom.xml
+++ b/services/concept/jaxb/pom.xml
@@ -38,6 +38,10 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/services/concept/pom.xml b/services/concept/pom.xml
index 6107a8547..c3fcd3ff8 100644
--- a/services/concept/pom.xml
+++ b/services/concept/pom.xml
@@ -20,15 +20,6 @@
         <module>3rdparty</module>
         <module>client</module>
     </modules>
-    
-    <profiles>
-        <profile>
-            <id>samples</id>
-	    <modules>
-	        <!-- <module>sample</module> -->
-	    </modules>
-        </profile>
-    </profiles>
-    
+
 </project>
 
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>org.jvnet.jaxb2_commons</groupId>
 			<artifactId>jaxb2-basics</artifactId>
@@ -54,6 +57,10 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>               
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
 			<artifactId>jaxb2-basics-runtime</artifactId>
 		</dependency>
 		 -->
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+		</dependency>
     <!-- Dependencies for HyperJaxB -->
 		<dependency>
 		    <groupId>javax.persistence</groupId>
@@ -81,4 +85,3 @@
   </build>
 
 </project>
-
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 @@
         <groupId>org.jvnet.jaxb2.maven2</groupId>
         <artifactId>maven-jaxb2-plugin</artifactId>
       </plugin>
+      <plugin>
+	    <groupId>org.codehaus.mojo</groupId>
+	    <artifactId>build-helper-maven-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
-
 </project>
 
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
 				<groupId>org.jvnet.jaxb2.maven2</groupId>
 				<artifactId>maven-jaxb2-plugin</artifactId>
 			</plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
 		</plugins>
 	</build>
 
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
 
     <build>
         <finalName>collectionspace-services-location-client</finalName>
-        <plugins>
-        </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
         <module>3rdparty</module>
         <module>client</module>
     </modules>
-    
-    <profiles>
-        <profile>
-            <id>samples</id>
-	    <modules>
-	        <!-- <module>sample</module> -->
-	    </modules>
-        </profile>
-    </profiles>
-    
+
 </project>
 
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 @@
 
     <build>
         <finalName>collectionspace-services-material-client</finalName>
-        <plugins>
-        </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
         <module>3rdparty</module>
         <module>client</module>
     </modules>
-    
-    <profiles>
-        <profile>
-            <id>samples</id>
-        <modules>
-            <!-- <module>sample</module> -->
-        </modules>
-        </profile>
-    </profiles>
-    
+
 </project>
 
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 @@
 
     <build>
         <finalName>collectionspace-services-material</finalName>
-        <plugins>
-        </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>               
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
         <groupId>org.collectionspace.services</groupId>
         <version>${revision}</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.collectionspace.services.organization.jaxb</artifactId>
     <name>services.organization.jaxb</name>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
@@ -21,14 +21,14 @@
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
     </dependencies>
-    
+
     <build>
         <finalName>collectionspace-services-organization-jaxb</finalName>
         <defaultGoal>install</defaultGoal>
@@ -37,7 +37,10 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
-
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
 
     <build>
         <finalName>collectionspace-services-place-client</finalName>
-        <plugins>
-        </plugins>
     </build>
 </project>
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 @@
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-core</artifactId>
         </dependency>
-				<!--
-        <dependency>
-            <groupId>org.jvnet.jaxb2-commons</groupId>
-            <artifactId>property-listener-injector</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jvnet.jaxb2_commons</groupId>
-            <artifactId>runtime</artifactId>
-				</dependency>
-				-->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>  
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>   
+        </dependency>
     </dependencies>
 
     <build>
@@ -52,7 +42,10 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
-
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 @@
         <module>3rdparty</module>
         <module>client</module>
     </modules>
-    
-    <profiles>
-        <profile>
-            <id>samples</id>
-	    <modules>
-	        <!-- <module>sample</module> -->
-	    </modules>
-        </profile>
-    </profiles>
-    
+
 </project>
 
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 @@
 
     <build>
         <finalName>collectionspace-services-place</finalName>
-        <plugins>
-        </plugins>
     </build>
 </project>
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 @@
 	<build>
 		<pluginManagement>
 			<plugins>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+						<artifactId>build-helper-maven-plugin</artifactId>
+						<version>3.2.0</version>
+						<executions>
+							<execution>
+								<id>add-source</id>
+								<phase>generate-sources</phase>
+								<goals>
+									<goal>add-source</goal>
+								</goals>
+								<configuration>
+									<sources>
+										<source>${basedir}/target/generated-sources/xjc</source>
+									</sources>
+								</configuration>
+							</execution>
+						</executions>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
@@ -414,6 +433,11 @@
 				<artifactId>jaxb-impl</artifactId>
 				<version>${jaxb.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>javax.xml.bind</groupId>
+				<artifactId>jaxb-api</artifactId>
+				<version>${jaxb.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>javax.persistence</groupId>
 				<artifactId>persistence-api</artifactId>
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 6de202cf7..000000000
Binary files a/services/pottag/jaxb/bin/org/collectionspace/services/PottagJAXBSchema.class and /dev/null differ
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 08477a86d..000000000
Binary files a/services/pottag/jaxb/bin/org/collectionspace/services/PottagListItemJAXBSchema.class and /dev/null differ
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<bindings xmlns="http://java.sun.com/xml/ns/jaxb" if-exists="true" version="2.1">
-  <!--
-
-This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.11 
-See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-Any modifications to this file will be lost upon recompilation of the source schema. 
-Generated on: 2017.03.15 at 05:25:57 PM PDT 
-
-  -->
-  <bindings xmlns:tns="http://collectionspace.org/services/propagation" if-exists="true" scd="x-schema::tns">
-    <schemaBindings map="false">
-      <package name="org.collectionspace.services.propagation"/>
-    </schemaBindings>
-    <bindings if-exists="true" scd="tns:propagations_common">
-      <class ref="org.collectionspace.services.propagation.PropagationsCommon"/>
-    </bindings>
-    <bindings if-exists="true" scd="~tns:structuredDateGroup">
-      <class ref="org.collectionspace.services.propagation.StructuredDateGroup"/>
-    </bindings>
-    <bindings if-exists="true" scd="~tns:scarStratGroupList">
-      <class ref="org.collectionspace.services.propagation.ScarStratGroupList"/>
-    </bindings>
-    <bindings if-exists="true" scd="~tns:propActivityGroupList">
-      <class ref="org.collectionspace.services.propagation.PropActivityGroupList"/>
-    </bindings>
-    <bindings if-exists="true" scd="~tns:scarStratGroup">
-      <class ref="org.collectionspace.services.propagation.ScarStratGroup"/>
-    </bindings>
-    <bindings if-exists="true" scd="~tns:propActivityGroup">
-      <class ref="org.collectionspace.services.propagation.PropActivityGroup"/>
-    </bindings>
-  </bindings>
-</bindings>
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 4dcf73a1c..000000000
Binary files a/services/propagation/jaxb/bin/org/collectionspace/services/PropagationJAXBSchema.class and /dev/null differ
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 a425c021c..000000000
Binary files a/services/propagation/jaxb/bin/org/collectionspace/services/PropagationListItemJAXBSchema.class and /dev/null differ
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 0fa02dacf..000000000
Binary files a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/ObjectFactory.class and /dev/null differ
diff --git a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/PropActivityGroup.class b/services/propagation/jaxb/bin/org/collectionspace/services/propagation/PropActivityGroup.class
deleted file mode 100644
index 5d1339ad9..000000000
Binary files a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/PropActivityGroup.class and /dev/null differ
diff --git a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/PropActivityGroupList.class b/services/propagation/jaxb/bin/org/collectionspace/services/propagation/PropActivityGroupList.class
deleted file mode 100644
index 3660b1df1..000000000
Binary files a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/PropActivityGroupList.class and /dev/null differ
diff --git a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/PropagationsCommon.class b/services/propagation/jaxb/bin/org/collectionspace/services/propagation/PropagationsCommon.class
deleted file mode 100644
index dde83d6e2..000000000
Binary files a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/PropagationsCommon.class and /dev/null differ
diff --git a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/ScarStratGroup.class b/services/propagation/jaxb/bin/org/collectionspace/services/propagation/ScarStratGroup.class
deleted file mode 100644
index 3d57a9f3a..000000000
Binary files a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/ScarStratGroup.class and /dev/null differ
diff --git a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/ScarStratGroupList.class b/services/propagation/jaxb/bin/org/collectionspace/services/propagation/ScarStratGroupList.class
deleted file mode 100644
index cf20ce01e..000000000
Binary files a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/ScarStratGroupList.class and /dev/null differ
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 2eb4ce971..000000000
Binary files a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/StructuredDateGroup.class and /dev/null differ
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 bdc1fc2ca..000000000
Binary files a/services/propagation/jaxb/bin/org/collectionspace/services/propagation/package-info.class and /dev/null differ
diff --git a/services/propagation/jaxb/pom.xml b/services/propagation/jaxb/pom.xml
index 130173807..b55be2de8 100644
--- a/services/propagation/jaxb/pom.xml
+++ b/services/propagation/jaxb/pom.xml
@@ -28,6 +28,10 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>                
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
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 @@
 
     <build>
         <finalName>collectionspace-services-work-client</finalName>
-        <plugins>
-        </plugins>
     </build>
 </project>
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 @@
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-core</artifactId>
         </dependency>
-                <!--
-        <dependency>
-            <groupId>org.jvnet.jaxb2-commons</groupId>
-            <artifactId>property-listener-injector</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jvnet.jaxb2_commons</groupId>
-            <artifactId>runtime</artifactId>
-                </dependency>
-                -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>  
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
             <optional>true</optional>
             <version>${project.version}</version>
-        </dependency>   
+        </dependency>
     </dependencies>
 
     <build>
@@ -52,7 +42,10 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
-
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 @@
         <module>3rdparty</module>
         <module>client</module>
     </modules>
-    
-    <profiles>
-        <profile>
-            <id>samples</id>
-        <modules>
-            <!-- <module>sample</module> -->
-        </modules>
-        </profile>
-    </profiles>
-    
+
 </project>
 
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 @@
 
     <build>
         <finalName>collectionspace-services-work</finalName>
-        <plugins>
-        </plugins>
     </build>
 </project>
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 @@
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>