diff options
Diffstat (limited to 'spss')
| -rw-r--r-- | spss/assembly-lib.xml | 8 | ||||
| -rw-r--r-- | spss/assembly.xml | 28 | ||||
| -rw-r--r-- | spss/server/serverlib/pom.xml | 3 | ||||
| -rw-r--r-- | spss/server/serverws/pom.xml | 2 |
4 files changed, 26 insertions, 15 deletions
diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml index 669ef471f..0ca602f4a 100644 --- a/spss/assembly-lib.xml +++ b/spss/assembly-lib.xml @@ -17,7 +17,7 @@ <dependencySets> <dependencySet> <includes> - <include>xalan:xalan</include> + <include>xalan-bin-dist:xalan</include> <include>xerces:xercesImpl</include> <include>xerces:xmlParserAPIs</include> </includes> @@ -47,7 +47,7 @@ <dependencySet> <excludes> <exclude>MOA:moa-common</exclude> - <exclude>xalan:xalan</exclude> + <exclude>xalan-bin-dist:xalan</exclude> <exclude>xerces:xercesImpl</exclude> <exclude>xerces:xmlParserAPIs</exclude> <exclude>iaik.prod:iaik_ecc</exclude> @@ -62,7 +62,7 @@ <include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include> </includes> <outputDirectory>/lib/win32</outputDirectory> - <outputFileNameMapping>pkcs11wrapper.dll</outputFileNameMapping> + <outputFileNameMapping>pkcs11wrapper.${extension}</outputFileNameMapping> </dependencySet> </dependencySets> <outputFileNameMapping>moa-spss.${extension}</outputFileNameMapping> @@ -92,7 +92,7 @@ <includes> <include>iaik.prod:iaik_moa</include> <include>log4j:log4j</include> - <include>xalan:xalan</include> + <include>xalan-bin-dist:xalan</include> </includes> <outputDirectory>/tools</outputDirectory> <!-- strip version off the artifact file names --> diff --git a/spss/assembly.xml b/spss/assembly.xml index d861b8ab9..a52860016 100644 --- a/spss/assembly.xml +++ b/spss/assembly.xml @@ -17,7 +17,7 @@ <dependencySets> <dependencySet> <includes> - <include>xalan:xalan</include> + <include>xalan-bin-dist:xalan</include> <include>xerces:xercesImpl</include> <include>xerces:xmlParserAPIs</include> </includes> @@ -36,18 +36,28 @@ <!-- strip version off the artifact file names --> <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> </dependencySet> - <dependencySet> - <includes> - <include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include> - </includes> - <outputDirectory>/pkcs11/win32</outputDirectory> - <outputFileNameMapping>pkcs11wrapper.dll</outputFileNameMapping> - </dependencySet> </dependencySets> <outputFileNameMapping>moa-spss.${extension}</outputFileNameMapping> <unpack>false</unpack> </binaries> </moduleSet> + <moduleSet> + <includes> + <include>MOA.spss.server:moa-spss-lib</include> + </includes> + <binaries> + <includeDependencies>true</includeDependencies> + <dependencySets> + <dependencySet> + <includes> + <include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include> + </includes> + <outputDirectory>/pkcs11/win32</outputDirectory> + <outputFileNameMapping>pkcs11wrapper.${extension}</outputFileNameMapping> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> <moduleSet> <includes> <include>MOA.spss.server:moa-spss-lib</include> @@ -71,7 +81,7 @@ <includes> <include>iaik.prod:iaik_moa</include> <include>log4j:log4j</include> - <include>xalan:xalan</include> + <include>xalan-bin-dist:xalan</include> </includes> <outputDirectory>/tools</outputDirectory> <!-- strip version off the artifact file names --> diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index 620d3ebd4..1a169b357 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -56,8 +56,9 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>xalan</groupId> + <groupId>xalan-bin-dist</groupId> <artifactId>xalan</artifactId> + <scope>compile</scope> </dependency> <dependency> <groupId>xerces</groupId> diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index 5a5afdebd..7fa109145 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -89,7 +89,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>xalan</groupId> + <groupId>xalan-bin-dist</groupId> <artifactId>xalan</artifactId> <!-- should be provided by the container or jre --> <scope>provided</scope> |