diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-10-29 14:06:00 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-10-29 14:06:00 +0100 |
| commit | 08e1d59be7c555a49f75988b050a43e0431ce9be (patch) | |
| tree | fa00dbb1fe13779decdb13aefe8b46e848371b6e /pom.xml | |
| parent | 41b1942dc69f1284894270e724ef517fb689f075 (diff) | |
| parent | b9e2c8e57097ab446264a4e5f42765c5ed67dceb (diff) | |
| download | moa-id-spss-08e1d59be7c555a49f75988b050a43e0431ce9be.tar.gz moa-id-spss-08e1d59be7c555a49f75988b050a43e0431ce9be.tar.bz2 moa-id-spss-08e1d59be7c555a49f75988b050a43e0431ce9be.zip | |
Merge branch 'ISA-1.18-action' into moa-2.1-Snapshot
Conflicts:
id/server/idserverlib/pom.xml
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -406,7 +406,7 @@ <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2.11</version>
+ <version>2.2.12</version>
</dependency>
<!-- TSL -->
@@ -445,7 +445,7 @@ <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
+ <version>2.11.0</version>
<scope>compile</scope>
</dependency>
<!-- The xmlParserAPIs.jar of the official xalan distribution
@@ -457,7 +457,7 @@ <dependency>
<groupId>xalan-bin-dist</groupId>
<artifactId>xml-apis</artifactId>
- <version>2.7.1</version><!-- xalan version -->
+ <version>2.11.0</version>
<scope>runtime</scope>
</dependency>
<!-- The xalan.jar of the official xalan distribution
@@ -469,13 +469,13 @@ <dependency>
<groupId>xalan-bin-dist</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
+ <version>2.7.2</version>
<scope>compile</scope><!-- for XPathAPI, Javadoc,...-->
</dependency>
<dependency>
<groupId>xalan-bin-dist</groupId>
<artifactId>serializer</artifactId>
- <version>2.7.1</version><!-- xalan version -->
+ <version>2.7.2</version><!-- xalan version -->
<scope>runtime</scope>
</dependency>
</dependencies>
|