diff options
Diffstat (limited to 'id/ConfigWebTool/pom.xml')
| -rw-r--r-- | id/ConfigWebTool/pom.xml | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index 51bb941a4..c672d32a6 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -57,17 +57,19 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> <dependency> <groupId>MOA.id.server</groupId> <artifactId>moa-id-commons</artifactId> + <exclusions> + <exclusion> + <artifactId>hibernate-c3p0</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -76,6 +78,11 @@ <version>1.0</version> </dependency> + <dependency> + <groupId>MOA.id.server</groupId> + <artifactId>moa-id-frontend-resources</artifactId> + </dependency> + <dependency> <groupId>MOA.id.server</groupId> <artifactId>moa-id-lib</artifactId> @@ -92,10 +99,10 @@ <artifactId>moa-id-module-openID</artifactId> </dependency> - <dependency> +<!-- <dependency> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-module-stork</artifactId> - </dependency> + </dependency> --> <dependency> <groupId>org.apache.commons</groupId> @@ -170,17 +177,12 @@ <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> --> - <version>1.5.4</version> + <version>1.5.6</version> <exclusions> <exclusion> <artifactId>log4j-over-slf4j</artifactId> @@ -188,10 +190,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk16</artifactId> - </dependency> <dependency> <groupId>javax.mail</groupId> @@ -201,16 +199,23 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> + <exclusions> + <exclusion> + <artifactId>javassist</artifactId> + <groupId>javassist</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-json-plugin</artifactId> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> +<!-- <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </dependency> --> + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> |