You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/04/11 18:53:51 UTC
svn commit: r1466963 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/
lucene/codecs/ lucene/codecs/src/java/org/apache/lucene/codecs/sep/
Author: rmuir
Date: Thu Apr 11 16:53:51 2013
New Revision: 1466963
URL: http://svn.apache.org/r1466963
Log:
make rat pickier if the license header is screwed up
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java
lucene/dev/branches/branch_4x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/sep/IntIndexOutput.java
lucene/dev/branches/branch_4x/lucene/common-build.xml (contents, props changed)
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java?rev=1466963&r1=1466962&r2=1466963&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java Thu Apr 11 16:53:51 2013
@@ -1,10 +1,18 @@
/*
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
*/
package org.apache.lucene.analysis.commongrams;
Modified: lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/sep/IntIndexOutput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/sep/IntIndexOutput.java?rev=1466963&r1=1466962&r2=1466963&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/sep/IntIndexOutput.java (original)
+++ lucene/dev/branches/branch_4x/lucene/codecs/src/java/org/apache/lucene/codecs/sep/IntIndexOutput.java Thu Apr 11 16:53:51 2013
@@ -1,7 +1,7 @@
package org.apache.lucene.codecs.sep;
-/**
- * LICENSED to the Apache Software Foundation (ASF) under one or more
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1466963&r1=1466962&r2=1466963&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Thu Apr 11 16:53:51 2013
@@ -1540,6 +1540,14 @@ ${tests-output}/junit4-*.suites - pe
<pattern substring="Permission is hereby granted, free of charge, to any person obtaining a copy"/>
</rat:substringMatcher>
+ <!-- apache -->
+ <rat:substringMatcher licenseFamilyCategory="AL "
+ licenseFamilyName="Apache">
+ <pattern substring="Licensed to the Apache Software Foundation (ASF) under"/>
+ <!-- this is the old-school one under some files -->
+ <pattern substring="Licensed under the Apache License, Version 2.0 (the "License")"/>
+ </rat:substringMatcher>
+
<rat:substringMatcher licenseFamilyCategory="GEN "
licenseFamilyName="Generated">
<!-- svg files generated by gnuplot -->
@@ -1551,7 +1559,7 @@ ${tests-output}/junit4-*.suites - pe
</rat:substringMatcher>
<!-- built in approved licenses -->
- <rat:approvedLicense familyName="Apache License Version 2.0"/>
+ <rat:approvedLicense familyName="Apache"/>
<rat:approvedLicense familyName="The MIT License"/>
<rat:approvedLicense familyName="Modified BSD License"/>
<rat:approvedLicense familyName="Generated"/>
@@ -1561,7 +1569,12 @@ ${tests-output}/junit4-*.suites - pe
<echo>${rat.output}</echo>
<delete>
<fileset file="${rat.sources.logfile}">
- <containsregexp expression="^0 Unknown Licenses"/>
+ <and>
+ <containsregexp expression="^0 Unknown Licenses"/>
+ <not>
+ <containsregexp expression="^\s+!AL"/>
+ </not>
+ </and>
</fileset>
</delete>
<!-- fail if we didnt find the pattern -->