diff options
Diffstat (limited to 'spss')
| -rw-r--r-- | spss/assembly-lib.xml | 89 | ||||
| -rw-r--r-- | spss/assembly.xml | 86 | ||||
| -rw-r--r-- | spss/server/serverlib/pom.xml | 8 | ||||
| -rw-r--r-- | spss/server/serverws/pom.xml | 10 |
4 files changed, 22 insertions, 171 deletions
diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml index 0ca602f4a..0b47705a2 100644 --- a/spss/assembly-lib.xml +++ b/spss/assembly-lib.xml @@ -19,7 +19,8 @@ <includes> <include>xalan-bin-dist:xalan</include> <include>xerces:xercesImpl</include> - <include>xerces:xmlParserAPIs</include> + <include>xalan-bin-dist:xml-apis</include> + <include>xalan-bin-dist:serializer</include> </includes> <outputDirectory>/endorsed</outputDirectory> <!-- strip version off the artifact file names --> @@ -49,7 +50,8 @@ <exclude>MOA:moa-common</exclude> <exclude>xalan-bin-dist:xalan</exclude> <exclude>xerces:xercesImpl</exclude> - <exclude>xerces:xmlParserAPIs</exclude> + <exclude>xalan-bin-dist:xml-apis</exclude> + <exclude>xalan-bin-dist:serializer</exclude> <exclude>iaik.prod:iaik_ecc</exclude> <exclude>iaik.prod:iaik_jce_full</exclude> <exclude>iaik.prod:iaik_Pkcs11Provider</exclude> @@ -142,85 +144,4 @@ </fileSet> </fileSets> - <!-- - - - <files> - <file> - <source>${basedir}/../handbook/handbook.html</source> - <outputDirectory>/doc</outputDirectory> - </file> - </files> - - <fileSets> - <fileSet> - <directory>${basedir}/../../handbook/conf</directory> - <outputDirectory>/conf</outputDirectory> - </fileSet> - <fileSet> - <directory>${basedir}/../../handbook/handbook</directory> - <outputDirectory>/doc/handbook</outputDirectory> - </fileSet> - <fileSet> - <directory>${basedir}/../../handbook/clients</directory> - <outputDirectory>/doc/clients</outputDirectory> - </fileSet> - <fileSet> - <directory>${basedir}/../serverlib/resources/licenses</directory> - <outputDirectory>/licenses</outputDirectory> - </fileSet> - <fileSet> - <directory>${basedir}/../serverws/data/deploy/tomcat</directory> - <outputDirectory>/tomcat</outputDirectory> - </fileSet> - <fileSet> - <directory>${basedir}/../serverws/target</directory> - <outputDirectory>/</outputDirectory> - </fileSet> - <fileSet> - <directory>${basedir}/../serverws/data/deploy/tools</directory> - <outputDirectory>/tools</outputDirectory> - </fileSet> - </fileSets> - - <dependencySets> - <dependencySet> - <includes> - <include>MOA.ssps.server:serverwebasdfasdf</include> - </includes> - </dependencySet> - <dependencySet> - <includes> - <include>xalan:xalan</include> - <include>xerces:xercesImpl</include> - <include>xerces:xmlParserAPIs</include> - </includes> - <outputDirectory>/endorsed</outputDirectory> - </dependencySet> - <dependencySet> - <includes> - <include>iaik.prod:iaik_ecc</include> - <include>iaik.prod:iaik_jce_full</include> - <include>iaik.prod:iaik_Pkcs11Provider</include> - </includes> - <outputDirectory>/ext</outputDirectory> - </dependencySet> - <dependencySet> - <includes> - <include>iaik.win32:Pkcs11Wrapper</include> - </includes> - <outputDirectory>/pkcs11/win32</outputDirectory> - </dependencySet> - <dependencySet> - <includes> - <include>iaik.prod:iaik_ecc</include> - <include>iaik.prod:iaik_jce_full</include> - <include>iaik.prod:iaik_moa_full</include> - <include>log4j:log4j</include> - <include>xalan:xalan</include> - </includes> - <outputDirectory>/tools</outputDirectory> - </dependencySet> - </dependencySets> - ---></assembly>
\ No newline at end of file +</assembly>
\ No newline at end of file diff --git a/spss/assembly.xml b/spss/assembly.xml index a52860016..435dd04ec 100644 --- a/spss/assembly.xml +++ b/spss/assembly.xml @@ -19,7 +19,8 @@ <includes> <include>xalan-bin-dist:xalan</include> <include>xerces:xercesImpl</include> - <include>xerces:xmlParserAPIs</include> + <include>xalan-bin-dist:xml-apis</include> + <include>xalan-bin-dist:serializer</include> </includes> <outputDirectory>/endorsed</outputDirectory> <!-- strip version off the artifact file names --> @@ -139,85 +140,4 @@ </fileSet> </fileSets> - <!-- - - - <files> - <file> - <source>${basedir}/../handbook/handbook.html</source> - <outputDirectory>/doc</outputDirectory> - </file> - </files> - - <fileSets> - <fileSet> - <directory>${basedir}/../../handbook/conf</directory> - <outputDirectory>/conf</outputDirectory> - </fileSet> - <fileSet> - <directory>${basedir}/../../handbook/handbook</directory> - <outputDirectory>/doc/handbook</outputDirectory> - </fileSet> - <fileSet> - <directory>${basedir}/../../handbook/clients</directory> - <outputDirectory>/doc/clients</outputDirectory> - </fileSet> - <fileSet> - <directory>${basedir}/../serverlib/resources/licenses</directory> - <outputDirectory>/licenses</outputDirectory> - </fileSet> - <fileSet> - <directory>${basedir}/../serverws/data/deploy/tomcat</directory> - <outputDirectory>/tomcat</outputDirectory> - </fileSet> - <fileSet> - <directory>${basedir}/../serverws/target</directory> - <outputDirectory>/</outputDirectory> - </fileSet> - <fileSet> - <directory>${basedir}/../serverws/data/deploy/tools</directory> - <outputDirectory>/tools</outputDirectory> - </fileSet> - </fileSets> - - <dependencySets> - <dependencySet> - <includes> - <include>MOA.ssps.server:serverwebasdfasdf</include> - </includes> - </dependencySet> - <dependencySet> - <includes> - <include>xalan:xalan</include> - <include>xerces:xercesImpl</include> - <include>xerces:xmlParserAPIs</include> - </includes> - <outputDirectory>/endorsed</outputDirectory> - </dependencySet> - <dependencySet> - <includes> - <include>iaik.prod:iaik_ecc</include> - <include>iaik.prod:iaik_jce_full</include> - <include>iaik.prod:iaik_Pkcs11Provider</include> - </includes> - <outputDirectory>/ext</outputDirectory> - </dependencySet> - <dependencySet> - <includes> - <include>iaik.win32:Pkcs11Wrapper</include> - </includes> - <outputDirectory>/pkcs11/win32</outputDirectory> - </dependencySet> - <dependencySet> - <includes> - <include>iaik.prod:iaik_ecc</include> - <include>iaik.prod:iaik_jce_full</include> - <include>iaik.prod:iaik_moa_full</include> - <include>log4j:log4j</include> - <include>xalan:xalan</include> - </includes> - <outputDirectory>/tools</outputDirectory> - </dependencySet> - </dependencySets> - ---></assembly>
\ No newline at end of file +</assembly>
\ No newline at end of file diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index 1a169b357..c71b4708d 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -65,8 +65,12 @@ <artifactId>xercesImpl</artifactId> </dependency> <dependency> - <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> + <groupId>xalan-bin-dist</groupId> + <artifactId>xml-apis</artifactId> + </dependency> + <dependency> + <groupId>xalan-bin-dist</groupId> + <artifactId>serializer</artifactId> </dependency> <dependency> <groupId>iaik.prod</groupId> diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index 7fa109145..62b925957 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -101,8 +101,14 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> + <groupId>xalan-bin-dist</groupId> + <artifactId>xml-apis</artifactId> + <!-- should be provided by the container or jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>xalan-bin-dist</groupId> + <artifactId>serializer</artifactId> <!-- should be provided by the container or jre --> <scope>provided</scope> </dependency> |