diff options
| author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-09-04 13:35:57 +0200 |
|---|---|---|
| committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-09-04 13:35:57 +0200 |
| commit | c9685e638ee5de0d049c8f58fd91848c2dc8a0ba (patch) | |
| tree | 110bcbb0463868a39eba0880336ff32cc545034e /pom.xml | |
| parent | 33b76e7bb23d8772b3a2533aadd0c3313af4b29f (diff) | |
| parent | c109c1e86a228bd3b3ed49b97e182b3cd2136d00 (diff) | |
| download | moa-id-spss-c9685e638ee5de0d049c8f58fd91848c2dc8a0ba.tar.gz moa-id-spss-c9685e638ee5de0d049c8f58fd91848c2dc8a0ba.tar.bz2 moa-id-spss-c9685e638ee5de0d049c8f58fd91848c2dc8a0ba.zip | |
Merge branch 'merge' into moa-2.1-Snapshot
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 26 |
1 files changed, 17 insertions, 9 deletions
@@ -14,7 +14,7 @@ <moa-commons-version>2.0.0</moa-commons-version>
<moa-id-version>2.1.1-Snapshot</moa-id-version>
<moa-id-proxy-version>2.0.0</moa-id-proxy-version>
- <moa-spss-version>2.0.1</moa-spss-version>
+ <moa-spss-version>2.0.2</moa-spss-version>
<configtool-version>1.1.1-Snapshot</configtool-version>
<demo-oa-version>2.0.2</demo-oa-version>
</properties>
@@ -403,14 +403,27 @@ <type>dll</type>
<scope>runtime</scope>
</dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2.11</version>
+ </dependency>
<!-- TSL -->
<dependency>
<groupId>iaik</groupId>
<artifactId>iaik_tsl</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</dependency>
- <dependency>
+
+ <dependency>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_xsect_eval</artifactId>
+ <version>1.1709142</version>
+ </dependency>
+
+<!-- <dependency>
<groupId>iaik</groupId>
<artifactId>iaik_util</artifactId>
<version>0.23</version>
@@ -421,11 +434,6 @@ <version>1.1709142</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.11</version>
- </dependency>
- <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.2.7</version>
@@ -439,7 +447,7 @@ <groupId>iaik</groupId>
<artifactId>iaik_jsse</artifactId>
<version>4.4</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>xerces</groupId>
|