From d8c455ebb46b0f489a4a83367e4833fda5a131db Mon Sep 17 00:00:00 2001
From: Bill Neubauer <wcn@google.com>
Date: Mon, 24 Oct 2022 19:52:53 -0400
Subject: Mega merge from Google

The core of the PR is an expert from Google, but it applies
several changes to account for Bazel differences.

- deal with bazel 5.x 6.x @// handling
- restore package_url and package_version. This is temporary
  they will move to other providers.

PiperOrigin-RevId: 483521567
---
 examples/my_org/compliance/BUILD | 31 -------------------------------
 examples/my_org/licenses/BUILD   | 13 +++++++++++++
 2 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 examples/my_org/compliance/BUILD

(limited to 'examples/my_org')

diff --git a/examples/my_org/compliance/BUILD b/examples/my_org/compliance/BUILD
deleted file mode 100644
index 074b21e..0000000
--- a/examples/my_org/compliance/BUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Example license policy definitions.
-
-load("@rules_license//rules:license_policy.bzl", "license_policy")
-
-package(default_visibility = ["//examples:__subpackages__"])
-
-# license_policy rules generally appear in a central location per workspace. They
-# are intermingled with normal target build rules
-license_policy(
-    name = "production_service",
-    conditions = [
-        "notice",
-        "restricted_if_statically_linked",
-    ],
-)
-
-license_policy(
-    name = "mobile_application",
-    conditions = [
-        "notice",
-    ],
-)
-
-license_policy(
-    name = "special_whitelisted_app",
-    # There could be a whitelist of targets here.
-    conditions = [
-        "notice",
-        "whitelist:acme_corp_paid",
-    ],
-)
diff --git a/examples/my_org/licenses/BUILD b/examples/my_org/licenses/BUILD
index d9d5c25..f17bfa3 100644
--- a/examples/my_org/licenses/BUILD
+++ b/examples/my_org/licenses/BUILD
@@ -1,3 +1,16 @@
+# Copyright 2022 Google LLC
+#
+# 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
+#
+# https://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.
 # Example license kind definitions.
 
 # We expect that all license_kind rules used by an organization exist in a
-- 
cgit v1.2.3


From 4c4d2e9c71c5e05faa128943e35f511688217451 Mon Sep 17 00:00:00 2001
From: Tony Aiuto <aiuto@google.com>
Date: Wed, 8 Feb 2023 16:01:29 -0500
Subject: Grab back of little style nits which will make it easier to sync this
 code back and forth with the Google branches.

- restore copyright notices (This keeps compliance teams happy)
- change public visibilty to restricted ones, so end users can
  not depend on pieces of the vendored in library
- remove printf debugging.
---
 examples/my_org/licenses/BUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/my_org')

diff --git a/examples/my_org/licenses/BUILD b/examples/my_org/licenses/BUILD
index f17bfa3..c200d37 100644
--- a/examples/my_org/licenses/BUILD
+++ b/examples/my_org/licenses/BUILD
@@ -66,6 +66,6 @@ license_kind(
 license_kind(
     name = "acme_corp_paid",
     conditions = [
-        "whitelist:acme_corp_paid",
+        "allowlist:acme_corp_paid",
     ],
 )
-- 
cgit v1.2.3