internal/licenses: update Apache-2.0 file
Make the detection of Apache-2.0 more permissive to accommodate the
github.com/SparkPost/gosparkpost license file.
Updates #39388
Change-Id: I12257c9dfaeb42e9742f2357ed4d21da0ac95170
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/283832
Trust: Jonathan Amsterdam <jba@google.com>
Run-TryBot: Jonathan Amsterdam <jba@google.com>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Julie Qiu <julie@golang.org>
diff --git a/internal/licenses/exceptions.gen.go b/internal/licenses/exceptions.gen.go
index 1318056..62c7857 100644
--- a/internal/licenses/exceptions.gen.go
+++ b/internal/licenses/exceptions.gen.go
@@ -878,12 +878,15 @@
((http))??
((www))??
.apache.org/licenses/LICENSE-2.0
+ ((html))??
||
((http))??
aws.amazon.com/apache2.0/
))??
- ((or in the license file accompanying this file.))??
+ ((or in the license file accompanying this
+ ((file. || software.))
+ ))??
((
((As well as the file __10__))??
@@ -1066,7 +1069,7 @@
(( 2. || (b) ))??
You must cause any modified files to carry prominent notices stating that
You changed the files;
- ((and || andxi))
+ and
(( 3. || c ))??
You must retain, in the Source form of any Derivative Works that You
@@ -10162,12 +10165,15 @@
((http))??
((www))??
.apache.org/licenses/LICENSE-2.0
+ ((html))??
||
((http))??
aws.amazon.com/apache2.0/
))??
- ((or in the license file accompanying this file.))??
+ ((or in the license file accompanying this
+ ((file. || software.))
+ ))??
((
((As well as the file __10__))??
@@ -10350,7 +10356,7 @@
(( 2. || (b) ))??
You must cause any modified files to carry prominent notices stating that
You changed the files;
- ((and || andxi))
+ and
(( 3. || c ))??
You must retain, in the Source form of any Derivative Works that You
@@ -10706,12 +10712,15 @@
((http))??
((www))??
.apache.org/licenses/LICENSE-2.0
+ ((html))??
||
((http))??
aws.amazon.com/apache2.0/
))??
- ((or in the license file accompanying this file.))??
+ ((or in the license file accompanying this
+ ((file. || software.))
+ ))??
((
((As well as the file __10__))??
@@ -10894,7 +10903,7 @@
(( 2. || (b) ))??
You must cause any modified files to carry prominent notices stating that
You changed the files;
- ((and || andxi))
+ and
(( 3. || c ))??
You must retain, in the Source form of any Derivative Works that You
diff --git a/internal/licenses/exceptions/Apache-2.0.lre b/internal/licenses/exceptions/Apache-2.0.lre
index 2c002ba..4b0bb95 100644
--- a/internal/licenses/exceptions/Apache-2.0.lre
+++ b/internal/licenses/exceptions/Apache-2.0.lre
@@ -46,12 +46,15 @@
((http))??
((www))??
.apache.org/licenses/LICENSE-2.0
+ ((html))??
||
((http))??
aws.amazon.com/apache2.0/
))??
- ((or in the license file accompanying this file.))??
+ ((or in the license file accompanying this
+ ((file. || software.))
+ ))??
((
((As well as the file __10__))??
@@ -202,8 +205,7 @@
(( 2. || (b) ))??
You must cause any modified files to carry prominent notices stating that
- You changed the files;
- ((and || andxi))
+ You changed the files; and
(( 3. || c ))??
You must retain, in the Source form of any Derivative Works that You
