Repository: incubator-fluo Updated Branches: refs/heads/fluo-parent fac72e982 -> b19c35458
fixes #717 Fixed readme, notice, license, and travis files Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/b19c3545 Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/b19c3545 Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/b19c3545 Branch: refs/heads/fluo-parent Commit: b19c3545800fa5a3ac650b6ae27a94bf04f1a404 Parents: fac72e9 Author: Keith Turner <ktur...@apache.org> Authored: Fri Jul 22 15:10:00 2016 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Fri Jul 22 17:01:46 2016 -0400 ---------------------------------------------------------------------- .travis.yml | 2 -- LICENSE | 5 +++-- NOTICE | 6 +++++- README.md | 27 ++++++++++----------------- 4 files changed, 18 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/b19c3545/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 0595e1d..18b277f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,4 @@ language: java jdk: - oraclejdk8 - - oraclejdk7 - - openjdk7 http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/b19c3545/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 8dada3e..d645695 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,4 @@ + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -178,7 +179,7 @@ APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" + boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -186,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright {yyyy} {name of copyright owner} + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/b19c3545/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index d2fa8fb..dab393a 100644 --- a/NOTICE +++ b/NOTICE @@ -1 +1,5 @@ -Copyright 2016 fluo.io contributors +Apache Fluo +Copyright 2016 The Apache Software Foundation. + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/b19c3545/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 7e7661e..22a4f92 100644 --- a/README.md +++ b/README.md @@ -12,27 +12,20 @@ limitations under the License. --> -[![Build Status][ti]][tl] [![Maven Central][mi]][ml] [![Issues][ii]][il] -[![Forks][fi]][fl] [![Stars][si]][sl] [![Apache License][li]][ll] +[![Build Status][ti]][tl] [![Maven Central][mi]][ml] [![Apache License][li]][ll] -# Fluo.io Parent POM +# Apache Fluo Parent POM View documentation at: -http://fluo.io +https://fluo.apache.org -Parent pom for fluo-io projects +Parent pom for Apache Fluo projects This project uses a 1-up counter for its versioning. -[ti]: https://travis-ci.org/fluo-io/fluo-io-parent.svg?branch=master -[tl]: https://travis-ci.org/fluo-io/fluo-io-parent -[mi]: https://maven-badges.herokuapp.com/maven-central/io.fluo/fluo-io-parent/badge.svg -[ml]: https://maven-badges.herokuapp.com/maven-central/io.fluo/fluo-io-parent -[ii]: https://img.shields.io/github/issues/fluo-io/fluo-io-parent.svg -[il]: https://github.com/fluo-io/fluo-io-parent/issues -[fi]: https://img.shields.io/github/forks/fluo-io/fluo-io-parent.svg -[fl]: https://github.com/fluo-io/fluo-io-parent/network -[si]: https://img.shields.io/github/stars/fluo-io/fluo-io-parent.svg -[sl]: https://github.com/fluo-io/fluo-io-parent/stargazers -[li]: http://img.shields.io/badge/license-ASL-blue.svg -[ll]: https://github.com/fluo-io/fluo-io-parent/blob/master/LICENSE +[ti]: https://travis-ci.org/apache/incubator-fluo.svg?branch=fluo-parent +[tl]: https://travis-ci.org/apache/incubator-fluo/branches +[mi]: https://maven-badges.herokuapp.com/maven-central/org.apache.fluo/fluo-parent/badge.svg +[ml]: https://maven-badges.herokuapp.com/maven-central/org.apache.fluo/fluo-parent +[li]: https://img.shields.io/badge/license-ASL-blue.svg +[ll]: https://github.com/apache/incubator-fluo/blob/master/LICENSE