From 7a73e3b6dab45ee96f8a7880ffd02b59dc13ba67 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Mon, 5 Mar 2018 12:46:00 +0800 Subject: [PATCH 1/2] Add the third Party Components description into notice file. --- NOTICE.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NOTICE.txt b/NOTICE.txt index 36ebf1d03..fec74574b 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -19,3 +19,10 @@ mockito: http://site.mockito.org/ , MIT QOS.ch (slf4j): https://www.slf4j.org/ , MIT powermock: https://github.com/powermock/powermock , Apache 2.0 Eclipse (Jetty): https://www.eclipse.org/jetty/ , Apache 2.0 and Eclipse Public License 1.0 +Apache: +- Log4j 2: https://logging.apache.org/log4j/2.x/ , Apache 2.0 +- ZooKeeper: http://zookeeper.apache.org , Apache 2.0 +SnakeYAML: http://www.snakeyaml.org , Apache 2.0 +Jedis: https://github.com/xetorthio/jedis , MIT +Joda-Time: http://www.joda.org/joda-time/ , Apache 2.0 +GraphQL Java Tools: https://github.com/graphql-java/graphql-java-tools , MIT \ No newline at end of file From ae6a739d0ddd95fd562f2335a81de0701a58fb2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Mon, 5 Mar 2018 15:20:53 +0800 Subject: [PATCH 2/2] Update NOTICE.txt Remove Apache projects from NOTICE --- NOTICE.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index fec74574b..ee305bd27 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -19,10 +19,7 @@ mockito: http://site.mockito.org/ , MIT QOS.ch (slf4j): https://www.slf4j.org/ , MIT powermock: https://github.com/powermock/powermock , Apache 2.0 Eclipse (Jetty): https://www.eclipse.org/jetty/ , Apache 2.0 and Eclipse Public License 1.0 -Apache: -- Log4j 2: https://logging.apache.org/log4j/2.x/ , Apache 2.0 -- ZooKeeper: http://zookeeper.apache.org , Apache 2.0 SnakeYAML: http://www.snakeyaml.org , Apache 2.0 Jedis: https://github.com/xetorthio/jedis , MIT Joda-Time: http://www.joda.org/joda-time/ , Apache 2.0 -GraphQL Java Tools: https://github.com/graphql-java/graphql-java-tools , MIT \ No newline at end of file +GraphQL Java Tools: https://github.com/graphql-java/graphql-java-tools , MIT