Fix reuse. Introduce dep5 file and uniform copyright headers (#46)

omec-project · Mar 8, 2022 · 7d6950d · 7d6950d
1 parent 9b198e2
commit 7d6950d
Show file tree

Hide file tree

Showing 25 changed files with 58 additions and 60 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2022 Open Networking Foundation
+# Copyright 2022-present Open Networking Foundation
+
 name: golangci-lint
 on: [push, pull_request]
 jobs:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2022 Open Networking Foundation
+# Copyright 2022-present Open Networking Foundation
 
 name: Publish pfcpsim
 on: [pull_request, push]

diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml
@@ -1,5 +1,5 @@
-# Copyright 2022-present Open Networking Foundation
 # SPDX-License-Identifier: Apache-2.0
+# Copyright 2022-present Open Networking Foundation
 
 name: REUSE
 

diff --git a/.github/workflows/run-unit-test.yml b/.github/workflows/run-unit-test.yml
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright 2022-present Open Networking Foundation
+
 name: Unit tests
 
 on: [push, pull_request]

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2022 Open Networking Foundation
+# Copyright 2022-present Open Networking Foundation
 
 # golangci-lint configuration used for CI
 run:

diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -0,0 +1,12 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: pfcpsim
+Upstream-Contact: OMEC Developers <omec-dev@opennetworking.org>
+Source: https://github.com/omec-project/pfcpsim
+
+Files: api/**/*.pb.go
+Copyright: 2022-present Open Networking Foundation
+License: Apache-2.0
+
+Files: VERSION README.md go.mod go.sum docs/images/schema.svg
+Copyright: 2022-present Open Networking Foundation
+License: Apache-2.0
diff --git a/LICENSE → LICENSES/Apache-2.0.txt b/LICENSE → LICENSES/Apache-2.0.txt
@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -173,29 +174,4 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
-
-   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 "[]"
-      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
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   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.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   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.
+   END OF TERMS AND CONDITIONS
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ test: .coverage
 	go test	-race -coverprofile=.coverage/coverage-unit.txt -covermode=atomic -v ./...
 
 reuse-lint:
-	docker run --rm -v ${CURRENT_DIR}:/up4 -w /up4 omecproject/reuse-verify:latest reuse lint
+	docker run --rm -v $(CURDIR):/pfcpsim -w /pfcpsim omecproject/reuse-verify:latest reuse lint
 
 build-proto:
 	@echo "Compiling proto files..."

diff --git a/api/pfcpsim.pb.go b/api/pfcpsim.pb.go
diff --git a/api/pfcpsim.proto b/api/pfcpsim.proto
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-//Copyright 2022-present Open Networking Foundation
+// Copyright 2022-present Open Networking Foundation
 
 syntax = "proto3";
 package api;

diff --git a/cmd/pfcpctl/main.go b/cmd/pfcpctl/main.go
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright 2022 Open Networking Foundation
+// Copyright 2022-present Open Networking Foundation
 
 package main
 

diff --git a/cmd/pfcpsim/main.go b/cmd/pfcpsim/main.go
@@ -1,7 +1,5 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright 2022 Open Networking Foundation
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2022-present Open Networking Foundation
 
 package main
 

diff --git a/internal/pfcpsim/helpers.go b/internal/pfcpsim/helpers.go
@@ -1,7 +1,5 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright 2022 Open Networking Foundation
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2022-present Open Networking Foundation
 
 package pfcpsim
 

diff --git a/internal/pfcpsim/server.go b/internal/pfcpsim/server.go
@@ -1,7 +1,5 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright 2022 Open Networking Foundation
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2022-present Open Networking Foundation
 
 package pfcpsim
 

diff --git a/internal/pfcpsim/state.go b/internal/pfcpsim/state.go
@@ -1,7 +1,5 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright 2022 Open Networking Foundation
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2022-present Open Networking Foundation
 
 package pfcpsim
 

diff --git a/pkg/pfcpsim/errors.go b/pkg/pfcpsim/errors.go
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2022-present Open Networking Foundation
+
 package pfcpsim
 
 import (

diff --git a/pkg/pfcpsim/pfcpsim.go b/pkg/pfcpsim/pfcpsim.go
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright 2022 Open Networking Foundation
+// Copyright 2022-present Open Networking Foundation
 
 package pfcpsim
 

diff --git a/pkg/pfcpsim/session.go b/pkg/pfcpsim/session.go
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2022-present Open Networking Foundation
+
 package pfcpsim
 
 type PFCPSession struct {

diff --git a/pkg/pfcpsim/session/far_builder.go b/pkg/pfcpsim/session/far_builder.go
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2022-present Open Networking Foundation
+
 package session
 
 import (

diff --git a/pkg/pfcpsim/session/far_builder_test.go b/pkg/pfcpsim/session/far_builder_test.go
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2022-present Open Networking Foundation
+
 package session
 
 import (

diff --git a/pkg/pfcpsim/session/ies.go b/pkg/pfcpsim/session/ies.go
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright 2022 Open Networking Foundation
+// Copyright 2022-present Open Networking Foundation
 
 package session
 

diff --git a/pkg/pfcpsim/session/pdr_builder.go b/pkg/pfcpsim/session/pdr_builder.go
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2022-present Open Networking Foundation
+
 package session
 
 import (

diff --git a/pkg/pfcpsim/session/pdr_builder_test.go b/pkg/pfcpsim/session/pdr_builder_test.go
@@ -1,7 +1,5 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright 2022 Open Networking Foundation
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2022-present Open Networking Foundation
 
 package session
 

diff --git a/pkg/pfcpsim/session/qer_builder.go b/pkg/pfcpsim/session/qer_builder.go
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2022-present Open Networking Foundation
+
 package session
 
 import "github.com/wmnsk/go-pfcp/ie"

diff --git a/pkg/pfcpsim/session/qer_builder_test.go b/pkg/pfcpsim/session/qer_builder_test.go
@@ -1,7 +1,5 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright 2022 Open Networking Foundation
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2022-present Open Networking Foundation
 
 package session