aboutsummaryrefslogtreecommitdiff
path: root/spss
diff options
context:
space:
mode:
Diffstat (limited to 'spss')
-rw-r--r--spss/server/serverlib/pom.xml46
-rw-r--r--spss/server/serverws/pom.xml43
-rw-r--r--spss/server/tools/pom.xml62
3 files changed, 82 insertions, 69 deletions
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 @@
<groupId>axis</groupId>
<artifactId>axis</artifactId>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>saaj</groupId>-->
-<!-- <artifactId>saaj</artifactId>-->
-<!-- </dependency>-->
<dependency>
<groupId>commons-discovery</groupId>
<artifactId>commons-discovery</artifactId>
@@ -38,34 +34,6 @@
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>jaxen</groupId>-->
-<!-- <artifactId>jaxen</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>jaxp</groupId>-->
-<!-- <artifactId>dom</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>jaxp</groupId>-->
-<!-- <artifactId>jaxp-api</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>jaxp</groupId>-->
-<!-- <artifactId>sax</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>javaext</groupId>-->
-<!-- <artifactId>jaxrpc</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.w3c.dom</groupId>-->
-<!-- <artifactId>dom</artifactId>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>sax</groupId>-->
-<!-- <artifactId>sax</artifactId>-->
-<!-- </dependency>-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -81,22 +49,19 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <optional>true</optional>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>iaik.prod</groupId>
@@ -110,25 +75,26 @@
<groupId>iaik.prod</groupId>
<artifactId>iaik_jce_full</artifactId>
<scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_ecc</artifactId>
<scope>compile</scope>
- <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_cms</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Provider</artifactId>
<scope>runtime</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Wrapper</artifactId>
<scope>runtime</scope>
- <optional>true</optional>
</dependency>
<!-- <dependency>-->
<!-- <groupId>iaik.prod</groupId>-->
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 @@
<groupId>MOA</groupId>
<artifactId>moa-common</artifactId>
</dependency>
+ <!-- transitive dependencies we don't want to include into the war -->
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_jce_full</artifactId>
+ <!-- should be in the ext directory of the jre -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_ecc</artifactId>
+ <!-- should be in the ext directory of the jre -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Provider</artifactId>
+ <!-- should be in the ext directory of the jre -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Wrapper</artifactId>
+ <!-- should be in the ext directory of the jre -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <!-- should be provided by the container or jre -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <!-- should be provided by the container or jre -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <!-- should be provided by the container or jre -->
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
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 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- 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">
- <parent>
- <groupId>MOA.spss</groupId>
- <artifactId>moa-spss</artifactId>
- <version>1.4.0</version>
- </parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+ <parent>
+ <groupId>MOA.spss</groupId>
+ <artifactId>moa-spss</artifactId>
+ <version>1.4.0</version>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>MOA.spss.server</groupId>
- <artifactId>moa-spss-tools</artifactId>
- <packaging>jar</packaging>
- <version>1.4.0</version>
- <name>MOA SP/SS Tools</name>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>MOA.spss.server</groupId>
+ <artifactId>moa-spss-tools</artifactId>
+ <packaging>jar</packaging>
+ <version>1.4.0</version>
+ <name>MOA SP/SS Tools</name>
- <properties>
- <thirdPartyLib>${basedir}/../../../buildhelper</thirdPartyLib>
- </properties>
+ <properties>
+ <thirdPartyLib>${basedir}/../../../buildhelper</thirdPartyLib>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>MOA.spss.server</groupId>
- <artifactId>moa-spss-lib</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_ecc</artifactId>
- <scope>compile</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>MOA.spss.server</groupId>
+ <artifactId>moa-spss-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_jce_full</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_ecc</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>