Remove org.json stuff from build other than in systests/jaxrs (need to work on that yet)
# Conflicts: # parent/pom.xml Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/072e094a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/072e094a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/072e094a Branch: refs/heads/3.1.x-fixes Commit: 072e094a4820c89aad7705c857230e75eb33e798 Parents: d913cdf Author: Daniel Kulp <[email protected]> Authored: Wed May 24 12:10:59 2017 -0400 Committer: Daniel Kulp <[email protected]> Committed: Wed May 24 13:46:40 2017 -0400 ---------------------------------------------------------------------- parent/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/072e094a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 7394de3..dc7266e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1889,6 +1889,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>io.dropwizard.metrics</groupId>
