aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-09-19 11:15:21 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-09-19 11:15:21 +0200
commitd6f9bcc3c1dc45eaba1c26d29d9c7c7e5569b2fc (patch)
tree852aa19589fe11b5ef09faf61c44006c3b4ca2cc
parent3a449658e07a10ea5c9c4d42bec4e640fab95ec4 (diff)
parenta5399462086913725a3aa28f875a4379caede1c0 (diff)
downloadmoa-id-spss-d6f9bcc3c1dc45eaba1c26d29d9c7c7e5569b2fc.tar.gz
moa-id-spss-d6f9bcc3c1dc45eaba1c26d29d9c7c7e5569b2fc.tar.bz2
moa-id-spss-d6f9bcc3c1dc45eaba1c26d29d9c7c7e5569b2fc.zip
Merge branch 'moa-2.1-Snapshot' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa-2.1-Snapshot
-rw-r--r--common/pom.xml5
-rw-r--r--spss/server/serverlib/pom.xml10
2 files changed, 15 insertions, 0 deletions
diff --git a/common/pom.xml b/common/pom.xml
index 70d0dc13c..3d790d29b 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -95,6 +95,11 @@
<version>1.7.6</version>
</dependency> -->
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.7</version>
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 3cf8d0bd7..85de37359 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -160,6 +160,16 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_xsect_eval</artifactId>
+ <version>1.1709142</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xerial</groupId>
+ <artifactId>sqlite-jdbc</artifactId>
+ <version>3.7.8-SNAPSHOT</version>
+ </dependency>
<!-- <dependency>
<groupId>iaik</groupId>