Excluded Jackson from plus and plume.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/649365f1 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/649365f1 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/649365f1 Branch: refs/heads/master Commit: 649365f129cb607ea73d1a075e2e29a8f6864517 Parents: ded08b8 Author: Roberto Cortez <radcor...@yahoo.com> Authored: Sat Oct 13 23:16:13 2018 +0100 Committer: Roberto Cortez <radcor...@yahoo.com> Committed: Sun Oct 14 00:20:57 2018 +0100 ---------------------------------------------------------------------- pom.xml | 8 ++------ tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE | 7 ------- tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE | 7 ------- tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE | 7 ------- tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE | 7 ------- 5 files changed, 2 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/649365f1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b055031..adc0b33 100644 --- a/pom.xml +++ b/pom.xml @@ -978,12 +978,8 @@ <artifactId>guava</artifactId> </exclusion> <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-mapper</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> </exclusion> <exclusion> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/649365f1/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE ---------------------------------------------------------------------- diff --git a/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE b/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE index be9aca1..6cec2de 100644 --- a/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE +++ b/tomee/apache-tomee/src/main/resources/META-INF/plume/NOTICE @@ -168,10 +168,3 @@ Joda.org (http://www.joda.org/). This product includes software developed and copyrighted by the The OWASP Foundation (https://www.owasp.org) ========================================================================= -Jackson JSON processor -Jackson is a high-performance, Free/Open Source JSON processing library. -It was originally written by Tatu Saloranta (tatu.salora...@iki.fi), and has -been in development since 2007. -It is currently developed by a community of developers, as well as supported -commercially by FasterXML.com. -========================================================================= http://git-wip-us.apache.org/repos/asf/tomee/blob/649365f1/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE ---------------------------------------------------------------------- diff --git a/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE b/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE index a2da07e..58217b4 100644 --- a/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE +++ b/tomee/apache-tomee/src/main/resources/META-INF/plus/NOTICE @@ -161,10 +161,3 @@ Joda.org (http://www.joda.org/). This product includes software developed and copyrighted by the The OWASP Foundation (https://www.owasp.org) ========================================================================= -Jackson JSON processor -Jackson is a high-performance, Free/Open Source JSON processing library. -It was originally written by Tatu Saloranta (tatu.salora...@iki.fi), and has -been in development since 2007. -It is currently developed by a community of developers, as well as supported -commercially by FasterXML.com. -========================================================================= http://git-wip-us.apache.org/repos/asf/tomee/blob/649365f1/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE b/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE index e641f49..f5ea6ba 100644 --- a/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE +++ b/tomee/tomee-plume-webapp/src/main/resources/META-INF/NOTICE @@ -122,10 +122,3 @@ Joda.org (http://www.joda.org/). This product includes software developed and copyrighted by the The OWASP Foundation (https://www.owasp.org) ========================================================================= -Jackson JSON processor -Jackson is a high-performance, Free/Open Source JSON processing library. -It was originally written by Tatu Saloranta (tatu.salora...@iki.fi), and has -been in development since 2007. -It is currently developed by a community of developers, as well as supported -commercially by FasterXML.com. -========================================================================= http://git-wip-us.apache.org/repos/asf/tomee/blob/649365f1/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE b/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE index a294662..9dde4bb 100644 --- a/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE +++ b/tomee/tomee-plus-webapp/src/main/resources/META-INF/NOTICE @@ -115,10 +115,3 @@ Joda.org (http://www.joda.org/). This product includes software developed and copyrighted by the The OWASP Foundation (https://www.owasp.org) ========================================================================= -Jackson JSON processor -Jackson is a high-performance, Free/Open Source JSON processing library. -It was originally written by Tatu Saloranta (tatu.salora...@iki.fi), and has -been in development since 2007. -It is currently developed by a community of developers, as well as supported -commercially by FasterXML.com. -=========================================================================