From aaa2e64851ca7f92a85d1ee4a705900ff258a49a Mon Sep 17 00:00:00 2001 From: Mike Ng Date: Fri, 10 Aug 2018 14:36:24 -0700 Subject: [PATCH 1/2] Include Credits section in README.md. --- README.md | 62 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 0250d4f37..ab5229a2d 100644 --- a/README.md +++ b/README.md @@ -90,26 +90,50 @@ Results are generated in `$buildDir/reports/jmh`. Please see [CONTRIBUTING](CONTRIBUTING.md). -## License -``` - Copyright 2016, Optimizely +### Credits - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at +First-party code (under core-api/ and core-httpclient-impl) is copyright Optimizely, Inc. and contributors, licensed under Apache 2.0. - http://www.apache.org/licenses/LICENSE-2.0 +### Additional Code - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -``` +This software incorporates code from the following open source projects: + +#### core-api module + +**SLF4J** [https://www.slf4j.org ](https://www.slf4j.org) +Copyright © 2004-2017 QOS.ch +License (MIT): [https://www.slf4j.org/license.html](https://www.slf4j.org/license.html) + +**Jackson Annotations** [https://github.com/FasterXML/jackson-annotations](https://github.com/FasterXML/jackson-annotations) +License (Apache 2.0): [https://github.com/FasterXML/jackson-annotations/blob/master/src/main/resources/META-INF/LICENSE](https://github.com/FasterXML/jackson-annotations/blob/master/src/main/resources/META-INF/LICENSE) + +**FindBugs Annotations** [http://findbugs.sourceforge.net/](http://findbugs.sourceforge.net/) +License (LGPL): [https://mvnrepository.com/artifact/com.google.code.findbugs/annotations](https://mvnrepository.com/artifact/com.google.code.findbugs/annotations) + +**FindBugs JSR305** [http://findbugs.sourceforge.net/ ](http://findbugs.sourceforge.net/ ) +License (Apache 2.0): [https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305](https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305) + +**Gson** [https://github.com/google/gson ](https://github.com/google/gson) +Copyright © 2008 Google Inc. +License (Apache 2.0): [https://github.com/google/gson/blob/master/LICENSE](https://github.com/google/gson/blob/master/LICENSE) + +**JSON-java** [https://github.com/stleary/JSON-java](https://github.com/stleary/JSON-java) +Copyright © 2002 JSON.org +License (The JSON License): [https://github.com/stleary/JSON-java/blob/master/LICENSE](https://github.com/stleary/JSON-java/blob/master/LICENSE) + +**JSON.simple** [https://code.google.com/archive/p/json-simple/](https://code.google.com/archive/p/json-simple/) +Copyright © January 2004 +License (Apache 2.0): [https://github.com/fangyidong/json-simple/blob/master/LICENSE.txt](https://github.com/fangyidong/json-simple/blob/master/LICENSE.txt) + +**Jackson Databind** [https://github.com/FasterXML/jackson-databind](https://github.com/FasterXML/jackson-databind) +License (Apache 2.0): [https://github.com/FasterXML/jackson-databind/blob/master/src/main/resources/META-INF/LICENSE](https://github.com/FasterXML/jackson-databind/blob/master/src/main/resources/META-INF/LICENSE) + +#### core-httpclient-impl module + +**Gson** [https://github.com/google/gson ](https://github.com/google/gson) +Copyright © 2008 Google Inc. +License (Apache 2.0): [https://github.com/google/gson/blob/master/LICENSE](https://github.com/google/gson/blob/master/LICENSE) -[JAR hell]: https://en.wikipedia.org/wiki/Java_Classloader#JAR_hell -[developer_docs]: http://developers.optimizely.com/server/index.html -[project_json]: http://developers.optimizely.com/server/reference/index.html#json -[Optimizely]: core-api/src/main/java/com/optimizely/ab/Optimizely.java -[Project Watcher]: core-api/src/main/java/com/optimizely/ab/config/ProjectWatcher.java -[Event Handler]: core-api/src/main/java/com/optimizely/ab/event/EventHandler.java +**Apache HttpClient** [https://hc.apache.org/httpcomponents-client-ga/index.html ](https://hc.apache.org/httpcomponents-client-ga/index.html) +Copyright © January 2004 +License (Apache 2.0): [https://github.com/apache/httpcomponents-client/blob/master/LICENSE.txt](https://github.com/apache/httpcomponents-client/blob/master/LICENSE.txt) \ No newline at end of file From e1bcf774a92480dd3e0053aaa52b7edb9359bee1 Mon Sep 17 00:00:00 2001 From: Mike Ng Date: Wed, 22 Aug 2018 13:53:21 -0700 Subject: [PATCH 2/2] Remove FindBug deps from README credits section. --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index ab5229a2d..4d500e9fb 100644 --- a/README.md +++ b/README.md @@ -107,12 +107,6 @@ License (MIT): [https://www.slf4j.org/license.html](https://www.slf4j.org/licens **Jackson Annotations** [https://github.com/FasterXML/jackson-annotations](https://github.com/FasterXML/jackson-annotations) License (Apache 2.0): [https://github.com/FasterXML/jackson-annotations/blob/master/src/main/resources/META-INF/LICENSE](https://github.com/FasterXML/jackson-annotations/blob/master/src/main/resources/META-INF/LICENSE) -**FindBugs Annotations** [http://findbugs.sourceforge.net/](http://findbugs.sourceforge.net/) -License (LGPL): [https://mvnrepository.com/artifact/com.google.code.findbugs/annotations](https://mvnrepository.com/artifact/com.google.code.findbugs/annotations) - -**FindBugs JSR305** [http://findbugs.sourceforge.net/ ](http://findbugs.sourceforge.net/ ) -License (Apache 2.0): [https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305](https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305) - **Gson** [https://github.com/google/gson ](https://github.com/google/gson) Copyright © 2008 Google Inc. License (Apache 2.0): [https://github.com/google/gson/blob/master/LICENSE](https://github.com/google/gson/blob/master/LICENSE)