Skip to content

Commit 01c1688

Browse files
committed
include NOTICE file as per BROOKLYN-19 and DISCLAIMER as per BROOKLYN-22,
both in root of source and included in binary distributable artifacts. Minor tweaks to README to increase visisbility of apache and podling status, and removal of old (out-of-date) COPYRIGHT.
1 parent 236e57e commit 01c1688

File tree

7 files changed

+37
-31
lines changed

7 files changed

+37
-31
lines changed

COPYRIGHT.md

-13
This file was deleted.

DISCLAIMER

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
Apache Brooklyn is an effort undergoing incubation at The Apache Software Foundation (ASF),
3+
sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until
4+
a further review indicates that the infrastructure, communications, and decision making process
5+
have stabilized in a manner consistent with other successful ASF projects. While incubation
6+
status is not necessarily a reflection of the completeness or stability of the code, it does
7+
indicate that the project has yet to be fully endorsed by the ASF.
8+

LICENSE.md LICENSE

File renamed without changes.

NOTICE

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
Apache Brooklyn
3+
Copyright 2014 The Apache Software Foundation
4+
5+
This product includes software developed at
6+
The Apache Software Foundation (http://www.apache.org/).
7+

README.md

+20-18
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
12
# [![**Brooklyn**](http://brooklyncentral.github.io/style/images/brooklyn.gif)](http://brooklyncentral.github.com)
23

3-
Brooklyn is a library and control plane for deploying and managing distributed applications.
4+
Apache Brooklyn is a library and control plane for deploying and managing distributed applications.
45

5-
See [brooklyncentral.github.com](http://brooklyncentral.github.com) for details and examples.
6+
See [brooklyn.incubator.apache.org](https://brooklyn.incubator.apache.org/) for details and examples.
67

78
Brooklyn's main emphasis is managing live applications (e.g auto-scaling, exception handling, auto recovery from failure, and working across multiple clouds). Brooklyn considers deployment part of management, like the opening move in a game of chess. (Distributed-application-management-chess, no less).
89

@@ -69,19 +70,20 @@ See the [full guide to contributing](http://brooklyncentral.github.com/dev/how-t
6970
Thanks!
7071

7172
----
72-
Licensed to the Apache Software Foundation (ASF) under one
73-
or more contributor license agreements. See the NOTICE file
74-
distributed with this work for additional information
75-
regarding copyright ownership. The ASF licenses this file
76-
to you under the Apache License, Version 2.0 (the
77-
"License"); you may not use this file except in compliance
78-
with the License. You may obtain a copy of the License at
79-
80-
http://www.apache.org/licenses/LICENSE-2.0
81-
82-
Unless required by applicable law or agreed to in writing,
83-
software distributed under the License is distributed on an
84-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
85-
KIND, either express or implied. See the License for the
86-
specific language governing permissions and limitations
87-
under the License.
73+
Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
74+
See the [NOTICE](NOTICE) file distributed with this work for additional information
75+
regarding copyright ownership and the [incubation disclaimer](DISCLAIMER) file regarding project status,
76+
as Apache Brooklyn is currently undergoing Incubation at the Apache Software Foundation.
77+
78+
The ASF licenses this file to you under the Apache License, Version 2.0
79+
(the "License"); you may not use this file except in compliance with the License.
80+
81+
You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0).
82+
83+
Unless required by applicable law or agreed to in writing,
84+
software distributed under the License is distributed on an
85+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
86+
KIND, either express or implied. See the License for the
87+
specific language governing permissions and limitations
88+
under the License.
89+

usage/dist/src/main/config/build-distribution-archive.xml

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<include>README*</include>
3434
<include>LICENSE*</include>
3535
<include>NOTICE*</include>
36+
<include>DISCLAIMER*</include>
3637
</includes>
3738
</fileSet>
3839
<fileSet>

usage/dist/src/main/config/build-distribution-dir.xml

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<include>README*</include>
3434
<include>LICENSE*</include>
3535
<include>NOTICE*</include>
36+
<include>DISCLAIMER*</include>
3637
</includes>
3738
</fileSet>
3839
<fileSet>

0 commit comments

Comments
 (0)