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 0db70f89fcdd6e87c4ad49f603332dd42cf46dba..f32a31cc29bca6f7a605b1f638a60dde3bff90e2 100644 (file)
--- 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 aa0fe54f49e39fa3a2608e6363a75d1d80c59604..ddfe6f4a9e3caa6fc68eed2e80bb472f0fed9d2b 100644 (file)
--- 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 5a7f39845a097c7b9f5c83affdcc1c21efa4a1c4..9742f134d59bc24abe57b7177712ebde427a45e2 100644 (file)
--- 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 e16103047ae59246e9127389619443bca1a4481e..a41bcb7bc710850a2aed39b4af7759fb9d11bc34 100644 (file)
--- 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 cfda06d9de83501ff05a76777c7ab10c21ce12b2..6cfb2412d216e570b1ee68e5a32641bdad1e49d3 100644 (file)
--- 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 4da7d96151173020d5ee2c9089540ed9e449cb4f..cd38021b2f185f9737a00fdfae6f47c450659c42 100644 (file)
--- 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 006e0a8528accf8e4419946ac0e50f25ce530f3d..2cd2f0886606dad31f453231071e565353ab09fd 100644 (file)
--- 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 a3efdfa5a2b1e4cee87fafeaba2b0f6dc04740a7..f6d096318967c8ef6e1adfe3840b2ec8d1844249 100644 (file)
--- 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 b53bd2637bde0aa4670b77126307b8b14f7db6f2..2fa0df460c2203077c390ffb1e62184ec82920fc 100644 (file)
--- 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 ba93f455bb0aa94790e844fd3432f7683548c7e6..3782e8678db4a078a7a93a46281157ca7302a04f 100644 (file)
--- 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 054911d6618199ea000d82b89f9d621ace6ed3e2..2ab4202a179f13e73daadc0ed338a37902f3c09f 100644 (file)
--- 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 b6954e3776fd509b3b50ac6d646d68176e848684..52784c552bf474d15792162d1c5668ae2810398b 100644 (file)
--- 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 e6da3e8a03e3f67716f230805b428aba175b4235..ab861ddf16590bc6fa688bb0d1d7ee48402856ac 100644 (file)
--- 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 c9fdf4dde8b17db5a3c8fc509176f36559a1fbcc..eb8396a4a16318038580b0666ad20368a33ca75d 100644 (file)
--- 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 43f6e9dd2d637628c0dda532164079651cd7f976..c6a6292eee5b1c2bada9be5ee6b36783881d553d 100644 (file)
--- 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 (file)
index 8e7fec8..0000000
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 (file)
index 0000000..a8dd6b7
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 (file)
index 0143c09..0000000
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 (file)
index 0000000..b16a078
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 5e46126d115f21f5c2a4c489a2911c4112ae0d63..73ff2f71d161257cd778cc252617cf90cc958413 100644 (file)
--- 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 896c084602e03f05efa200e553e01a6cbcb162ec..af24038e3b4c3b32a7cf1b34600b313ad0535b40 100644 (file)
--- 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 6107a854743ceb0f3fec105cdfa811f13c1fae8c..c3fcd3ff8654c462440501103fa8ef83ed5bf5fd 100644 (file)
--- 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 988e3fa8eec9f9b94a94817ec7d237b36b302816..0682c762d4459488ba33094ffb35a7b4bdbd501a 100644 (file)
--- 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 6a413d7425a74d962e3b3d38cfaf4260e9963583..1adf618ee18a65de5b0ed4ff7ae804384794323d 100644 (file)
--- 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 bcd4d0b393a5ca98809f25609058cc24ba194cfa..22d256ddd2db09fd9f28c9cbf80399534b429f20 100644 (file)
--- 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 d311262afcc476375584074aa48db8396d886c8c..8e1b6f9503f48742b12caa6294a2d8f86d43bb61 100644 (file)
--- 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 14b429ce287a622aaf6bb867e0a9ec3900eebf83..50d13aa8baf82895110a73f0dfff62496afdfe75 100644 (file)
--- 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 e25aff6d76e4881afec6af09bc174ba98774ae31..93624fd486efb85c9fdef6419dccdca70334c131 100644 (file)
--- 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 c4a286a34f572972c89db3a4a74443933fd3ff42..5ac3e2e1fc73b111e9c8f4c6caa06f9d55f89d45 100644 (file)
--- 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 0c285d8431cafc223b34dea230c4695f03765489..e5da60c0cf9a0a0c53604f7064e6905477c70b91 100644 (file)
--- 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 1a448e41f1d5a7894cb9a46a3a66f875bb3fd60d..0f1712e467dc3b3b6824986a8c20fd5dfe02b9fd 100644 (file)
--- 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 946a2bd4be367b34157421d4300fbbfd1c3dd745..358d9efd84da42401383ff33c4e6fb1ed6e6bc76 100644 (file)
--- 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 06102f1aea35c6fd720a5f49ceef5ad0433c0cd7..932d01f50c3536f302856952db275bbe10b1104d 100644 (file)
--- 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 12b7fa9810a7786983636060c205ce0f0ccdac90..d79d575ef69a6edf9033764f0e58c03b4ea6ece8 100644 (file)
--- 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 d39d49e52e10dce6532f0d6e97860e256ad63516..8905e189e4d2169d285e1c16d183f725974303d0 100644 (file)
--- 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 e8c675dd2e89e1a058290c4744e2524489a5f95d..764068b5dbccd7a1930df521a0c4353ed055349e 100644 (file)
--- 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 f077d230714787bf689aea9d8fc09fdbf4c4fcf6..99f53bbfcbceb9b5538f54a7aac7f8527eb43ada 100644 (file)
--- 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 7f6a1120cd56dc821213d208be79893b75ab62df..966fb25490af4c3788c3ebcbb6f7a2ddeee1ce55 100644 (file)
--- 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 daf08d12e5c284166cd755232776f71b7ab1a34b..94bc73f7f3b896be698ccb1e5649112a75e7dac7 100644 (file)
--- 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 e1079380ebd441c17c403eca1fac9f3af604f215..61c421b4ff4ce449fb5f96b5520c1031f48ad827 100644 (file)
--- 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 2399a75ca4541386f00d57c2d49346217106dbcb..78d910503995df3f8a0dce5c3294a9b3cc4fcf63 100644 (file)
--- 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 7954249aec90cb3630ea45569071335f9ab27305..d0a9a4cd7cc99b31b93a63fe6d5abe08d5c211b1 100644 (file)
--- 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 eb02073a1fb39377bbdd8e03c9c730876d11f36b..7f67de082f47b7d008f45c3bda98e0dad2c2ccab 100644 (file)
--- 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 da1b95b0171613ae3861b4f0480555a8ba0bfe64..9a80fbd0c46eb2a675bb3644d7b9d701156fdfef 100644 (file)
--- 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 f5d03d98cc2bdf37f967330e9cfac00e0dd1e07c..83334c7526c2f8fc4d12ae03f7095dd60e156beb 100644 (file)
--- 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 aec51de91095d0414fcee57d1a227559ceb67a5a..5c87d329352fe71c1f1af37a7d6f2a641bf36c1b 100644 (file)
--- 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 28cb1dcf1b21e2a11542a564f87f228696611a3d..f05f71e18fff392d1a175f5300a560de8310cd93 100644 (file)
--- 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 f4cf95b542d72110945f53f08ed94c6e1d5d4d6b..20ace344de1012f171f8b1c64f7d8acb5638c1af 100644 (file)
--- 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 50e647db1aa637853f18879375532d250f24c18a..db829b4bd9ba1d4b024dc2b278d8be81d091aabc 100644 (file)
--- 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 45061802f9da8ac7ebb5c8f4bad60eea08195d91..cad2f68a475983ad524ad13658b02b18d751471d 100644 (file)
--- 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 4a32e562d424e688b9bbe24cb95cfb4df2df594a..e1e10aa17e1f35168fd5a8af7b886647e411f3b6 100644 (file)
--- 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 95f8b4d3a58dc98d192504ad053a9e912644aef3..44e900a5db4fca15cd80b33791d007c419edf322 100644 (file)
--- 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 76b19776b129446a7aa1a445ed2fd0015e8d9ab7..3e9dfb3865768f402106a1e6194136bcbfa3eb55 100644 (file)
--- 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 2680c42df87eee580dd1f69f80383a1d0cea81dc..eb228ee66bfe6a030a5de68225329894c6e41c70 100644 (file)
--- 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 4fc72012eaceb3d0d1c67b845cb7bcc36b5a8900..911e1217fb6553eb7f2fbb4fd797a550fac1f6fd 100644 (file)
--- 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 270c9320ef95b3d206b2555ab3a81997f75dc44d..383ccb5b1543de9078ee07a4274f9f46a0b47215 100644 (file)
--- 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 (file)
index 6de202c..0000000
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 (file)
index 08477a8..0000000
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 5e35e2d07be198d85d50072dc651aad36db04e4c..6e23a40544ec24021d343956bf3accffb9e70170 100644 (file)
--- 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 (file)
index 31e71a5..0000000
--- 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 (file)
index 4dcf73a..0000000
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 (file)
index a425c02..0000000
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 (file)
index 0fa02da..0000000
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 (file)
index 5d1339a..0000000
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 (file)
index 3660b1d..0000000
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 (file)
index dde83d6..0000000
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 (file)
index 3d57a9f..0000000
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 (file)
index cf20ce0..0000000
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 (file)
index 2eb4ce9..0000000
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 (file)
index bdc1fc2..0000000
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 13017380724cd57a7ed068e1dbe8e30c7b7cd3fb..b55be2de8b432d075c5a2616bc3466f9610af831 100644 (file)
--- 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 5e289073f3cc3ab5c1fcdfb8209f8e3f616f7905..ab3f7d5e050d4103fb82269bd2eb460e6adbf1dc 100644 (file)
--- 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 5810c1fb699d79e88769c75a1b47eba1a06424a7..6ee0189ac4c9231d3fe14947c64459b84cfb4476 100644 (file)
--- 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 e809e7de3c1759f9e11240453d9a867b53f40e2c..cc8e9c51a0222bacf74d6974bc4da5c46176a879 100644 (file)
--- 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 876560f74bd94d44e5b9f465412098ab22c93a6c..2518f5bc22989f63c05b80a1e4b44cfa8792bdd2 100644 (file)
--- 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 8125e267f3c7ea9138e66e3496ca016dc12a7f08..8b91cc996a45ef3dab2a51a563c4224be554266d 100644 (file)
--- 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 7800673d6a827bac5aad3951a086748d53796e3c..e02ca10a6358e44556a9d91fedf5edb7ccc7a999 100644 (file)
--- 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 58a963f6f8998050b68f2676573e577daa7a9280..7da14c652a071b07088032fb3c866ebdf6898b9a 100644 (file)
--- 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 773284bcdc1bc6d99c03b660083ba7dc11838823..8aacc9883d63fae0a6b5008172f96d7ea227e5a5 100644 (file)
--- 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 285900f4574c9c9767f6c6e31492f6d8ccb016ba..7f96d589c2fec4d6ed4c6462cecb9cd5fa8e1872 100644 (file)
--- 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 0de9ea9374950f5724f1724e6db211cd5349f0c2..1755a5ff052696d2cac187354c362c6012fe330a 100644 (file)
--- 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 958a78333ffe59552712f46971c5b6ad76fea4cf..487c989c2395b278f4baff42cfef1bbe038621e3 100644 (file)
--- 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 720b2361f5851686a596876ae0a756a417e14ae2..fa8b939d8272eadb05250e370480195e8ffec79c 100644 (file)
--- 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 4f59cab7bb1d7040dad8db7f8649d0ce713e62db..6f43e809b14e3af7067e5ecdd83942c604b4bf84 100644 (file)
--- 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 4c08c8df2e6f16e1245a8741141e47962be8de20..a477e6518a3f75e2d35946e598e7a1ad67110052 100644 (file)
--- 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>