Updated Branches: refs/heads/master 9d625405d -> 7623c4527
Fix wome warning due to conflicting xml libraries Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7623c452 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7623c452 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7623c452 Branch: refs/heads/master Commit: 7623c4527a5eda06f82dc55f8eda28b79393aa24 Parents: 9d62540 Author: Hugo Trippaers <[email protected]> Authored: Mon Oct 21 09:44:44 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Mon Oct 21 09:45:31 2013 +0100 ---------------------------------------------------------------------- server/pom.xml | 12 ++++++++++++ utils/pom.xml | 20 ++++++++++++++++++++ 2 files changed, 32 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7623c452/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 6446b7e..4065154 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -81,6 +81,12 @@ <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-utils</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> @@ -92,6 +98,12 @@ <dependency> <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7623c452/utils/pom.xml ---------------------------------------------------------------------- diff --git a/utils/pom.xml b/utils/pom.xml index ec66839..93fa796 100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -107,10 +107,30 @@ <dependency> <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.owasp.esapi</groupId> <artifactId>esapi</artifactId> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis-ext</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-net</groupId>
