diff options
| author | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2015-08-11 15:42:13 +0200 |
|---|---|---|
| committer | Florian Reimair <florian.reimair@iaik.tugraz.at> | 2015-08-11 15:42:13 +0200 |
| commit | ebe02bc990d362e39a37906385d7e470235e2627 (patch) | |
| tree | b5513c0ccf37f201810ecea4a7af5c21dec60739 /id/ConfigWebTool/pom.xml | |
| parent | 2ec0757b66d9e23c4c29c9ca59c94acd6a9b46c4 (diff) | |
| parent | 04381eb4e2d67ced539b34747403bb06cdf36c53 (diff) | |
| download | moa-id-spss-ebe02bc990d362e39a37906385d7e470235e2627.tar.gz moa-id-spss-ebe02bc990d362e39a37906385d7e470235e2627.tar.bz2 moa-id-spss-ebe02bc990d362e39a37906385d7e470235e2627.zip | |
Merge branch 'samlengine_update' into moa-2.1-Snapshot
Diffstat (limited to 'id/ConfigWebTool/pom.xml')
| -rw-r--r-- | id/ConfigWebTool/pom.xml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index 18bd1306b..aa4c9055c 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -83,7 +83,6 @@ <dependency> <groupId>at.gv.util</groupId> <artifactId>egovutils</artifactId> - <version>2.0.0</version> <exclusions> <exclusion> <groupId>org.apache.cxf</groupId> @@ -139,8 +138,21 @@ <groupId>xalan</groupId> <artifactId>*</artifactId> </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.opensaml</groupId> + <artifactId>openws</artifactId> + <version>${openws-version}</version> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk16</artifactId> + </dependency> <dependency> <groupId>javax.mail</groupId> @@ -150,12 +162,10 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> - <version>2.3.16.3</version> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-json-plugin</artifactId> - <version>2.3.16.3</version> </dependency> <dependency> @@ -197,8 +207,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> </configuration> </plugin> |