Skip to content

Commit c020c1d

Browse files
Vincentmrutkows
authored andcommitted
Restore the LICENSE and NOTICE to fit the source code release (#295)
All the work we have done for binary dependencies have been saved in openwhisk release. We will resume the work later in openwhisk release repository.
1 parent 27de5ba commit c020c1d

19 files changed

Lines changed: 24 additions & 1172 deletions

CONTRIBUTING.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<!--
22
#
3-
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
4-
# license agreements. See the NOTICE file distributed with this work for additional
5-
# information regarding copyright ownership. The ASF licenses this file to you
6-
# under the Apache License, Version 2.0 (the # "License"); you may not use this
7-
# file except in compliance with the License. You may obtain a copy of the License
8-
# at:
3+
# Licensed to the Apache Software Foundation (ASF) under one or more
4+
# contributor license agreements. See the NOTICE file distributed with
5+
# this work for additional information regarding copyright ownership.
6+
# The ASF licenses this file to You under the Apache License, Version 2.0
7+
# (the "License"); you may not use this file except in compliance with
8+
# the License. You may obtain a copy of the License at
99
#
10-
# http://www.apache.org/licenses/LICENSE-2.0
10+
# http://www.apache.org/licenses/LICENSE-2.0
1111
#
12-
# Unless required by applicable law or agreed to in writing, software distributed
13-
# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
14-
# CONDITIONS OF ANY KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations under the License.
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
1617
#
1718
-->
1819

LICENSE.txt

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -200,83 +200,3 @@
200200
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201201
See the License for the specific language governing permissions and
202202
limitations under the License.
203-
204-
205-
========================================================================
206-
Apache License 2.0
207-
========================================================================
208-
209-
This distribution has binary dependencies on the following components under an Apache License 2.0 (http://opensource.org/licenses/Apache-2.0).
210-
Jibber Jabber bcc4c83 (cloudfoundry/jibber_jabber - https://github.com/cloudfoundry/jibber_jabber)
211-
License included at licenses/LICENSE-jibberjabber.txt, or https://github.com/cloudfoundry-attic/jibber_jabber/blob/master/LICENSE
212-
Copyright (c) 2014 Pivotal
213-
214-
Mousetrap 76626ae (inconshreveable/mousetrap - https://github.com/inconshreveable/mousetrap)
215-
License included at licenses/LICENSE-mousetrap.txt, or https://github.com/inconshreveable/mousetrap/blob/master/LICENSE
216-
Copyright 2014 Alan Shreve
217-
218-
OpenWhisk Client Go e4b5f82 (apache/incubator-openwhisk-client-go - https://github.com/apache/incubator-openwhisk-client-go)
219-
License included at licenses/LICENSE-openwhiskclientgo.txt, or https://github.com/apache/incubator-openwhisk-client-go/blob/master/LICENSE.txt
220-
Copyright 2015-2016 IBM Corporation
221-
222-
YAML support for the Go language cd8b52f (go-yaml/yaml - https://github.com/go-yaml/yaml/tree/v2.2.1)
223-
License included at licenses/LICENSE-goyaml.txt, or https://github.com/go-yaml/yaml/blob/v2.2.1/LICENSE
224-
225-
Cobra 1238ba1 (spf13/cobra - https://github.com/spf13/cobra)
226-
License included at licenses/LICENSE-cobra.txt, or https://github.com/spf13/cobra/blob/master/LICENSE.txt
227-
228-
229-
========================================================================
230-
MIT License
231-
========================================================================
232-
233-
This distribution has binary dependencies on the following components available under an MIT license (http://opensource.org/licenses/MIT).
234-
Color 87d4004 (fatih/color - https://github.com/fatih/color)
235-
License included at licenses/LICENSE-color.txt, or https://github.com/fatih/color/blob/master/LICENSE.md
236-
Copyright (c) 2013 Fatih Arslan
237-
238-
Go Prettyjson f75235b (hokaccha/go-prettyjson - https://github.com/hokaccha/go-prettyjson)
239-
License included at licenses/LICENSE-goprettyjson.txt
240-
241-
Go Colorable d228849 (mattn/go-colorable - https://github.com/mattn/go-colorable)
242-
License included at licenses/LICENSE-gocolorable.txt, or https://github.com/mattn/go-colorable/blob/master/LICENSE
243-
Copyright (c) 2016 Yasuhiro Matsumoto
244-
245-
Go Isatty 66b8e73 (mattn/go-isatty - https://github.com/mattn/go-isatty)
246-
License included at licenses/LICENSE-goisatty.txt, or https://github.com/mattn/go-isatty/blob/master/LICENSE
247-
Copyright (c) Yasuhiro MATSUMOTO <mattn.jp@gmail.com>
248-
249-
Go Homedir 1111e45 (mitchellh/go-homedir - https://github.com/mitchellh/go-homedir)
250-
License included at licenses/LICENSE-gohomedir.txt, or https://github.com/mitchellh/go-homedir/blob/master/LICENSE
251-
Copyright (c) 2013 Mitchell Hashimoto
252-
253-
YAML marshaling and unmarshaling support for Go 0ca9ea5 (ghodss/yaml - https://github.com/ghodss/yaml)
254-
License included at licenses/LICENSE-yaml.txt, or https://github.com/ghodss/yaml/blob/master/LICENSE
255-
Copyright (c) 2014 Sam Ghods
256-
257-
Go I18n 37e5c2d (nicksnyder/go-i18n - https://github.com/nicksnyder/go-i18n)
258-
License included at licenses/LICENSE-goi18n.txt, or https://github.com/nicksnyder/go-i18n/blob/master/LICENSE
259-
Copyright (c) 2014 Nick Snyder https://github.com/nicksnyder
260-
261-
262-
=======================================================================
263-
BSD 3-Clause "New" or "Revised" License
264-
=======================================================================
265-
266-
This distribution has binary dependencies on the following components available under a BSD 3 Clause License (https://opensource.org/licenses/BSD-3-Clause).
267-
Go 1.8 (https://golang.org/)
268-
License included at licenses/LICENSE-go.txt, or Copyright (c) 2009 The Go Authors. All rights reserved.
269-
Copyright (c) 2009 The Go Authors. All rights reserved.
270-
271-
Go Querystring 9235644 (google/go-querystring - https://github.com/google/go-querystring)
272-
License included at licenses/LICENSE-goquerystring.txt, or https://github.com/google/go-querystring/blob/master/LICENSE
273-
Copyright (c) 2013 Google. All rights reserved.
274-
275-
Pflag 3678644 (spf13/pflag - https://github.com/spf13/pflag)
276-
License included at licenses/LICENSE-pflag.txt, or https://github.com/spf13/pflag/blob/master/LICENSE
277-
Copyright (c) 2012 Alex Ogier. All rights reserved.
278-
Copyright (c) 2012 The Go Authors. All rights reserved.
279-
280-
Sys 7f918dd (golang/sys - https://github.com/golang/sys)
281-
License included at licenses/LICENSE-sys.txt, or https://github.com/golang/sys/blob/master/LICENSE
282-
Copyright (c) 2009 The Go Authors. All rights reserved.

NOTICE.txt

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,3 @@ Copyright 2016-2018 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).
6-
7-
========================================================================
8-
NOTICE files
9-
========================================================================
10-
11-
The following NOTICEs are pertain to software distributed with this project.
12-
13-
14-
// ------------------------------------------------------------------
15-
// NOTICE file corresponding to the section 4d of The Apache License,
16-
// Version 2.0, in this case for
17-
// ------------------------------------------------------------------
18-
19-
// ---------------------------------------------------
20-
// NOTICE file of apache/incubator-openwhisk-client-go
21-
// ---------------------------------------------------
22-
Apache OpenWhisk Client Go
23-
Copyright 2016-2018 The Apache Software Foundation
24-
25-
This product includes software developed at
26-
The Apache Software Foundation (http://www.apache.org/).
27-
28-
// ----------------------------
29-
// NOTICE file of go-yaml/yaml
30-
// ----------------------------
31-
Copyright 2011-2016 Canonical Ltd.

README.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<!--
22
#
3-
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
4-
# license agreements. See the NOTICE file distributed with this work for additional
5-
# information regarding copyright ownership. The ASF licenses this file to you
6-
# under the Apache License, Version 2.0 (the # "License"); you may not use this
7-
# file except in compliance with the License. You may obtain a copy of the License
8-
# at:
3+
# Licensed to the Apache Software Foundation (ASF) under one or more
4+
# contributor license agreements. See the NOTICE file distributed with
5+
# this work for additional information regarding copyright ownership.
6+
# The ASF licenses this file to You under the Apache License, Version 2.0
7+
# (the "License"); you may not use this file except in compliance with
8+
# the License. You may obtain a copy of the License at
99
#
10-
# http://www.apache.org/licenses/LICENSE-2.0
10+
# http://www.apache.org/licenses/LICENSE-2.0
1111
#
12-
# Unless required by applicable law or agreed to in writing, software distributed
13-
# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
14-
# CONDITIONS OF ANY KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations under the License.
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
1617
#
1718
-->
1819

licenses/LICENSE-cobra.txt

Lines changed: 0 additions & 174 deletions
This file was deleted.

0 commit comments

Comments
 (0)