aboutsummaryrefslogtreecommitdiff
path: root/spss/server/serverws
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-03-20 13:46:11 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-03-20 13:46:11 +0100
commita81cea6b42fcc46ea1f1a6a2e263f1398464c638 (patch)
tree33539395ff60793f57d37ef4df41e80ae84e3c88 /spss/server/serverws
parent97535aec057fa529c5e7bb16799e33831c1f5e87 (diff)
parentfa1389bd2c34f5230afccbeb516cbcf7a17ba97f (diff)
downloadmoa-id-spss-a81cea6b42fcc46ea1f1a6a2e263f1398464c638.tar.gz
moa-id-spss-a81cea6b42fcc46ea1f1a6a2e263f1398464c638.tar.bz2
moa-id-spss-a81cea6b42fcc46ea1f1a6a2e263f1398464c638.zip
Merge remote-tracking branch 'remotes/origin/moa_spss_1.5.2' into moa2_0_tlenz
Diffstat (limited to 'spss/server/serverws')
-rw-r--r--spss/server/serverws/pom.xml19
1 files changed, 8 insertions, 11 deletions
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index b8a04eba4..2a7467146 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -22,7 +22,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.3</version>
<!-- <version>2.0.2</version>-->
<configuration>
<archive>
@@ -70,7 +70,7 @@
<artifactId>iaik_ixsil</artifactId>
</dependency>
<dependency>
- <groupId>iaik.prod</groupId>
+ <groupId>iaik</groupId>
<artifactId>iaik_tsl</artifactId>
</dependency>
<dependency>
@@ -78,12 +78,12 @@
<artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>iaik.prod</groupId>
+ <groupId>iaik</groupId>
<artifactId>iaik_util</artifactId>
</dependency>
<dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_xsect</artifactId>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_xsect_eval</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
@@ -98,13 +98,10 @@
<artifactId>sqlite-jdbc</artifactId>
</dependency>
<dependency>
- <groupId>iaik.prod</groupId>
+ <groupId>iaik</groupId>
<artifactId>iaik_jsse</artifactId>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_util</artifactId>
- </dependency>
+ </dependency>
+
<!-- transitive dependencies we don't want to include into the war -->
<dependency>
<groupId>iaik.prod</groupId>