Skip to content

Commit 7ba3f12

Browse files
committed
cleanup license headers and contributing docs
- switch to "project authors" style copyright. Instead of an AUTHORS file (https://opensource.google/docs/releasing/authors/), I just list Google as a major copyright holder in the README. - use SPDX style license headers in source files - remove CLA requirement from contributing docs
1 parent 3a30ba7 commit 7ba3f12

File tree

16 files changed

+37
-132
lines changed

16 files changed

+37
-132
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,5 +380,7 @@ to alter the precedence order by setting:
380380

381381
## License ##
382382

383-
imageproxy is copyright Google, but is not an official Google product. It is
384-
available under the [Apache 2.0 License](./LICENSE).
383+
imageproxy is copyright its respective authors. All of my personal work on
384+
imageproxy through 2020 (which accounts for the majority of the code) is
385+
copyright Google, my employer at the time. It is available under the [Apache
386+
2.0 License](./LICENSE).

cache.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Copyright 2013 Google LLC. All rights reserved.
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
// Copyright 2013 The imageproxy authors.
2+
// SPDX-License-Identifier: Apache-2.0
143

154
package imageproxy
165

cache_test.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Copyright 2013 Google LLC. All rights reserved.
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
// Copyright 2013 The imageproxy authors.
2+
// SPDX-License-Identifier: Apache-2.0
143

154
package imageproxy
165

cmd/imageproxy-sign/main.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2013 The imageproxy authors.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
// The imageproxy-sign tool creates signature values for a provided URL and
25
// signing key.
36
package main

cmd/imageproxy-sign/main_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2013 The imageproxy authors.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package main
25

36
import (

cmd/imageproxy/main.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Copyright 2013 Google LLC. All rights reserved.
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
// Copyright 2013 The imageproxy authors.
2+
// SPDX-License-Identifier: Apache-2.0
143

154
// imageproxy starts an HTTP server that proxies requests for remote images.
165
package main

data.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Copyright 2013 Google LLC. All rights reserved.
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
// Copyright 2013 The imageproxy authors.
2+
// SPDX-License-Identifier: Apache-2.0
143

154
package imageproxy
165

data_test.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Copyright 2013 Google LLC. All rights reserved.
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
// Copyright 2013 The imageproxy authors.
2+
// SPDX-License-Identifier: Apache-2.0
143

154
package imageproxy
165

docs/contributing.md

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,3 @@ Go code should follow general best practices, such as using go fmt, go lint, and
2727
go vet (this is enforced by our continuous integration setup). Tests should
2828
always be included where possible, especially for bug fixes in order to prevent
2929
regressions.
30-
31-
## Contributor License Agreement
32-
33-
Even though this is effectively a personal project of mine, it is still governed
34-
by Google's Contributor License Agreement because of my employment there. You
35-
(or your employer) retain the copyright to your contribution; the CLA simply
36-
gives permission to use and redistribute your contributions as part of the
37-
project. Head over to <https://cla.developers.google.com/> to see your current
38-
agreements on file or to sign a new one.
39-
40-
You generally only need to submit a CLA once, so if you've already submitted one
41-
(even if it was for a different Google project), you probably don't need to do
42-
it again.

imageproxy.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
// Copyright 2013 Google LLC. All rights reserved.
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
// Copyright 2013 The imageproxy authors.
2+
// SPDX-License-Identifier: Apache-2.0
143

154
// Package imageproxy provides an image proxy server. For typical use of
165
// creating and using a Proxy, see cmd/imageproxy/main.go.

0 commit comments

Comments
 (0)