diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-05-10 15:50:52 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-05-10 15:50:52 +0200 |
commit | aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1 (patch) | |
tree | 0798f107e13d8a8546c1b15c6432e5360a656e92 /spss/server/serverws | |
parent | 576f5ea5cfaf2ea174f198dc5df238c1ca0c331a (diff) | |
parent | c3e07d7fb87b2d132ffc838e4878b9479da361a7 (diff) | |
download | moa-id-spss-aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1.tar.gz moa-id-spss-aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1.tar.bz2 moa-id-spss-aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1.zip |
Update to MOA-SPSS 3.0.0-RC1
Merge branch 'moa-id-3.2_(OPB)' into moa-id_with_moa-sig_and_eccelerate
Conflicts:
id/moa-spss-container/pom.xml
pom.xml
Diffstat (limited to 'spss/server/serverws')
-rw-r--r-- | spss/server/serverws/pom.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index b90026252..ce665cad0 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -94,8 +94,8 @@ <!--version>${pom.version}</version--> </dependency> <dependency> - <groupId>MOA</groupId> - <artifactId>moa-common</artifactId> + <groupId>MOA.id.server</groupId> + <artifactId>moa-id-commons</artifactId> </dependency> <dependency> <groupId>iaik.prod</groupId> @@ -118,6 +118,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <version>1.2.17</version> </dependency> <!-- <dependency> <groupId>iaik</groupId> |