From fd99a8b31a752135c8e2f16041ba35da70c7b2dc Mon Sep 17 00:00:00 2001 From: mcentner Date: Thu, 23 Aug 2007 08:38:49 +0000 Subject: Updated dependency declarations to omit certain transitive dependencies from being included into war-files. git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@936 d688527b-c9ab-4aba-bd8d-4036d912da1d --- common-test/pom.xml | 3 - common/pom.xml | 1 - id/server/auth/pom.xml | 43 ++++++++++ id/server/idserverlib/pom.xml | 5 -- id/server/proxy/assembly-war.xml | 86 ------------------- id/server/proxy/pom.xml | 173 ++++++++++----------------------------- spss/server/serverlib/pom.xml | 46 ++--------- spss/server/serverws/pom.xml | 43 ++++++++++ spss/server/tools/pom.xml | 62 +++++++------- 9 files changed, 168 insertions(+), 294 deletions(-) delete mode 100644 id/server/proxy/assembly-war.xml diff --git a/common-test/pom.xml b/common-test/pom.xml index f50be285f..6c605f1b5 100644 --- a/common-test/pom.xml +++ b/common-test/pom.xml @@ -40,17 +40,14 @@ xalan xalan - true xerces xercesImpl - true xerces xmlParserAPIs - true diff --git a/common/pom.xml b/common/pom.xml index 5e860e659..85b206ee9 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -25,7 +25,6 @@ iaik.prod iaik_jce_full - true junit diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index 8dd93220b..80eabe6d0 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -59,6 +59,49 @@ moa-id-lib ${project.version} + + + iaik.prod + iaik_jce_full + + provided + + + iaik.prod + iaik_ecc + + provided + + + iaik.prod + iaik_Pkcs11Provider + + provided + + + iaik.prod + iaik_Pkcs11Wrapper + + provided + + + xalan + xalan + + provided + + + xerces + xercesImpl + + provided + + + xerces + xmlParserAPIs + + provided + diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 6add66ebe..7c30ddbe2 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -38,17 +38,14 @@ xerces xercesImpl - true xerces xmlParserAPIs - true xalan xalan - true junit @@ -95,13 +92,11 @@ iaik.prod iaik_ecc - true iaik.prod iaik_jce_full provided - true iaik.prod diff --git a/id/server/proxy/assembly-war.xml b/id/server/proxy/assembly-war.xml deleted file mode 100644 index dba832a74..000000000 --- a/id/server/proxy/assembly-war.xml +++ /dev/null @@ -1,86 +0,0 @@ - - web - - - war - - - false - - - - ${basedir}/src/main/webapp - / - - - ${basedir}/../idserverlib/target/classes - WEB-INF/classes - - **/auth/** - - - - ${basedir}/src/main/webapp - / - - - ${basedir}/../../../common/target - WEB-INF/lib - - **/*.jar - - - - ${basedir}/../../../spss/server/serverlib/target - WEB-INF/lib - - **/*.jar - - - - ${basedir}/../resources - WEB-INF/classes/resources - - - ${basedir}/../services - WEB-INF/classes/META-INF/services - - - - - - - javaext:activation - axis:axis - commons-discovery:commons-discovery - commons-logging:commons-logging - jaxp:dom - iaik.prod:iaik_ixsil - iaik.prod:iaik_moa - iaik.prod:iaik_Pkcs11Wrapper - iaik.prod:iaik_X509TrustManager - jaxen:jaxen-core - jaxen:jaxen-dom - jaxp:jaxp-api - javax.xml:jaxrpc - mail:mail - saaj:saaj - jaxp:sax - jaxen:saxpath - wsdl4j:wsdl4j - regexp:regexp - log4j:log4j - postgresql:postgresql - - WEB-INF/lib - - - - iaik.prod:iaik_Pkcs11Wrapper:dll:win32 - - pkcs11wrapper.dll - WEB-INF/lib/win32 - - - - \ No newline at end of file diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index db0897931..faffae81b 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -45,15 +45,6 @@ --> - - - test - package - - exploded - - - @@ -70,127 +61,49 @@ moa-id-lib ${project.version} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + iaik.prod + iaik_jce_full + + provided + + + iaik.prod + iaik_ecc + + provided + + + iaik.prod + iaik_Pkcs11Provider + + provided + + + iaik.prod + iaik_Pkcs11Wrapper + + provided + + + xalan + xalan + + provided + + + xerces + xercesImpl + + provided + + + xerces + xmlParserAPIs + + provided + - - - - - - - - - - - - - - - - - - - - - diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index 25cb8bade..5264b0a86 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -22,10 +22,6 @@ axis axis - - - - commons-discovery commons-discovery @@ -38,34 +34,6 @@ javax.activation activation - - - - - - - - - - - - - - - - - - - - - - - - - - - - junit junit @@ -81,22 +49,19 @@ javax.servlet servlet-api - true + provided xalan xalan - true xerces xercesImpl - true xerces xmlParserAPIs - true iaik.prod @@ -110,25 +75,26 @@ iaik.prod iaik_jce_full compile - true iaik.prod iaik_ecc compile - true + + + iaik.prod + iaik_cms + runtime iaik.prod iaik_Pkcs11Provider runtime - true iaik.prod iaik_Pkcs11Wrapper runtime - true diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index 382e19d46..b286db6a2 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -62,5 +62,48 @@ MOA moa-common + + + iaik.prod + iaik_jce_full + + provided + + + iaik.prod + iaik_ecc + + provided + + + iaik.prod + iaik_Pkcs11Provider + + provided + + + iaik.prod + iaik_Pkcs11Wrapper + + provided + + + xalan + xalan + + provided + + + xerces + xercesImpl + + provided + + + xerces + xmlParserAPIs + + provided + diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml index 9ecc2b240..184d67554 100644 --- a/spss/server/tools/pom.xml +++ b/spss/server/tools/pom.xml @@ -1,34 +1,38 @@ - - - MOA.spss - moa-spss - 1.4.0 - + + + MOA.spss + moa-spss + 1.4.0 + - 4.0.0 - MOA.spss.server - moa-spss-tools - jar - 1.4.0 - MOA SP/SS Tools + 4.0.0 + MOA.spss.server + moa-spss-tools + jar + 1.4.0 + MOA SP/SS Tools - - ${basedir}/../../../buildhelper - + + ${basedir}/../../../buildhelper + - - - MOA.spss.server - moa-spss-lib - ${project.version} - - - iaik.prod - iaik_ecc - compile - - + + + MOA.spss.server + moa-spss-lib + ${project.version} + + + iaik.prod + iaik_jce_full + compile + + + iaik.prod + iaik_ecc + compile + + -- cgit v1.2.3