Skip to content

Commit 4ec605e

Browse files
committed
Merge pull request elastic#15547 from rmuir/license_categories
Remove unnecessary license categories/matchers
2 parents b7ead72 + 2ce5464 commit 4ec605e

File tree

1 file changed

+1
-34
lines changed

1 file changed

+1
-34
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/LicenseHeadersTask.groovy

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -66,37 +66,12 @@ public class LicenseHeadersTask extends DefaultTask {
6666
}
6767

6868
// BSD 4-clause stuff (is disallowed below)
69+
// we keep this here, in case someone adds BSD code for some reason, it should never be allowed.
6970
substringMatcher(licenseFamilyCategory: "BSD4 ",
7071
licenseFamilyName: "Original BSD License (with advertising clause)") {
7172
pattern(substring: "All advertising materials")
7273
}
7374

74-
// BSD-like stuff
75-
substringMatcher(licenseFamilyCategory: "BSD ",
76-
licenseFamilyName: "Modified BSD License") {
77-
// brics automaton
78-
pattern(substring: "Copyright (c) 2001-2009 Anders Moeller")
79-
// snowball
80-
pattern(substring: "Copyright (c) 2001, Dr Martin Porter")
81-
// UMASS kstem
82-
pattern(substring: "THIS SOFTWARE IS PROVIDED BY UNIVERSITY OF MASSACHUSETTS AND OTHER CONTRIBUTORS")
83-
// Egothor
84-
pattern(substring: "Egothor Software License version 1.00")
85-
// JaSpell
86-
pattern(substring: "Copyright (c) 2005 Bruno Martins")
87-
// d3.js
88-
pattern(substring: "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS")
89-
// highlight.js
90-
pattern(substring: "THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS")
91-
}
92-
93-
// MIT-like
94-
substringMatcher(licenseFamilyCategory: "MIT ",
95-
licenseFamilyName: "The MIT License") {
96-
// ICU license
97-
pattern(substring: "Permission is hereby granted, free of charge, to any person obtaining a copy")
98-
}
99-
10075
// Apache
10176
substringMatcher(licenseFamilyCategory: "AL ",
10277
licenseFamilyName: "Apache") {
@@ -111,20 +86,12 @@ public class LicenseHeadersTask extends DefaultTask {
11186
// Generated resources
11287
substringMatcher(licenseFamilyCategory: "GEN ",
11388
licenseFamilyName: "Generated") {
114-
// svg files generated by gnuplot
115-
pattern(substring: "Produced by GNUPLOT")
116-
// snowball stemmers generated by snowball compiler
117-
pattern(substring: "This file was generated automatically by the Snowball to Java compiler")
118-
// uima tests generated by JCasGen
119-
pattern(substring: "First created by JCasGen")
12089
// parsers generated by antlr
12190
pattern(substring: "ANTLR GENERATED CODE")
12291
}
12392

12493
// approved categories
12594
approvedLicense(familyName: "Apache")
126-
approvedLicense(familyName: "The MIT License")
127-
approvedLicense(familyName: "Modified BSD License")
12895
approvedLicense(familyName: "Generated")
12996
}
13097

0 commit comments

Comments
 (0)