Remove explicit âxml-apisâ dependency in favour of JRE-provided implementation. Requires exclusion in âreflectionsâ to avoid stale transitive dependency.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/11ad157a Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/11ad157a Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/11ad157a Branch: refs/heads/master Commit: 11ad157adedfc5a02e39dd253fc05a2321f74aa8 Parents: a80bbcf Author: Alasdair Hodge <[email protected]> Authored: Wed Oct 21 08:14:48 2015 +0100 Committer: Alasdair Hodge <[email protected]> Committed: Wed Oct 21 08:14:48 2015 +0100 ---------------------------------------------------------------------- core/pom.xml | 8 ++++---- parent/pom.xml | 6 ------ software/webapp/pom.xml | 4 ---- 3 files changed, 4 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/11ad157a/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 66ac533..222ccfd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -110,6 +110,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> </exclusions> </dependency> @@ -132,10 +136,6 @@ <artifactId>httpcore</artifactId> </dependency> <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/11ad157a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 53cdc72..1ca10ad 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -140,7 +140,6 @@ <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version> <jetty-orbit-javax-servlet.version>3.0.0.v201112011016</jetty-orbit-javax-servlet.version> <jcommander.version>1.27</jcommander.version> - <xml-apis.version>1.3.04</xml-apis.version> <jsr250-api.version>1.0</jsr250-api.version> <guice.version>3.0</guice.version> <javax-inject.version>1</javax-inject.version> @@ -346,11 +345,6 @@ <version>${httpclient.version}</version> </dependency> <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>${xml-apis.version}</version> - </dependency> - <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> <version>${jsr250-api.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/11ad157a/software/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/software/webapp/pom.xml b/software/webapp/pom.xml index 95ab456..8e8cae3 100644 --- a/software/webapp/pom.xml +++ b/software/webapp/pom.xml @@ -117,10 +117,6 @@ <artifactId>groovy-all</artifactId> </dependency> <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </dependency> - <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> </dependency>
