Repository: cxf Updated Branches: refs/heads/master ee62e3c37 -> c255034b2
Remove org.json stuff from build other than in systests/jaxrs (need to work on that yet) Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c255034b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c255034b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c255034b Branch: refs/heads/master Commit: c255034b2d6eb99bb2753b3d6932af06fd6cbe16 Parents: ee62e3c Author: Daniel Kulp <[email protected]> Authored: Wed May 24 12:10:59 2017 -0400 Committer: Daniel Kulp <[email protected]> Committed: Wed May 24 12:10:59 2017 -0400 ---------------------------------------------------------------------- parent/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c255034b/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 355f800..0bf6cd8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1951,6 +1951,12 @@ <groupId>org.apache.tika</groupId> <artifactId>tika-parsers</artifactId> <version>${cxf.tika.version}</version> + <exclusions> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -1981,6 +1987,12 @@ <groupId>org.qi4j.library</groupId> <artifactId>org.qi4j.library.circuitbreaker</artifactId> <version>${cxf.zest.version}</version> + <exclusions> + <exclusion> + <groupId>org.codeartisans</groupId> + <artifactId>org.json</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.wss4j</groupId>
