From dcb8b49c11529268e77ba946bd4a49d0f45a80e8 Mon Sep 17 00:00:00 2001 From: Richard Millet Date: Sat, 24 Apr 2010 05:28:55 +0000 Subject: [PATCH] NOJIRA: Pom file cleanup. Removed redundant maven-compiler-plugin declarations and other misc pom changes. --- pom.xml | 75 +++-------------- services/IntegrationTests/pom.xml | 22 ----- services/PerformanceTests/pom.xml | 20 +---- services/account/client/pom.xml | 7 +- services/account/pom.xml | 5 -- services/account/service/pom.xml | 2 + services/acquisition/client/pom.xml | 32 -------- services/acquisition/pom.xml | 44 +--------- services/acquisition/service/pom.xml | 9 -- services/authentication/client/pom.xml | 20 ----- services/authentication/pom.xml | 25 ------ services/authentication/service/pom.xml | 3 - services/authorization-mgt/client/pom.xml | 23 +----- services/authorization-mgt/pom.xml | 4 +- services/authorization-mgt/service/pom.xml | 5 +- services/authorization/service/pom.xml | 8 +- services/client/pom.xml | 22 +---- services/collectionobject/client/pom.xml | 13 +-- services/collectionobject/pom.xml | 58 ++----------- services/collectionobject/service/pom.xml | 1 - services/common/pom.xml | 12 --- services/contact/client/pom.xml | 34 -------- services/contact/pom.xml | 45 ---------- services/contact/service/pom.xml | 18 ---- services/dimension/client/pom.xml | 32 -------- services/dimension/pom.xml | 59 +++---------- services/dimension/service/pom.xml | 18 ---- services/id/client/pom.xml | 22 ----- services/id/jaxb/pom.xml | 50 ++++++----- services/id/pom.xml | 14 ---- services/id/service/pom.xml | 36 +++----- .../src/test/resources/log4j.properties | 23 ++++++ services/intake/client/pom.xml | 32 -------- services/intake/pom.xml | 45 ---------- services/intake/service/pom.xml | 18 ---- services/loanin/client/pom.xml | 22 ----- services/loanin/pom.xml | 45 ---------- services/loanin/service/pom.xml | 18 ---- services/loanout/client/pom.xml | 22 ----- services/loanout/pom.xml | 45 ---------- services/loanout/service/pom.xml | 18 ---- services/organization/client/pom.xml | 36 +------- services/organization/import/pom.xml | 20 ----- services/organization/jaxb/pom.xml | 2 +- services/organization/pom.xml | 64 ++------------- services/organization/service/pom.xml | 17 ---- services/person/client/pom.xml | 32 -------- services/person/import/pom.xml | 20 ----- services/person/jaxb/pom.xml | 1 + services/person/pom.xml | 64 ++------------- services/person/service/pom.xml | 15 ---- services/pom.xml | 82 +++++++++---------- services/query/pom.xml | 45 ---------- services/query/service/pom.xml | 17 ---- services/relation/client/pom.xml | 26 +----- services/relation/pom.xml | 46 ----------- services/relation/service/pom.xml | 17 ---- services/security/client/pom.xml | 20 ----- services/security/pom.xml | 25 ------ services/vocabulary/client/pom.xml | 34 -------- services/vocabulary/import/pom.xml | 20 ----- services/vocabulary/pom.xml | 72 ++++------------ services/vocabulary/service/pom.xml | 17 ---- 63 files changed, 195 insertions(+), 1523 deletions(-) create mode 100644 services/id/service/src/test/resources/log4j.properties diff --git a/pom.xml b/pom.xml index 1924e1277..f5c55220e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.collectionspace.services @@ -88,7 +88,7 @@ - jboss + jboss.org http://repository.jboss.org/maven2 false @@ -96,7 +96,7 @@ - jboss + jboss.com http://repository.jboss.com/maven2 false @@ -160,11 +160,6 @@ never - - - - @@ -215,8 +210,9 @@ - org.apache.maven.plugins + org.apache.maven.plugins maven-compiler-plugin + 2.3 1.6 1.6 @@ -279,6 +275,7 @@ + @@ -291,69 +288,23 @@ slf4j-log4j12 1.5.2 - + + + diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml index 02bf7e5d4..1cb6c0870 100644 --- a/services/IntegrationTests/pom.xml +++ b/services/IntegrationTests/pom.xml @@ -101,28 +101,6 @@ collectionspace-services-IntegrationTests - - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - diff --git a/services/PerformanceTests/pom.xml b/services/PerformanceTests/pom.xml index 575fb539a..76ef91dac 100644 --- a/services/PerformanceTests/pom.xml +++ b/services/PerformanceTests/pom.xml @@ -97,27 +97,15 @@ collectionspace-services-PerformanceTests + org.apache.maven.plugins - maven-compiler-plugin + maven-surefire-plugin - 1.6 - 1.6 + true - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml index 6a4cf67ef..1c823a79f 100644 --- a/services/account/client/pom.xml +++ b/services/account/client/pom.xml @@ -18,10 +18,12 @@ org.slf4j slf4j-api + provided org.slf4j slf4j-log4j12 + provided org.collectionspace.services @@ -59,11 +61,6 @@ test test-jar --> - - org.testng - testng - 5.6 - org.jboss.resteasy resteasy-jaxrs diff --git a/services/account/pom.xml b/services/account/pom.xml index d201af219..1b3f94a5b 100644 --- a/services/account/pom.xml +++ b/services/account/pom.xml @@ -19,10 +19,5 @@ client - - - - - diff --git a/services/account/service/pom.xml b/services/account/service/pom.xml index d727ef854..aa53e8861 100644 --- a/services/account/service/pom.xml +++ b/services/account/service/pom.xml @@ -19,10 +19,12 @@ org.slf4j slf4j-api + provided org.slf4j slf4j-log4j12 + provided diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml index 33a681a64..091e9678f 100644 --- a/services/acquisition/client/pom.xml +++ b/services/acquisition/client/pom.xml @@ -53,16 +53,6 @@ testng 5.6 - - org.slf4j - slf4j-api - 1.5.2 - - - org.slf4j - slf4j-log4j12 - 1.5.2 - org.jboss.resteasy resteasy-jaxrs @@ -93,28 +83,6 @@ collectionspace-services-acquisition-client - - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - diff --git a/services/acquisition/pom.xml b/services/acquisition/pom.xml index 038f17a8c..c9187f832 100644 --- a/services/acquisition/pom.xml +++ b/services/acquisition/pom.xml @@ -21,49 +21,7 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-site-plugin - - /usr/bin/unzip -o > err.txt - - - - org.apache.maven.plugins - maven-war-plugin - 2.0.1 - - WEB-INF/lib/*.jar - - - true - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - + diff --git a/services/acquisition/service/pom.xml b/services/acquisition/service/pom.xml index da429159b..ecbeed9ec 100644 --- a/services/acquisition/service/pom.xml +++ b/services/acquisition/service/pom.xml @@ -108,15 +108,6 @@ ${jboss.dir} - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - true - - diff --git a/services/authentication/client/pom.xml b/services/authentication/client/pom.xml index 691247356..1e02f0502 100644 --- a/services/authentication/client/pom.xml +++ b/services/authentication/client/pom.xml @@ -96,26 +96,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - diff --git a/services/authentication/pom.xml b/services/authentication/pom.xml index 5937c8fb7..449ba7f21 100644 --- a/services/authentication/pom.xml +++ b/services/authentication/pom.xml @@ -22,30 +22,5 @@ client - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - diff --git a/services/authentication/service/pom.xml b/services/authentication/service/pom.xml index 1fe4af387..4f4bfdfa1 100644 --- a/services/authentication/service/pom.xml +++ b/services/authentication/service/pom.xml @@ -78,9 +78,6 @@ cspace-services-authn - - - diff --git a/services/authorization-mgt/client/pom.xml b/services/authorization-mgt/client/pom.xml index a1b81abef..bc2952f84 100644 --- a/services/authorization-mgt/client/pom.xml +++ b/services/authorization-mgt/client/pom.xml @@ -84,28 +84,7 @@ cspace-services-authorization-mgt-client - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - + diff --git a/services/authorization-mgt/pom.xml b/services/authorization-mgt/pom.xml index 747058d5a..af4e16a9c 100644 --- a/services/authorization-mgt/pom.xml +++ b/services/authorization-mgt/pom.xml @@ -1,16 +1,18 @@ - + 4.0.0 org.collectionspace.services.main org.collectionspace.services 0.6-SNAPSHOT + org.collectionspace.services org.collectionspace.services.authorization-mgt services.authorization-mgt pom http://www.collectionspace.org + service client diff --git a/services/authorization-mgt/service/pom.xml b/services/authorization-mgt/service/pom.xml index 97e0ad3c7..7245c6bec 100644 --- a/services/authorization-mgt/service/pom.xml +++ b/services/authorization-mgt/service/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 org.collectionspace.services.authorization-mgt @@ -183,8 +183,5 @@ collectionspace-services-authz-mgt - - - diff --git a/services/authorization/service/pom.xml b/services/authorization/service/pom.xml index 8537fe960..1d2cd6aed 100644 --- a/services/authorization/service/pom.xml +++ b/services/authorization/service/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.collectionspace.services.authorization @@ -165,7 +167,7 @@ log4j.configuration - file:target/test-classes/log4j.properties + file:${project.build.directory}/test-classes/log4j.properties spring-beans-config @@ -176,4 +178,4 @@ - + \ No newline at end of file diff --git a/services/client/pom.xml b/services/client/pom.xml index c8490bb03..a2e688b5e 100644 --- a/services/client/pom.xml +++ b/services/client/pom.xml @@ -16,10 +16,12 @@ org.slf4j slf4j-api + provided org.slf4j slf4j-log4j12 + provided - - junit - junit - 4.1 - test - org.slf4j slf4j-api @@ -67,12 +61,6 @@ 1.2.14 provided - - junit - junit - 4.1 - test - diff --git a/services/contact/client/pom.xml b/services/contact/client/pom.xml index 239eec16f..b7fe75747 100644 --- a/services/contact/client/pom.xml +++ b/services/contact/client/pom.xml @@ -18,12 +18,10 @@ org.slf4j slf4j-api - test org.slf4j slf4j-log4j12 - test @@ -42,16 +40,6 @@ testng 5.6 - - org.slf4j - slf4j-api - 1.5.2 - - - org.slf4j - slf4j-log4j12 - 1.5.2 - org.jboss.resteasy resteasy-jaxrs @@ -83,28 +71,6 @@ collectionspace-services-contact-client - - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - diff --git a/services/contact/pom.xml b/services/contact/pom.xml index d108c0ef1..0fdd89c94 100644 --- a/services/contact/pom.xml +++ b/services/contact/pom.xml @@ -20,50 +20,5 @@ client - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-site-plugin - - /usr/bin/unzip -o > err.txt - - - - org.apache.maven.plugins - maven-war-plugin - 2.0.1 - - WEB-INF/lib/*.jar - - - true - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - diff --git a/services/contact/service/pom.xml b/services/contact/service/pom.xml index 34096754d..13f1007cb 100644 --- a/services/contact/service/pom.xml +++ b/services/contact/service/pom.xml @@ -88,24 +88,6 @@ collectionspace-services-contact - - - org.codehaus.mojo - jboss-maven-plugin - - ${jboss.dir} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - true - - - diff --git a/services/dimension/client/pom.xml b/services/dimension/client/pom.xml index 905185939..f2b9a9773 100644 --- a/services/dimension/client/pom.xml +++ b/services/dimension/client/pom.xml @@ -43,16 +43,6 @@ testng 5.6 - - org.slf4j - slf4j-api - 1.5.2 - - - org.slf4j - slf4j-log4j12 - 1.5.2 - org.jboss.resteasy resteasy-jaxrs @@ -84,28 +74,6 @@ collectionspace-services-dimension-client - - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - diff --git a/services/dimension/pom.xml b/services/dimension/pom.xml index 8c1be2250..f79ad2fad 100644 --- a/services/dimension/pom.xml +++ b/services/dimension/pom.xml @@ -14,57 +14,24 @@ services.dimension pom + + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + jaxb service 3rdparty client - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-site-plugin - - /usr/bin/unzip -o > err.txt - - - - org.apache.maven.plugins - maven-war-plugin - 2.0.1 - - WEB-INF/lib/*.jar - - - true - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - + diff --git a/services/dimension/service/pom.xml b/services/dimension/service/pom.xml index 99d21dbbc..f9fd0f45b 100644 --- a/services/dimension/service/pom.xml +++ b/services/dimension/service/pom.xml @@ -112,24 +112,6 @@ collectionspace-services-dimension - - - org.codehaus.mojo - jboss-maven-plugin - - ${jboss.dir} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - true - - - diff --git a/services/id/client/pom.xml b/services/id/client/pom.xml index e7a7f7748..23917b6a7 100644 --- a/services/id/client/pom.xml +++ b/services/id/client/pom.xml @@ -63,28 +63,6 @@ cspace-services-id-client - - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - diff --git a/services/id/jaxb/pom.xml b/services/id/jaxb/pom.xml index e5050b9e9..a64567d03 100644 --- a/services/id/jaxb/pom.xml +++ b/services/id/jaxb/pom.xml @@ -22,42 +22,40 @@ - - org.collectionspace.services - org.collectionspace.services.id - 0.6-SNAPSHOT - - - 4.0.0 + org.collectionspace.services - org.collectionspace.services.id.jaxb - services.id.jaxb + org.collectionspace.services.id + 0.6-SNAPSHOT + + + 4.0.0 + org.collectionspace.services + org.collectionspace.services.id.jaxb + services.id.jaxb + + + + com.sun.xml.bind + jaxb-impl + + + org.jvnet.jaxb2-commons + property-listener-injector + + + org.jvnet.jaxb2_commons + runtime + + - - - com.sun.xml.bind - jaxb-impl - - - org.jvnet.jaxb2-commons - property-listener-injector - - - org.jvnet.jaxb2_commons - runtime - - - collectionspace-services-id-jaxb install - org.jvnet.jaxb2.maven2 maven-jaxb2-plugin - diff --git a/services/id/pom.xml b/services/id/pom.xml index 103f1b1ce..085b8982a 100644 --- a/services/id/pom.xml +++ b/services/id/pom.xml @@ -40,20 +40,6 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - - diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml index f80e6c5ce..45d265ff6 100644 --- a/services/id/service/pom.xml +++ b/services/id/service/pom.xml @@ -16,8 +16,7 @@ $LastChangedDate: 2009-06-29 15:36:29 -0700 (Mon, 29 Jun 2009) $ --> - @@ -26,7 +25,7 @@ org.collectionspace.services 0.6-SNAPSHOT - + 4.0.0 org.collectionspace.services org.collectionspace.services.id.service @@ -34,14 +33,14 @@ services.id.service - + org.collectionspace.services org.collectionspace.services.common ${project.version} - + @@ -50,7 +49,7 @@ 4.1 test - + @@ -60,7 +59,7 @@ - + javax.security jaas @@ -75,7 +74,7 @@ 1.6.1 provided - + @@ -102,14 +101,14 @@ resteasy-multipart-provider 1.0.2.GA - + org.codehaus.mojo cobertura-maven-plugin 2.2 - + mysql @@ -117,7 +116,7 @@ test - + com.thoughtworks.xstream @@ -126,22 +125,9 @@ - + collectionspace-services-id - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - diff --git a/services/id/service/src/test/resources/log4j.properties b/services/id/service/src/test/resources/log4j.properties new file mode 100644 index 000000000..18c510350 --- /dev/null +++ b/services/id/service/src/test/resources/log4j.properties @@ -0,0 +1,23 @@ +log4j.rootLogger=debug, stdout, R + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout + +# Pattern to output the caller's file name and line number. +log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n + +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.File=target/test-client.log + +log4j.appender.R.MaxFileSize=100KB +# Keep one backup file +log4j.appender.R.MaxBackupIndex=1 + +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n + +#packages +log4j.logger.org.collectionspace=DEBUG +log4j.logger.org.apache=INFO +log4j.logger.httpclient=INFO +log4j.logger.org.jboss.resteasy=INFO diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml index 499910fa2..1fc96a5ca 100644 --- a/services/intake/client/pom.xml +++ b/services/intake/client/pom.xml @@ -58,16 +58,6 @@ testng 5.6 - - org.slf4j - slf4j-api - 1.5.2 - - - org.slf4j - slf4j-log4j12 - 1.5.2 - org.jboss.resteasy resteasy-jaxrs @@ -99,28 +89,6 @@ collectionspace-services-intake-client - - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - diff --git a/services/intake/pom.xml b/services/intake/pom.xml index 9c9cd2ed9..9f4e6ffa3 100644 --- a/services/intake/pom.xml +++ b/services/intake/pom.xml @@ -20,50 +20,5 @@ client - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-site-plugin - - /usr/bin/unzip -o > err.txt - - - - org.apache.maven.plugins - maven-war-plugin - 2.0.1 - - WEB-INF/lib/*.jar - - - true - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - diff --git a/services/intake/service/pom.xml b/services/intake/service/pom.xml index e87bf35f4..13efb3e4b 100644 --- a/services/intake/service/pom.xml +++ b/services/intake/service/pom.xml @@ -115,24 +115,6 @@ collectionspace-services-intake - - - org.codehaus.mojo - jboss-maven-plugin - - ${jboss.dir} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - true - - - diff --git a/services/loanin/client/pom.xml b/services/loanin/client/pom.xml index 61716c67d..f81ebb84b 100644 --- a/services/loanin/client/pom.xml +++ b/services/loanin/client/pom.xml @@ -89,27 +89,5 @@ collectionspace-services-loanin-client - - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - diff --git a/services/loanin/pom.xml b/services/loanin/pom.xml index 84ac4e12e..1f0554440 100644 --- a/services/loanin/pom.xml +++ b/services/loanin/pom.xml @@ -20,50 +20,5 @@ client - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-site-plugin - - /usr/bin/unzip -o > err.txt - - - - org.apache.maven.plugins - maven-war-plugin - 2.0.1 - - WEB-INF/lib/*.jar - - - true - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - diff --git a/services/loanin/service/pom.xml b/services/loanin/service/pom.xml index 8cfe40bef..7f686e138 100644 --- a/services/loanin/service/pom.xml +++ b/services/loanin/service/pom.xml @@ -115,24 +115,6 @@ collectionspace-services-loanin - - - org.codehaus.mojo - jboss-maven-plugin - - ${jboss.dir} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - true - - - diff --git a/services/loanout/client/pom.xml b/services/loanout/client/pom.xml index f2ebfe1a2..cd0d3224a 100644 --- a/services/loanout/client/pom.xml +++ b/services/loanout/client/pom.xml @@ -89,27 +89,5 @@ collectionspace-services-loanout-client - - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - diff --git a/services/loanout/pom.xml b/services/loanout/pom.xml index 675c04964..45f1ffa52 100644 --- a/services/loanout/pom.xml +++ b/services/loanout/pom.xml @@ -20,50 +20,5 @@ client - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-site-plugin - - /usr/bin/unzip -o > err.txt - - - - org.apache.maven.plugins - maven-war-plugin - 2.0.1 - - WEB-INF/lib/*.jar - - - true - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - diff --git a/services/loanout/service/pom.xml b/services/loanout/service/pom.xml index 545cb44ec..4e0dee16c 100644 --- a/services/loanout/service/pom.xml +++ b/services/loanout/service/pom.xml @@ -115,24 +115,6 @@ collectionspace-services-loanout - - - org.codehaus.mojo - jboss-maven-plugin - - ${jboss.dir} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - true - - - diff --git a/services/organization/client/pom.xml b/services/organization/client/pom.xml index ad452dc43..78e322700 100644 --- a/services/organization/client/pom.xml +++ b/services/organization/client/pom.xml @@ -18,12 +18,12 @@ org.slf4j slf4j-api - test + provided org.slf4j slf4j-log4j12 - test + provided @@ -47,16 +47,6 @@ testng 5.6 - - org.slf4j - slf4j-api - 1.5.2 - - - org.slf4j - slf4j-log4j12 - 1.5.2 - org.jboss.resteasy resteasy-jaxrs @@ -88,28 +78,6 @@ collectionspace-services-organization-client - - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - diff --git a/services/organization/import/pom.xml b/services/organization/import/pom.xml index 1827e4a9d..bd9da2fc1 100644 --- a/services/organization/import/pom.xml +++ b/services/organization/import/pom.xml @@ -102,26 +102,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - diff --git a/services/organization/jaxb/pom.xml b/services/organization/jaxb/pom.xml index 629155e8e..ca12bdb90 100644 --- a/services/organization/jaxb/pom.xml +++ b/services/organization/jaxb/pom.xml @@ -27,6 +27,7 @@ runtime + collectionspace-services-organization-jaxb install @@ -35,7 +36,6 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin - diff --git a/services/organization/pom.xml b/services/organization/pom.xml index 42b1a3c57..f8eadb7c7 100644 --- a/services/organization/pom.xml +++ b/services/organization/pom.xml @@ -19,61 +19,15 @@ client - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-site-plugin - - /usr/bin/unzip -o > err.txt - - - - org.apache.maven.plugins - maven-war-plugin - 2.0.1 - - WEB-INF/lib/*.jar - - - true - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - - - - - samples - - import - sample - - - + + + samples + + import + sample + + + diff --git a/services/organization/service/pom.xml b/services/organization/service/pom.xml index 35c5c6418..c967d8312 100644 --- a/services/organization/service/pom.xml +++ b/services/organization/service/pom.xml @@ -137,23 +137,6 @@ collectionspace-services-organization - - - org.codehaus.mojo - jboss-maven-plugin - - ${jboss.dir} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - diff --git a/services/person/client/pom.xml b/services/person/client/pom.xml index 7f9a83191..674dc76a8 100644 --- a/services/person/client/pom.xml +++ b/services/person/client/pom.xml @@ -18,12 +18,10 @@ org.slf4j slf4j-api - test org.slf4j slf4j-log4j12 - test @@ -58,16 +56,6 @@ testng 5.6 - - org.slf4j - slf4j-api - 1.5.2 - - - org.slf4j - slf4j-log4j12 - 1.5.2 - org.jboss.resteasy resteasy-jaxrs @@ -100,26 +88,6 @@ collectionspace-services-person-client - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - diff --git a/services/person/import/pom.xml b/services/person/import/pom.xml index f60723624..ad7f10425 100644 --- a/services/person/import/pom.xml +++ b/services/person/import/pom.xml @@ -102,26 +102,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - diff --git a/services/person/jaxb/pom.xml b/services/person/jaxb/pom.xml index 820654a2f..bfc4524cb 100644 --- a/services/person/jaxb/pom.xml +++ b/services/person/jaxb/pom.xml @@ -27,6 +27,7 @@ runtime + collectionspace-services-person-jaxb install diff --git a/services/person/pom.xml b/services/person/pom.xml index 6bb4f76db..bb04e5a26 100644 --- a/services/person/pom.xml +++ b/services/person/pom.xml @@ -18,62 +18,16 @@ 3rdparty client - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-site-plugin - - /usr/bin/unzip -o > err.txt - - - - org.apache.maven.plugins - maven-war-plugin - 2.0.1 - - WEB-INF/lib/*.jar - - - true - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - - - - samples - - import - sample - - - + + + samples + + import + sample + + + diff --git a/services/person/service/pom.xml b/services/person/service/pom.xml index e356df971..ea225889b 100644 --- a/services/person/service/pom.xml +++ b/services/person/service/pom.xml @@ -138,21 +138,6 @@ collectionspace-services-person - - org.codehaus.mojo - jboss-maven-plugin - - ${jboss.dir} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - diff --git a/services/pom.xml b/services/pom.xml index 50e57ef22..b967399fd 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -14,7 +14,7 @@ authentication - authorization + client jaxb common @@ -39,6 +39,15 @@ PerformanceTests security + + + + org.testng + testng + test + jdk15 + + @@ -49,27 +58,25 @@ - org.codehaus.mojo - jboss-maven-plugin - 1.4 - - ${jboss.dir} - - - - - + + + org.codehaus.mojo + jboss-maven-plugin + 1.4 + + ${jboss.dir} + + org.jvnet.hyperjaxb3 maven-hyperjaxb3-plugin @@ -88,13 +95,6 @@ garbage - - - org.jvnet.jaxb2.maven2 maven-jaxb2-plugin @@ -133,25 +133,26 @@ 1.0 - - - - - - - org.apache.maven.plugins - maven-site-plugin - - /usr/bin/unzip -o > err.txt - - + + + + org.apache.maven.plugins + maven-site-plugin + + /usr/bin/unzip -o > err.txt + + + + org.apache.maven.plugins + maven-surefire-plugin + + + @@ -196,10 +197,15 @@ - + + + net.java.dev.jaxb2-commons + jaxb-fluent-api + 2.0.2 org.testng @@ -218,11 +224,6 @@ basic 0.4.1 - - net.java.dev.jaxb2-commons - jaxb-fluent-api - 2.0.2 - org.jvnet.jaxb2-commons property-listener-injector @@ -233,7 +234,6 @@ runtime 0.4.1.4 - org.jboss.resteasy resteasy-jaxrs diff --git a/services/query/pom.xml b/services/query/pom.xml index e054046fc..3915a6168 100644 --- a/services/query/pom.xml +++ b/services/query/pom.xml @@ -16,50 +16,5 @@ service - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-site-plugin - - /usr/bin/unzip -o > err.txt - - - - org.apache.maven.plugins - maven-war-plugin - 2.0.1 - - WEB-INF/lib/*.jar - - - true - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - diff --git a/services/query/service/pom.xml b/services/query/service/pom.xml index f60c5fc4e..116deeca6 100644 --- a/services/query/service/pom.xml +++ b/services/query/service/pom.xml @@ -127,23 +127,6 @@ collectionspace-services-query - - - org.codehaus.mojo - jboss-maven-plugin - - ${jboss.dir} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml index 06c21611b..087d90c63 100644 --- a/services/relation/client/pom.xml +++ b/services/relation/client/pom.xml @@ -18,12 +18,12 @@ org.slf4j slf4j-api - test + provided org.slf4j slf4j-log4j12 - test + provided @@ -73,27 +73,5 @@ cspace-services-relation-client - - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.5 - 1.5 - - - diff --git a/services/relation/pom.xml b/services/relation/pom.xml index 77dd2fc39..2982bdab0 100644 --- a/services/relation/pom.xml +++ b/services/relation/pom.xml @@ -18,51 +18,5 @@ client - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-site-plugin - - /usr/bin/unzip -o > err.txt - - - - org.apache.maven.plugins - maven-war-plugin - 2.0.1 - - WEB-INF/lib/*.jar - - - true - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - diff --git a/services/relation/service/pom.xml b/services/relation/service/pom.xml index 86e47c0fe..3770752fb 100644 --- a/services/relation/service/pom.xml +++ b/services/relation/service/pom.xml @@ -112,22 +112,5 @@ collectionspace-services-relation - - - org.codehaus.mojo - jboss-maven-plugin - - ${jboss.dir} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - diff --git a/services/security/client/pom.xml b/services/security/client/pom.xml index 6c511f3c9..e9b946171 100644 --- a/services/security/client/pom.xml +++ b/services/security/client/pom.xml @@ -103,26 +103,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - diff --git a/services/security/pom.xml b/services/security/pom.xml index ea60987cc..2fc7b7b22 100644 --- a/services/security/pom.xml +++ b/services/security/pom.xml @@ -19,30 +19,5 @@ client - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - diff --git a/services/vocabulary/client/pom.xml b/services/vocabulary/client/pom.xml index 790864d6d..96f1bf873 100644 --- a/services/vocabulary/client/pom.xml +++ b/services/vocabulary/client/pom.xml @@ -19,12 +19,10 @@ org.slf4j slf4j-api - test org.slf4j slf4j-log4j12 - test @@ -43,16 +41,6 @@ testng 5.6 - - org.slf4j - slf4j-api - 1.5.2 - - - org.slf4j - slf4j-log4j12 - 1.5.2 - org.jboss.resteasy resteasy-jaxrs @@ -84,28 +72,6 @@ collectionspace-services-vocabulary-client - - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - diff --git a/services/vocabulary/import/pom.xml b/services/vocabulary/import/pom.xml index c49afeb62..2803614a3 100644 --- a/services/vocabulary/import/pom.xml +++ b/services/vocabulary/import/pom.xml @@ -100,26 +100,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - - log4j.configuration - file:target/test-classes/log4j.properties - - - - - - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - diff --git a/services/vocabulary/pom.xml b/services/vocabulary/pom.xml index b8c5ee844..50b8109f3 100644 --- a/services/vocabulary/pom.xml +++ b/services/vocabulary/pom.xml @@ -1,11 +1,13 @@ - + org.collectionspace.services.main org.collectionspace.services 0.6-SNAPSHOT - + 4.0.0 org.collectionspace.services org.collectionspace.services.vocabulary @@ -19,61 +21,15 @@ client - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-site-plugin - - /usr/bin/unzip -o > err.txt - - - - org.apache.maven.plugins - maven-war-plugin - 2.0.1 - - WEB-INF/lib/*.jar - - - true - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - - - - - samples - - import - sample - - - - + + + samples + + import + sample + + + + diff --git a/services/vocabulary/service/pom.xml b/services/vocabulary/service/pom.xml index 53cce253d..7b1560e4a 100644 --- a/services/vocabulary/service/pom.xml +++ b/services/vocabulary/service/pom.xml @@ -132,23 +132,6 @@ collectionspace-services-vocabulary - - - org.codehaus.mojo - jboss-maven-plugin - - ${jboss.dir} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - -- 2.47.3