Adds generated LICENSE headers, enables license enforcement.

This attempts to fix #112. This change attempts to fix up some licensing and copyright inconsistencies in RE2J. Copyright messages have been amended to specify "The Go Authors". The BSD-style Go license has been added to the headers of all Java, Perl and XML source files. This change utilizes the License Gradle Plugin in order to ensure that all source files (java, xml and perl) have an appropriate LICENSE header. License violations can be fixed automatically by running ./gradle licenseFormat. A message to this effect is displayed if any license violations are detected.
google · Jul 9, 2020 · cd60131 · cd60131
1 parent 5e462a4
commit cd60131
Show file tree

Hide file tree

Showing 53 changed files with 314 additions and 119 deletions.
diff --git a/benchmarks/src/main/java/com/google/re2j/benchmark/BenchmarkBacktrack.java b/benchmarks/src/main/java/com/google/re2j/benchmark/BenchmarkBacktrack.java
@@ -1,5 +1,9 @@
-// Copyright 2019 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j.benchmark;
 
 import org.openjdk.jmh.annotations.Benchmark;

diff --git a/benchmarks/src/main/java/com/google/re2j/benchmark/BenchmarkCompile.java b/benchmarks/src/main/java/com/google/re2j/benchmark/BenchmarkCompile.java
@@ -1,5 +1,9 @@
-// Copyright 2019 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j.benchmark;
 
 import org.openjdk.jmh.annotations.Benchmark;

diff --git a/benchmarks/src/main/java/com/google/re2j/benchmark/BenchmarkFullMatch.java b/benchmarks/src/main/java/com/google/re2j/benchmark/BenchmarkFullMatch.java
@@ -1,5 +1,9 @@
-// Copyright 2019 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j.benchmark;
 
 import org.openjdk.jmh.annotations.Benchmark;

diff --git a/benchmarks/src/main/java/com/google/re2j/benchmark/BenchmarkSubMatch.java b/benchmarks/src/main/java/com/google/re2j/benchmark/BenchmarkSubMatch.java
@@ -1,5 +1,9 @@
-// Copyright 2019 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j.benchmark;
 
 import org.openjdk.jmh.annotations.Benchmark;

diff --git a/benchmarks/src/main/java/com/google/re2j/benchmark/Implementations.java b/benchmarks/src/main/java/com/google/re2j/benchmark/Implementations.java
@@ -1,5 +1,9 @@
-// Copyright 2019 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j.benchmark;
 
 public enum Implementations {

diff --git a/build.gradle b/build.gradle
@@ -194,7 +194,6 @@ allprojects {
  header rootProject.file('LICENSE.header')
  ext.year = Calendar.getInstance().get(Calendar.YEAR)
  strictCheck true
- ignoreFailures true
 
  mapping {
  // Without this, the plugin adds javadoc-style comments to the top

diff --git a/java/com/google/re2j/CharClass.java b/java/com/google/re2j/CharClass.java
@@ -1,7 +1,9 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 // Original Go source here:
 // http://code.google.com/p/go/source/browse/src/pkg/regexp/syntax/parse.go
 

diff --git a/java/com/google/re2j/CharGroup.java b/java/com/google/re2j/CharGroup.java
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 // GENERATED BY make_perl_groups.pl; DO NOT EDIT.
 // make_perl_groups.pl >perl_groups.go
 

diff --git a/java/com/google/re2j/Characters.java b/java/com/google/re2j/Characters.java
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j;
 
 /** Wraps Character methods to be overridden for GWT. */

diff --git a/java/com/google/re2j/Compiler.java b/java/com/google/re2j/Compiler.java
@@ -1,7 +1,9 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 // Original Go source here:
 // http://code.google.com/p/go/source/browse/src/pkg/regexp/syntax/compile.go
 

diff --git a/java/com/google/re2j/Inst.java b/java/com/google/re2j/Inst.java
@@ -1,7 +1,9 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 // Original Go source here:
 // http://code.google.com/p/go/source/browse/src/pkg/regexp/syntax/prog.go
 

diff --git a/java/com/google/re2j/Machine.java b/java/com/google/re2j/Machine.java
@@ -1,7 +1,9 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 // Original Go source here:
 // http://code.google.com/p/go/source/browse/src/pkg/regexp/exec.go
 

diff --git a/java/com/google/re2j/MachineInput.java b/java/com/google/re2j/MachineInput.java
@@ -1,7 +1,9 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 // Original Go source here:
 // http://code.google.com/p/go/source/browse/src/pkg/regexp/regexp.go
 

diff --git a/java/com/google/re2j/Matcher.java b/java/com/google/re2j/Matcher.java
@@ -1,5 +1,9 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j;
 
 import java.util.Map;

diff --git a/java/com/google/re2j/Parser.java b/java/com/google/re2j/Parser.java
@@ -1,7 +1,9 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 // Original Go source here:
 // http://code.google.com/p/go/source/browse/src/pkg/regexp/syntax/parse.go
 

diff --git a/java/com/google/re2j/Pattern.java b/java/com/google/re2j/Pattern.java
@@ -1,5 +1,9 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j;
 
 import java.io.Serializable;

diff --git a/java/com/google/re2j/PatternSyntaxException.java b/java/com/google/re2j/PatternSyntaxException.java
@@ -1,7 +1,9 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j;
 
 /**

diff --git a/java/com/google/re2j/Prog.java b/java/com/google/re2j/Prog.java
@@ -1,7 +1,9 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 // Original Go source here:
 // http://code.google.com/p/go/source/browse/src/pkg/regexp/syntax/prog.go
 

diff --git a/java/com/google/re2j/RE2.java b/java/com/google/re2j/RE2.java
@@ -1,7 +1,9 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 // Original Go source here:
 // http://code.google.com/p/go/source/browse/src/pkg/regexp/regexp.go
 

diff --git a/java/com/google/re2j/RE2J.gwt.xml b/java/com/google/re2j/RE2J.gwt.xml
@@ -1,3 +1,11 @@
+<!--
+
+ Copyright (c) 2020 The Go Authors. All rights reserved.
+
+ Use of this source code is governed by a BSD-style
+ license that can be found in the LICENSE file.
+
+-->
 <module rename-to="re2j">
  <inherits name="com.google.gwt.user.User" />
  <source path=""/>

diff --git a/java/com/google/re2j/Regexp.java b/java/com/google/re2j/Regexp.java
@@ -1,7 +1,9 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 // Original Go source here:
 // http://code.google.com/p/go/source/browse/src/pkg/regexp/syntax/regexp.go
 

diff --git a/java/com/google/re2j/Simplify.java b/java/com/google/re2j/Simplify.java
@@ -1,7 +1,9 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 // Original Go source here:
 // http://code.google.com/p/go/source/browse/src/pkg/regexp/syntax/simplify.go
 

diff --git a/java/com/google/re2j/Unicode.java b/java/com/google/re2j/Unicode.java
@@ -1,7 +1,9 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 // Many of these were derived from the corresponding Go functions in
 // http://code.google.com/p/go/source/browse/src/pkg/unicode/letter.go
 

diff --git a/java/com/google/re2j/UnicodeTables.java b/java/com/google/re2j/UnicodeTables.java
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 // Generated at 2020-06-09T16:20:06.352Z by Java 1.8.0_181 using Unicode version 6.0.0.0.
 // Do not change this file, your edits will be lost. Instead change UnicodeTablesGenerator.java.
 package com.google.re2j;

diff --git a/java/com/google/re2j/Utils.java b/java/com/google/re2j/Utils.java
@@ -1,7 +1,9 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j;
 
 /**

diff --git a/java/com/google/re2j/make_perl_groups.pl b/java/com/google/re2j/make_perl_groups.pl
@@ -1,7 +1,10 @@
 #!/usr/bin/perl
-# Copyright 2008 The Go Authors. All rights reserved.
+#
+# Copyright (c) 2020 The Go Authors. All rights reserved.
+#
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
+#
 
 # Modified version of make_perl_groups.pl from RE2/Go:
 # code.google.com/p/go/source/browse/src/pkg/regexp/syntax/make_perl_groups.pl

diff --git a/java/com/google/re2j/super/com/google/re2j/Characters.java b/java/com/google/re2j/super/com/google/re2j/Characters.java
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j;
 
 /** GWT supersource for {@link Character#toLowerCase}. */

diff --git a/javatests/com/google/re2j/ApiTestUtils.java b/javatests/com/google/re2j/ApiTestUtils.java
@@ -1,5 +1,9 @@
-// Copyright 2012 Google Inc. All Rights Reserved.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j;
 
 import com.google.common.truth.Truth;

diff --git a/javatests/com/google/re2j/CharClassTest.java b/javatests/com/google/re2j/CharClassTest.java
@@ -1,8 +1,9 @@
-// Copyright 2011 Google Inc. All Rights Reserved.
-//
-// Partly plundered from third_party/re2/testing/charclass_test.cc,
-// updated to account for proper Unicode case folding.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 package com.google.re2j;
 
 import static com.google.re2j.Utils.stringToRunes;

diff --git a/javatests/com/google/re2j/ExecTest.java b/javatests/com/google/re2j/ExecTest.java
@@ -1,7 +1,9 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 // Original Go source here:
 // http://code.google.com/p/go/source/browse/src/pkg/regexp/syntax/exec_test.go
 

diff --git a/javatests/com/google/re2j/FindTest.java b/javatests/com/google/re2j/FindTest.java
@@ -1,7 +1,9 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
+/*
+ * Copyright (c) 2020 The Go Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
 // Original Go source here:
 // http://code.google.com/p/go/source/browse/src/pkg/regexp/find_test.go
 //