diff --git a/build.xml b/build.xml index e762c0954f2..da9748c16f0 100644 --- a/build.xml +++ b/build.xml @@ -124,32 +124,75 @@ - - - - - - - - - - - - - - - - - - - - - - - - The following files contain @author tags, tabs, TOODs, svn keywords or nocommits:${line.separator}${validate.patternsFound} + + + + + task.log(name + ': ' + f.toString().substring(baseDirLen).replace(File.separatorChar, (char)'/')); + violations.add(name); + found++; + } + + ant.fileScanner{ + fileset(dir: baseDir){ + extensions.each{ + include(name: 'lucene/**/*.' + it) + include(name: 'solr/**/*.' + it) + include(name: 'dev-tools/**/*.' + it) + include(name: '*.' + it) + } + exclude(name: '**/build/**') + } + }.each{ f -> + def text = f.getText('UTF-8'); + invalidPatterns.each{ pattern,name -> + if (pattern.matcher(text).find()) { + reportViolation(f, name); + } + } + def m = licenseOuterPattern.matcher(text); + while (m.find()) { + if (licenseInnerPattern.matcher(m.group(1)).find()) { + reportViolation(f, 'javadoc-style license header'); + } + } + }; + + if (found) { + throw new BuildException(String.format(Locale.ENGLISH, 'Found %d violations in source files (%s).', + found, violations.join(', '))); + } + ]]> - + diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 74da7b35a37..4077eee58f1 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -69,6 +69,12 @@ Other * LUCENE-6729: Upgrade ASM used in expressions module to version 5.0.4. (Uwe Schindler) +Build + +* LUCENE-6732: Improve checker for invalid source patterns to also + detect javadoc-style license headers. Use Groovy to implement the + checks instead of plain Ant. (Uwe Schindler) + ======================= Lucene 5.3.0 ======================= New Features diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLCharacterEntities.jflex b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLCharacterEntities.jflex index 0e3dcd95926..c2fdc1d4283 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLCharacterEntities.jflex +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLCharacterEntities.jflex @@ -1,4 +1,4 @@ -/** +/* * 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. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/htmlentity.py b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/htmlentity.py index 94d70f2ba9b..94de1ac72f4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/htmlentity.py +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/htmlentity.py @@ -516,7 +516,7 @@ You can download this version of this file from http://www.w3.org/TR/2010/REC-xh return text def get_apache_license(): - license = r"""/** + license = r"""/* * 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. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java index c80c27200b8..100b3ac53d1 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.el; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java index 66d4aa6a602..88d299764aa 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.el; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/TokenRangeSinkFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/TokenRangeSinkFilter.java index 8ec5ba350e5..4fd1945afde 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/TokenRangeSinkFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/TokenRangeSinkFilter.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.sinks; -/** +/* * 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. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java index 4f6edba98c8..67547902cd2 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.th; -/** +/* * Copyright 2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java index 5e8fcf0f179..d44f8b56602 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java @@ -2,7 +2,7 @@ package org.apache.lucene.analysis.wikipedia; -/** +/* * 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. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex index 7fde30afb3d..10e5c9fe4ca 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.wikipedia; -/** +/* * 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. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationDocValuesField.java b/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationDocValuesField.java index 5324a418330..d77f05a0512 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationDocValuesField.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationDocValuesField.java @@ -1,6 +1,6 @@ package org.apache.lucene.collation; -/** +/* * 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. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java index c21d7f5842d..1d6a96af792 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.core; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java index 6939d2018df..d16aff3bc58 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.el; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java index dc84758f796..fc02e615d3a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.miscellaneous; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java index 21b42ea287d..fed6ca890a6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.miscellaneous; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java index 8f76e9158ba..a54f14760bc 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.payloads; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java index 94cbb4cdf56..500863cf299 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.payloads; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java index 7239d7cc6a1..ef1345da873 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.payloads; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java index df50ab35c08..39cca608445 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.sinks; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java index 87e6a64f092..a0e2636e2b6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.sinks; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java index c2e37ff8dc1..d03ee35eef2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TokenTypeSinkTokenizerTest.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.sinks; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java index d03dfded214..e527ca1f9ba 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.snowball; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java index f4b227688fa..f67a6bc44bc 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.standard; -/** +/* * 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. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/generateJavaUnicodeWordBreakTest.pl b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/generateJavaUnicodeWordBreakTest.pl index 46ac3ef3568..ec379244928 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/generateJavaUnicodeWordBreakTest.pl +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/generateJavaUnicodeWordBreakTest.pl @@ -42,7 +42,7 @@ my $output_filename = "${class_name}.java"; my $header =<<"__HEADER__"; package org.apache.lucene.analysis.core; -/** +/* * 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. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java b/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java index bbc2fa6c9a4..bbdfe566ab5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java @@ -1,6 +1,6 @@ package org.apache.lucene.collation; -/** +/* * 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. diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationDocValuesField.java b/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationDocValuesField.java index eee80bb819e..e76ac57da4d 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationDocValuesField.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationDocValuesField.java @@ -1,6 +1,6 @@ package org.apache.lucene.collation; -/** +/* * 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. diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java b/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java index 237feadfa7e..4d9645f10f1 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java @@ -1,6 +1,6 @@ package org.apache.lucene.collation; -/** +/* * 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. diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java index d4d7b546ec3..43a0f00bd57 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.ja; -/** +/* * 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. diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java index 243b2fc71d4..5ec765405c5 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.ja; -/** +/* * 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. diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilter.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilter.java index 93cadf68dc7..d70e8051ae0 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilter.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilter.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.ja; -/** +/* * 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. diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java index bdd1006dd08..5a68a14eee1 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.ja; -/** +/* * 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. diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java index 503fafdfcdc..b04364dc9a5 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.ja; -/** +/* * 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. diff --git a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java index a94fe9d0c8a..1ea242fad51 100644 --- a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java +++ b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java index 983c2f026c8..9c510ec1902 100644 --- a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java +++ b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/Constants.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/Constants.java index 9d920efd4ad..750ab5ba2c9 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/Constants.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/Constants.java @@ -1,5 +1,5 @@ package org.apache.lucene.benchmark; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java index 19dd92f2c1d..88103f2bf86 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java @@ -1,5 +1,5 @@ package org.apache.lucene.benchmark.byTask.feeds; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java index 9b653ea4b3a..a10648d24ad 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java @@ -1,3 +1,19 @@ +/* + * Copyright 2004 The Apache Software Foundation + *

+ * 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. + */ + package org.apache.lucene.benchmark.byTask.feeds; import org.apache.lucene.analysis.Analyzer; @@ -15,22 +31,6 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; -/** - * Copyright 2004 The Apache Software Foundation - *

- * 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. - */ - /** * Create queries from a FileReader. One per line, pass them through the * QueryParser. Lines beginning with # are treated as comments diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java index 0c57d20c3b5..aa5b8bb70ca 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java @@ -1,6 +1,6 @@ package org.apache.lucene.benchmark.byTask.programmatic; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java index 920509209e6..074fb5a1d0e 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java @@ -1,5 +1,5 @@ package org.apache.lucene.benchmark.byTask.tasks; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java index dfbbaa249ae..85c33e010c2 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java @@ -1,5 +1,5 @@ package org.apache.lucene.benchmark.byTask.tasks; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java index 5ddab6001e2..c56ca0d318e 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java @@ -1,5 +1,5 @@ package org.apache.lucene.benchmark.utils; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java index 4196c6eaf2f..672d1482f91 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java @@ -1,5 +1,5 @@ package org.apache.lucene.codecs.bloom; -/** +/* * 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. diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java index d8a98a5ea09..51cff8d1781 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java @@ -1,6 +1,6 @@ package org.apache.lucene.codecs.bloom; -/** +/* * 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. diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java index 6ced505bd38..3373eec1ef4 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java @@ -1,5 +1,5 @@ package org.apache.lucene.codecs.bloom; -/** +/* * 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. diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java index 424d32e36ef..c1e4ccc7f57 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java @@ -1,6 +1,6 @@ package org.apache.lucene.codecs.bloom; -/** +/* * 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. diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/HashFunction.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/HashFunction.java index abc10509259..dbf70803b65 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/HashFunction.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/HashFunction.java @@ -1,5 +1,5 @@ package org.apache.lucene.codecs.bloom; -/** +/* * 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. diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/MurmurHash2.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/MurmurHash2.java index ea7486f3894..b43869b2704 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/MurmurHash2.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/MurmurHash2.java @@ -1,5 +1,5 @@ package org.apache.lucene.codecs.bloom; -/** +/* * 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. diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java index a37f5229fdc..4755a5eaa95 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java @@ -1,6 +1,6 @@ package org.apache.lucene.codecs.memory; -/** +/* * 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. diff --git a/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java index cd6205127ea..43117d2bc9f 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java @@ -1,6 +1,6 @@ package org.apache.lucene.codecs; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java index d382384819a..bef658c2c6d 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java @@ -1,6 +1,6 @@ package org.apache.lucene.codecs; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); you may not diff --git a/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java b/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java index 3abd023b2eb..c9ec2bc0247 100644 --- a/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java @@ -1,6 +1,6 @@ package org.apache.lucene.search; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java b/lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java index 0a008c9865e..93e82826960 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java @@ -1,5 +1,5 @@ package org.apache.lucene.search.spans; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java b/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java index d60019e046b..fe26a08da95 100644 --- a/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java +++ b/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java @@ -1,6 +1,6 @@ package org.apache.lucene.util; -/** +/* * 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 diff --git a/lucene/core/src/java/org/apache/lucene/util/SmallFloat.java b/lucene/core/src/java/org/apache/lucene/util/SmallFloat.java index 8221b980803..301e1f57a32 100644 --- a/lucene/core/src/java/org/apache/lucene/util/SmallFloat.java +++ b/lucene/core/src/java/org/apache/lucene/util/SmallFloat.java @@ -1,5 +1,5 @@ package org.apache.lucene.util; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java b/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java index db6bbb69f7b..1bede7a1b38 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java @@ -1,6 +1,6 @@ package org.apache.lucene.index; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestByteSlices.java b/lucene/core/src/test/org/apache/lucene/index/TestByteSlices.java index 2cc8e32c279..c87c76ece08 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestByteSlices.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestByteSlices.java @@ -1,6 +1,6 @@ package org.apache.lucene.index; -/** +/* * 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 diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java index 4c3743f2507..79d2c93dbdf 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java @@ -1,5 +1,5 @@ package org.apache.lucene.index; -/** +/* * Copyright 2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java index dc2fd1d21db..5d1b92f98aa 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java @@ -1,6 +1,6 @@ package org.apache.lucene.index; -/** +/* * 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. diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java index d4e5ef5c6ad..336acdb6259 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java @@ -1,6 +1,6 @@ package org.apache.lucene.index; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java index c6c856b6e7c..1df019c1121 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java @@ -1,6 +1,6 @@ package org.apache.lucene.index; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java index 10509918834..87a0ea431c9 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java @@ -1,6 +1,6 @@ package org.apache.lucene.index; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java index a59dcd86d11..04cdb8bcbf7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java @@ -1,6 +1,6 @@ package org.apache.lucene.index; -/** +/* * 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 diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java b/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java index 8295d6d1f7e..9190843209e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java @@ -1,6 +1,6 @@ package org.apache.lucene.index; -/** +/* * Copyright 2006 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java b/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java index 5389430d9b1..26a92666f84 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java @@ -1,6 +1,6 @@ package org.apache.lucene.search; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadSpans.java b/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadSpans.java index c5ec804a559..c1c5f1d5dce 100644 --- a/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadSpans.java +++ b/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadSpans.java @@ -1,6 +1,6 @@ package org.apache.lucene.search.payloads; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java b/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java index 32ddab5d530..45628e1c596 100644 --- a/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java +++ b/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java @@ -1,6 +1,6 @@ package org.apache.lucene.util; -/** +/* * 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. diff --git a/lucene/core/src/test/org/apache/lucene/util/TestNumericUtils.java b/lucene/core/src/test/org/apache/lucene/util/TestNumericUtils.java index 1d49b16e1ef..e28165f5baf 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestNumericUtils.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestNumericUtils.java @@ -1,21 +1,21 @@ package org.apache.lucene.util; -/** -* 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. -*/ +/* + * 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. + */ import java.util.Arrays; import java.util.Collections; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSmallFloat.java b/lucene/core/src/test/org/apache/lucene/util/TestSmallFloat.java index 7ffb714b21c..55bf1803d20 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestSmallFloat.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestSmallFloat.java @@ -1,6 +1,6 @@ package org.apache.lucene.util; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/DefaultEncoder.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/DefaultEncoder.java index 8c2e57ebd15..c87671119f7 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/DefaultEncoder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/DefaultEncoder.java @@ -1,5 +1,5 @@ package org.apache.lucene.search.highlight; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Encoder.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Encoder.java index be56f6c2ff8..ee09fa927b3 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Encoder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Encoder.java @@ -1,5 +1,5 @@ package org.apache.lucene.search.highlight; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLEncoder.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLEncoder.java index 003645d5bf1..82d92d70636 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLEncoder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLEncoder.java @@ -1,5 +1,5 @@ package org.apache.lucene.search.highlight; -/** +/* * Copyright 2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFieldFragList.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFieldFragList.java index 9af3ca668b0..154259dab26 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFieldFragList.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFieldFragList.java @@ -1,6 +1,6 @@ package org.apache.lucene.search.vectorhighlight; -/** +/* * 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. diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilder.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilder.java index 655a6c7114c..621287589c3 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilder.java @@ -1,6 +1,6 @@ package org.apache.lucene.search.vectorhighlight; -/** +/* * 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. diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilderTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilderTest.java index c9fd45c1b01..9b6432a7c58 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilderTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilderTest.java @@ -1,6 +1,6 @@ package org.apache.lucene.search.vectorhighlight; -/** +/* * 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. diff --git a/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java b/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java index 784db2cfcdf..a8c57be4248 100644 --- a/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java +++ b/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java @@ -1,6 +1,6 @@ package org.apache.lucene.document; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java b/lucene/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java index 49b7071f718..c0d17dea96f 100644 --- a/lucene/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java +++ b/lucene/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java @@ -1,20 +1,20 @@ package org.apache.lucene.misc; -/** - * Copyright 2005 The Apache Software Foundation - * - * 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. - */ +/* + * Copyright 2005 The Apache Software Foundation + * + * 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. + */ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; diff --git a/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheSanityChecker.java b/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheSanityChecker.java index ae248a620c8..75d3ce941af 100644 --- a/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheSanityChecker.java +++ b/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheSanityChecker.java @@ -1,5 +1,5 @@ package org.apache.lucene.uninverting; -/** +/* * Copyright 2009 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java index d2d117b68e4..40a796e2dbd 100644 --- a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java +++ b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java @@ -1,6 +1,6 @@ package org.apache.lucene.uninverting; -/** +/* * Copyright 2004 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java index b8f67eb551b..fb3fd5791cd 100644 --- a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java +++ b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java @@ -1,6 +1,6 @@ package org.apache.lucene.uninverting; -/** +/* * Copyright 2009 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java b/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java index 115161b6c93..facbf08d121 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java @@ -1,6 +1,6 @@ package org.apache.lucene.queries.mlt; -/** +/* * Copyright 2004-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lucene/queryparser/docs/xml/LuceneContribQuery.dtd.html b/lucene/queryparser/docs/xml/LuceneContribQuery.dtd.html index f373f389770..70725f0e6a6 100644 --- a/lucene/queryparser/docs/xml/LuceneContribQuery.dtd.html +++ b/lucene/queryparser/docs/xml/LuceneContribQuery.dtd.html @@ -27,20 +27,20 @@ Child of BoostQuery, Clause,

BooleanQuerys implement Boolean logic which controls how multiple Clauses should be interpreted. Some clauses may represent optional Query criteria while others represent mandatory criteria.

Example: Find articles about banks, preferably talking about mergers but nothing to do with "sumitomo" -

	          
+
            
             <BooleanQuery fieldName="contents">
-	             <Clause occurs="should">
-		              <TermQuery>merger</TermQuery>
-	             </Clause>
-	             <Clause occurs="mustnot">
-		              <TermQuery>sumitomo</TermQuery>
-	             </Clause>
-	             <Clause occurs="must">
-		              <TermQuery>bank</TermQuery>
-	             </Clause>
+               <Clause occurs="should">
+                  <TermQuery>merger</TermQuery>
+               </Clause>
+               <Clause occurs="mustnot">
+                  <TermQuery>sumitomo</TermQuery>
+               </Clause>
+               <Clause occurs="must">
+                  <TermQuery>bank</TermQuery>
+               </Clause>
             </BooleanQuery>
 
-	         

+           

 
@@ -138,18 +138,18 @@ Bitsets at a cost of 1 bit per document in the index. The memory cost of a cache
 Queries that are cached as filters obviously retain none of the scoring information associated with results - they retain just
 a Boolean yes/no record of which documents matched.
Example: Search for documents about banks from the last 10 years - caching the commonly-used "last 10 year" filter as a BitSet in
 RAM to eliminate the cost of building this filter from disk for every query
-
	          
+
            
             <FilteredQuery>
                <Query>
                   <UserQuery>bank</UserQuery>
-               </Query>	
+               </Query>  
                <Filter>
                   <CachedFilter>
                      <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
                   </CachedFilter>
-               </Filter>	
+               </Filter>  
             </FilteredQuery>
-	         

 
 
<BooleanQuery>'s children

+           

 
@@ -188,9 +188,9 @@ RAM to eliminate the cost of building this filter from disk for every query
 Child of BoostQuery, Clause, CachedFilter, Query

 
 
<CachedFilter>'s children

 

 
Passes content directly through to the standard LuceneQuery parser see "Lucene Query Syntax"
Example: Search for documents about John Smith or John Doe using standard LuceneQuerySyntax
-
	          
+
            
                <UserQuery>"John Smith" OR "John Doe"</UserQuery>
-	         

+           

 
@@ -221,24 +221,24 @@ is a "mustNot" match (Lucene requires at least one positive clause) and..
  •  in a FilteredQuery where a Filter tag is effectively being
 used to select content rather than its usual role of filtering the results of a query.
    • Example: Effectively use a Filter as a query 
-
    	          
+
                
                <FilteredQuery>
                  <Query>
                     <MatchAllDocsQuery/>
                  </Query>
                  <Filter>
                      <RangeFilter fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
-                 </Filter>	
-               </FilteredQuery>	         
-	       
    This element is always empty.
    
+                 </Filter>  
+               </FilteredQuery>           
+         
    This element is always empty.

    
 <UserQuery>'s attributes
 
    
 
 
 
    
 <TermQuery>
 Child of BoostQuery, Clause, CachedFilter, Query
 
    
 
    a single term query - no analysis is done of the child text
    Example: Match on a primary key
-
    	          
+
                
                <TermQuery fieldName="primaryKey">13424</TermQuery>
-	       
    
+         
    
 
@@ -282,9 +282,9 @@ Child text is analyzed using a field-specific choice of Analyzer to produce a se
 Unlike UserQuery element, this does not parse any special characters to control fuzzy/phrase/boolean logic and as such is incapable
 of producing a Query parse error given any user input
    Example: Match on text from a database description (which may contain characters that
 are illegal characters in the standard Lucene Query syntax used in the UserQuery tag
-
    	          
+
                
                <TermsQuery fieldName="description">Smith & Sons (Ltd) : incorporated 1982</TermsQuery>
-	       
    
 <TermQuery>'s attributes
 
    
+         
    
 
@@ -319,16 +319,16 @@ Attribute of TermsQuery
 Child of BoostQuery, Clause, CachedFilter, Query
    
 <TermsQuery>'s attributes
 
    
 
    
 
    Runs a Query and filters results to only those query matches that also match the Filter element.
    Example: Find all documents about Lucene that have a status of "published"
-
    	          
+
                
                <FilteredQuery>
                  <Query>
                     <UserQuery>Lucene</UserQuery>
                  </Query>
                  <Filter>
                      <TermsFilter fieldName="status">published</TermsFilter>
-                 </Filter>	
-               </FilteredQuery>	         
-	       
    
+                 </Filter>  
+               </FilteredQuery>           
+         
    
 
@@ -409,16 +409,16 @@ Child of FilteredQuery
 Child of Clause, Filter, CachedFilter, ConstantScoreQuery
    
 
 
    <FilteredQuery>'s children
    
 
    
 
    Filter used to limit query results to documents matching a range of field values
    Example: Search for documents about banks from the last 10 years
-
    	          
+
                
             <FilteredQuery>
                <Query>
                   <UserQuery>bank</UserQuery>
-               </Query>	
+               </Query>  
                <Filter>
                      <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
-               </Filter>	
+               </Filter>  
             </FilteredQuery>
-	         
    
+           
    
 
@@ -458,9 +458,9 @@ Attribute of RangeFilter
 Child of BoostQuery, Clause, CachedFilter, Query
    
 <RangeFilter>'s attributes
 
    
 
    
 
    A Query that matches numeric values within a specified range.
    Example: Search for documents about people who are aged 20-25
-
    	          
+
                
             <NumericRangeQuery fieldName="age" lowerTerm="20" upperTerm="25" />
-	         
    
+           
    
 
@@ -510,16 +510,16 @@ Attribute of NumericRangeQuery
 Child of Clause, Filter, CachedFilter, ConstantScoreQuery
    
 <NumericRangeQuery>'s attributes
 
    
 
    
 
    A Filter that only accepts numeric values within a specified range
    Example: Search for documents about people who are aged 20-25
-
    	          
+
                
             <FilteredQuery>
                <Query>
                   <UserQuery>person</UserQuery>
-               </Query>	
+               </Query>  
                <Filter>
                      <NumericRangeFilter fieldName="age" lowerTerm="20" upperTerm="25"/>
-               </Filter>	
+               </Filter>  
             </FilteredQuery>
-	         
    
+           
    
 
@@ -570,19 +570,19 @@ Child of BoostQuery, Clause, 
    
 <NumericRangeFilter>'s attributes
 
    
 
    A single term used in a SpanQuery. These clauses are the building blocks for more complex "span" queries which test word proximity
    Example: Find documents using terms close to each other about mining and accidents
 
    -	      <SpanNear slop="8" inOrder="false" fieldName="text">		
-			<SpanOr>
-				<SpanTerm>killed</SpanTerm>
-				<SpanTerm>died</SpanTerm>
-				<SpanTerm>dead</SpanTerm>
-			</SpanOr>
-			<SpanOr>
-				<SpanTerm>miner</SpanTerm>
-				<SpanTerm>mining</SpanTerm>
-				<SpanTerm>miners</SpanTerm>
-			</SpanOr>
-	      </SpanNear>
-	      
    
+        <SpanNear slop="8" inOrder="false" fieldName="text">    
+      <SpanOr>
+        <SpanTerm>killed</SpanTerm>
+        <SpanTerm>died</SpanTerm>
+        <SpanTerm>dead</SpanTerm>
+      </SpanOr>
+      <SpanOr>
+        <SpanTerm>miner</SpanTerm>
+        <SpanTerm>mining</SpanTerm>
+        <SpanTerm>miners</SpanTerm>
+      </SpanOr>
+        </SpanNear>
+        
    
 
@@ -604,11 +604,11 @@ Child of BoostQuery, Clause, A field-specific analyzer is used here to parse the child text provided in this tag. The SpanTerms produced are ORed in terms of Boolean logic
    Example: Use SpanOrTerms as a more convenient/succinct way of expressing multiple choices of SpanTerms. This example looks for reports
 using words describing a fatality near to references to miners
 
    -	      <SpanNear slop="8" inOrder="false" fieldName="text">		
-			<SpanOrTerms>killed died death dead deaths</SpanOrTerms>
-			<SpanOrTerms>miner mining miners</SpanOrTerms>
-	      </SpanNear>
-	      
    
 <SpanTerm>'s attributes
 
    
+        <SpanNear slop="8" inOrder="false" fieldName="text">    
+      <SpanOrTerms>killed died death dead deaths</SpanOrTerms>
+      <SpanOrTerms>miner mining miners</SpanOrTerms>
+        </SpanNear>
+        
    
 
@@ -629,19 +629,19 @@ Child of BoostQuery, Clause, 
    
 <SpanOrTerms>'s attributes
 
    
 
    Takes any number of child queries from the Span family
    Example: Find documents using terms close to each other about mining and accidents
 
    -	      <SpanNear slop="8" inOrder="false" fieldName="text">		
-			<SpanOr>
-				<SpanTerm>killed</SpanTerm>
-				<SpanTerm>died</SpanTerm>
-				<SpanTerm>dead</SpanTerm>
-			</SpanOr>
-			<SpanOr>
-				<SpanTerm>miner</SpanTerm>
-				<SpanTerm>mining</SpanTerm>
-				<SpanTerm>miners</SpanTerm>
-			</SpanOr>
-	      </SpanNear>
-	      
    
+        <SpanNear slop="8" inOrder="false" fieldName="text">    
+      <SpanOr>
+        <SpanTerm>killed</SpanTerm>
+        <SpanTerm>died</SpanTerm>
+        <SpanTerm>dead</SpanTerm>
+      </SpanOr>
+      <SpanOr>
+        <SpanTerm>miner</SpanTerm>
+        <SpanTerm>mining</SpanTerm>
+        <SpanTerm>miners</SpanTerm>
+      </SpanOr>
+        </SpanNear>
+        
    
 
@@ -692,19 +692,19 @@ Attribute of SpanNear
    
 
 
    <SpanOr>'s children
    
 
    
 
    defines the maximum distance between Span elements where distance is expressed as word number, not byte offset
    Example: Find documents using terms within 8 words of each other talking about mining and accidents
 
    -	      <SpanNear slop="8" inOrder="false" fieldName="text">		
-			<SpanOr>
-				<SpanTerm>killed</SpanTerm>
-				<SpanTerm>died</SpanTerm>
-				<SpanTerm>dead</SpanTerm>
-			</SpanOr>
-			<SpanOr>
-				<SpanTerm>miner</SpanTerm>
-				<SpanTerm>mining</SpanTerm>
-				<SpanTerm>miners</SpanTerm>
-			</SpanOr>
-	      </SpanNear>
-	      
    Required
    
+        <SpanNear slop="8" inOrder="false" fieldName="text">    
+      <SpanOr>
+        <SpanTerm>killed</SpanTerm>
+        <SpanTerm>died</SpanTerm>
+        <SpanTerm>dead</SpanTerm>
+      </SpanOr>
+      <SpanOr>
+        <SpanTerm>miner</SpanTerm>
+        <SpanTerm>mining</SpanTerm>
+        <SpanTerm>miners</SpanTerm>
+      </SpanOr>
+        </SpanNear>
+        
    Required
    
 
    
 @inOrder
 Attribute of SpanNear
@@ -715,11 +715,11 @@ Attribute of SpanNear
 Child of BoostQuery, Clause, Include, CachedFilter, SpanOr, SpanNear, Exclude, Query
 
    
 
    Looks for a SpanQuery match occuring near the beginning of a document
    Example: Find letters where the first 50 words talk about a resignation:
-
    	          
-	         <SpanFirst end="50">
-	               <SpanOrTerms fieldName="text">resigning resign leave</SpanOrTerms>
-	         </SpanFirst>
-	         
    
+
                
+           <SpanFirst end="50">
+                 <SpanOrTerms fieldName="text">resigning resign leave</SpanOrTerms>
+           </SpanFirst>
+           
    
 
@@ -761,16 +761,16 @@ Child of BoostQuery, Clause, 
               <SpanNot fieldName="text">
              <Include>
-                <SpanNear slop="2" inOrder="true">		
+                <SpanNear slop="2" inOrder="true">    
                      <SpanTerm>social</SpanTerm>
                      <SpanTerm>services</SpanTerm>
-                </SpanNear>				
+                </SpanNear>        
              </Include>
              <Exclude>
                 <SpanTerm>public</SpanTerm>
              </Exclude>
           </SpanNot>
-	      
    
 
 
    <SpanFirst>'s children
    
+        
    
 
@@ -832,8 +832,8 @@ Child of BoostQuery, Clause, 
          <ConstantScoreQuery>
            <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
-     </ConstantScoreQuery>	
-	
    
 
 
    <SpanNot>'s children
    
+     </ConstantScoreQuery>  
+  
    
 
@@ -869,13 +869,13 @@ Child of BoostQuery, Clause, 
    Example: Search for information about the Sumitomo bank, where the end user has mis-spelt the name
-
    	          
+
                
             <FuzzyLikeThisQuery>
                 <Field fieldName="contents">
-		             Sumitimo bank
-	            </Field>
+                 Sumitimo bank
+              </Field>
             </FuzzyLikeThisQuery>
-	         
    
 
 
    <ConstantScoreQuery>'s children
    
+           
    
 
@@ -965,8 +965,8 @@ appears commonly in the index.
                 Iraq also reported a naval battle at the northern tip of the Gulf. Iraqi naval units and forces defending an 
                 offshore terminal sank six Iranian out of 28 Iranian boats attempting to attack an offshore terminal, 
                 the communique said.      Reuters 3;
-            </LikeThisQuery>	         
-	        
    
 
 
    <FuzzyLikeThisQuery>'s children
    
+            </LikeThisQuery>           
+          
    
 
@@ -1015,7 +1015,7 @@ Child of BoostQuery, Clause, 
    Example: Find documents about banks, preferably related to mergers, and preferably not about "World bank"
 
    -	<BoostingQuery>
+  <BoostingQuery>
       <Query>
          <BooleanQuery fieldName="contents">
            <Clause occurs="should">
@@ -1024,13 +1024,13 @@ on the match score.
    Example: Find doc
            <Clause occurs="must">
               <TermQuery>bank</TermQuery>
            </Clause>
-         </BooleanQuery>	
+         </BooleanQuery>  
       </Query>
       <BoostQuery boost="0.01">
          <UserQuery>"world bank"</UserQuery>
       </BoostQuery>
     </BoostingQuery>
-	
    
 <LikeThisQuery>'s attributes
 
    
+  
    
 
@@ -1109,11 +1109,11 @@ Child of Clause, Filter, 
@@ -1151,11 +1151,11 @@ Child of Clause, Filter, 
+  <Filter>
+    <TermsFilter fieldName="dayOfWeek">monday friday</TermsFilter> 
+  </Filter>  
+    </FilteredQuery>  
+  
    
 
 
    <BoostingQuery>'s children
    
 <DuplicateFilter>'s attributes
 
    
 
@@ -1195,7 +1195,7 @@ Unlike BooleanQuery a BooleanFilter can contain a single "mustNot" clause.
    
 <TermsFilter>'s attributes
 
    
+  
    
 
diff --git a/lucene/queryparser/docs/xml/LuceneCoreQuery.dtd.html b/lucene/queryparser/docs/xml/LuceneCoreQuery.dtd.html
index 6da3b41ce46..ef7bd881d3c 100644
--- a/lucene/queryparser/docs/xml/LuceneCoreQuery.dtd.html
+++ b/lucene/queryparser/docs/xml/LuceneCoreQuery.dtd.html
@@ -45,20 +45,20 @@ Child of Clause, Query, Example: Find articles about banks, preferably talking about mergers but nothing to do with "sumitomo"
-
    	          
+
                
             <BooleanQuery fieldName="contents">
-	             <Clause occurs="should">
-		              <TermQuery>merger</TermQuery>
-	             </Clause>
-	             <Clause occurs="mustnot">
-		              <TermQuery>sumitomo</TermQuery>
-	             </Clause>
-	             <Clause occurs="must">
-		              <TermQuery>bank</TermQuery>
-	             </Clause>
+               <Clause occurs="should">
+                  <TermQuery>merger</TermQuery>
+               </Clause>
+               <Clause occurs="mustnot">
+                  <TermQuery>sumitomo</TermQuery>
+               </Clause>
+               <Clause occurs="must">
+                  <TermQuery>bank</TermQuery>
+               </Clause>
             </BooleanQuery>
 
-	         
    
 
 
    <BooleanFilter>'s children
    
+           
    
 
@@ -150,18 +150,18 @@ Bitsets at a cost of 1 bit per document in the index. The memory cost of a cache
 Queries that are cached as filters obviously retain none of the scoring information associated with results - they retain just
 a Boolean yes/no record of which documents matched.
    Example: Search for documents about banks from the last 10 years - caching the commonly-used "last 10 year" filter as a BitSet in
 RAM to eliminate the cost of building this filter from disk for every query
-
    	          
+
                
             <FilteredQuery>
                <Query>
                   <UserQuery>bank</UserQuery>
-               </Query>	
+               </Query>  
                <Filter>
                   <CachedFilter>
                      <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
                   </CachedFilter>
-               </Filter>	
+               </Filter>  
             </FilteredQuery>
-	         
    
 
 
    <BooleanQuery>'s children
    
+           
    
 
@@ -194,9 +194,9 @@ RAM to eliminate the cost of building this filter from disk for every query
 Child of Clause, Query, CachedFilter
    
 
 
    <CachedFilter>'s children
    
 
    
 
    Passes content directly through to the standard LuceneQuery parser see "Lucene Query Syntax"
    Example: Search for documents about John Smith or John Doe using standard LuceneQuerySyntax
-
    	          
+
                
                <UserQuery>"John Smith" OR "John Doe"</UserQuery>
-	         
    
+           
    
 
@@ -227,24 +227,24 @@ is a "mustNot" match (Lucene requires at least one positive clause) and..
  •  in a FilteredQuery where a Filter tag is effectively being
 used to select content rather than its usual role of filtering the results of a query.
    • Example: Effectively use a Filter as a query 
-
    	          
+
                
                <FilteredQuery>
                  <Query>
                     <MatchAllDocsQuery/>
                  </Query>
                  <Filter>
                      <RangeFilter fieldName="date" lowerTerm="19870409" upperTerm="19870412"/>
-                 </Filter>	
-               </FilteredQuery>	         
-	       
    This element is always empty.
    
+                 </Filter>  
+               </FilteredQuery>           
+         
    This element is always empty.

    
 <UserQuery>'s attributes
 
    
 
 
 
    
 <TermQuery>
 Child of Clause, Query, CachedFilter
 
    
 
    a single term query - no analysis is done of the child text
    Example: Match on a primary key
-
    	          
+
                
                <TermQuery fieldName="primaryKey">13424</TermQuery>
-	       
    
+         
    
 
@@ -288,9 +288,9 @@ Child text is analyzed using a field-specific choice of Analyzer to produce a se
 Unlike UserQuery element, this does not parse any special characters to control fuzzy/phrase/boolean logic and as such is incapable
 of producing a Query parse error given any user input
    Example: Match on text from a database description (which may contain characters that
 are illegal characters in the standard Lucene Query syntax used in the UserQuery tag
-
    	          
+
                
                <TermsQuery fieldName="description">Smith & Sons (Ltd) : incorporated 1982</TermsQuery>
-	       
    
 <TermQuery>'s attributes
 
    
+         
    
 
@@ -325,16 +325,16 @@ Attribute of TermsQuery
 Child of Clause, Query, CachedFilter
    
 <TermsQuery>'s attributes
 
    
 
    
 
    Runs a Query and filters results to only those query matches that also match the Filter element.
    Example: Find all documents about Lucene that have a status of "published"
-
    	          
+
                
                <FilteredQuery>
                  <Query>
                     <UserQuery>Lucene</UserQuery>
                  </Query>
                  <Filter>
                      <TermsFilter fieldName="status">published</TermsFilter>
-                 </Filter>	
-               </FilteredQuery>	         
-	       
    
+                 </Filter>  
+               </FilteredQuery>           
+         
    
 
@@ -409,16 +409,16 @@ Child of FilteredQuery
 Child of Clause, ConstantScoreQuery, Filter, CachedFilter
    
 
 
    <FilteredQuery>'s children
    
 
    
 
    Filter used to limit query results to documents matching a range of field values
    Example: Search for documents about banks from the last 10 years
-
    	          
+
                
             <FilteredQuery>
                <Query>
                   <UserQuery>bank</UserQuery>
-               </Query>	
+               </Query>  
                <Filter>
                      <RangeFilter fieldName="date" lowerTerm="19970101" upperTerm="20070101"/>
-               </Filter>	
+               </Filter>  
             </FilteredQuery>
-	         
    
+           
    
 
@@ -458,9 +458,9 @@ Attribute of RangeFilter
 Child of Clause, Query, CachedFilter
    
 <RangeFilter>'s attributes
 
    
 
    
 
    A Query that matches numeric values within a specified range.
    Example: Search for documents about people who are aged 20-25
-
    	          
+
                
             <NumericRangeQuery fieldName="age" lowerTerm="20" upperTerm="25" />
-	         
    
+           
    
 
@@ -510,16 +510,16 @@ Attribute of NumericRangeQuery
 Child of Clause, ConstantScoreQuery, Filter, CachedFilter
    
 <NumericRangeQuery>'s attributes
 
    
 
    
 
    A Filter that only accepts numeric values within a specified range
    Example: Search for documents about people who are aged 20-25
-
    	          
+
                
             <FilteredQuery>
                <Query>
                   <UserQuery>person</UserQuery>
-               </Query>	
+               </Query>  
                <Filter>
                      <NumericRangeFilter fieldName="age" lowerTerm="20" upperTerm="25"/>
-               </Filter>	
+               </Filter>  
             </FilteredQuery>
-	         
    
+           
    
 
@@ -570,19 +570,19 @@ Child of Include, Clause, Example: Find documents using terms close to each other about mining and accidents
 
    -	      <SpanNear slop="8" inOrder="false" fieldName="text">		
-			<SpanOr>
-				<SpanTerm>killed</SpanTerm>
-				<SpanTerm>died</SpanTerm>
-				<SpanTerm>dead</SpanTerm>
-			</SpanOr>
-			<SpanOr>
-				<SpanTerm>miner</SpanTerm>
-				<SpanTerm>mining</SpanTerm>
-				<SpanTerm>miners</SpanTerm>
-			</SpanOr>
-	      </SpanNear>
-	      
    
 <NumericRangeFilter>'s attributes
 
    
+        <SpanNear slop="8" inOrder="false" fieldName="text">    
+      <SpanOr>
+        <SpanTerm>killed</SpanTerm>
+        <SpanTerm>died</SpanTerm>
+        <SpanTerm>dead</SpanTerm>
+      </SpanOr>
+      <SpanOr>
+        <SpanTerm>miner</SpanTerm>
+        <SpanTerm>mining</SpanTerm>
+        <SpanTerm>miners</SpanTerm>
+      </SpanOr>
+        </SpanNear>
+        
    
 
@@ -604,11 +604,11 @@ Child of Include, Clause, Example: Use SpanOrTerms as a more convenient/succinct way of expressing multiple choices of SpanTerms. This example looks for reports
 using words describing a fatality near to references to miners
 
    -	      <SpanNear slop="8" inOrder="false" fieldName="text">		
-			<SpanOrTerms>killed died death dead deaths</SpanOrTerms>
-			<SpanOrTerms>miner mining miners</SpanOrTerms>
-	      </SpanNear>
-	      
    
 <SpanTerm>'s attributes
 
    
+        <SpanNear slop="8" inOrder="false" fieldName="text">    
+      <SpanOrTerms>killed died death dead deaths</SpanOrTerms>
+      <SpanOrTerms>miner mining miners</SpanOrTerms>
+        </SpanNear>
+        
    
 
@@ -629,19 +629,19 @@ Child of Include, Clause, Example: Find documents using terms close to each other about mining and accidents
 
    -	      <SpanNear slop="8" inOrder="false" fieldName="text">		
-			<SpanOr>
-				<SpanTerm>killed</SpanTerm>
-				<SpanTerm>died</SpanTerm>
-				<SpanTerm>dead</SpanTerm>
-			</SpanOr>
-			<SpanOr>
-				<SpanTerm>miner</SpanTerm>
-				<SpanTerm>mining</SpanTerm>
-				<SpanTerm>miners</SpanTerm>
-			</SpanOr>
-	      </SpanNear>
-	      
    
 <SpanOrTerms>'s attributes
 
    
+        <SpanNear slop="8" inOrder="false" fieldName="text">    
+      <SpanOr>
+        <SpanTerm>killed</SpanTerm>
+        <SpanTerm>died</SpanTerm>
+        <SpanTerm>dead</SpanTerm>
+      </SpanOr>
+      <SpanOr>
+        <SpanTerm>miner</SpanTerm>
+        <SpanTerm>mining</SpanTerm>
+        <SpanTerm>miners</SpanTerm>
+      </SpanOr>
+        </SpanNear>
+        
    
 
@@ -692,19 +692,19 @@ Attribute of SpanNear
    
 
 
    <SpanOr>'s children
    
 
    
 
    defines the maximum distance between Span elements where distance is expressed as word number, not byte offset
    Example: Find documents using terms within 8 words of each other talking about mining and accidents
 
    -	      <SpanNear slop="8" inOrder="false" fieldName="text">		
-			<SpanOr>
-				<SpanTerm>killed</SpanTerm>
-				<SpanTerm>died</SpanTerm>
-				<SpanTerm>dead</SpanTerm>
-			</SpanOr>
-			<SpanOr>
-				<SpanTerm>miner</SpanTerm>
-				<SpanTerm>mining</SpanTerm>
-				<SpanTerm>miners</SpanTerm>
-			</SpanOr>
-	      </SpanNear>
-	      
    Required
    
+        <SpanNear slop="8" inOrder="false" fieldName="text">    
+      <SpanOr>
+        <SpanTerm>killed</SpanTerm>
+        <SpanTerm>died</SpanTerm>
+        <SpanTerm>dead</SpanTerm>
+      </SpanOr>
+      <SpanOr>
+        <SpanTerm>miner</SpanTerm>
+        <SpanTerm>mining</SpanTerm>
+        <SpanTerm>miners</SpanTerm>
+      </SpanOr>
+        </SpanNear>
+        
    Required
    
 
    
 @inOrder
 Attribute of SpanNear
@@ -715,11 +715,11 @@ Attribute of SpanNear
 Child of Include, Clause, Query, SpanNear, SpanOr, Exclude, CachedFilter
 
    
 
    Looks for a SpanQuery match occuring near the beginning of a document
    Example: Find letters where the first 50 words talk about a resignation:
-
    	          
-	         <SpanFirst end="50">
-	               <SpanOrTerms fieldName="text">resigning resign leave</SpanOrTerms>
-	         </SpanFirst>
-	         
    
+
                
+           <SpanFirst end="50">
+                 <SpanOrTerms fieldName="text">resigning resign leave</SpanOrTerms>
+           </SpanFirst>
+           
    
 
@@ -761,16 +761,16 @@ Child of Include, Clause, 
+        
    
 
 
    <SpanFirst>'s children
    
 
@@ -832,8 +832,8 @@ Child of Clause, Query, 
+     </ConstantScoreQuery>  
+  
    
 
 
    <SpanNot>'s children
    
 
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj
index 19ec6252f2c..c809f2c17f1 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java
index 7483a94faa8..ed0d67c84d9 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java
@@ -1,7 +1,7 @@
 /* Generated By:JavaCC: Do not edit this line. StandardSyntaxParser.java */
 package org.apache.lucene.queryparser.flexible.standard.parser;
 
-/**
+/*
  * 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.
@@ -708,6 +708,16 @@ public class StandardSyntaxParser implements SyntaxParser, StandardSyntaxParserC
     finally { jj_save(1, xla); }
   }
 
+  private boolean jj_3R_12() {
+    if (jj_scan_token(RANGEIN_START)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_11() {
+    if (jj_scan_token(REGEXPTERM)) return true;
+    return false;
+  }
+
   private boolean jj_3_1() {
     if (jj_scan_token(TERM)) return true;
     Token xsp;
@@ -811,16 +821,6 @@ public class StandardSyntaxParser implements SyntaxParser, StandardSyntaxParserC
     return false;
   }
 
-  private boolean jj_3R_12() {
-    if (jj_scan_token(RANGEIN_START)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_11() {
-    if (jj_scan_token(REGEXPTERM)) return true;
-    return false;
-  }
-
   /** Generated Token Manager. */
   public StandardSyntaxParserTokenManager token_source;
   /** Current token. */
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj
index 77f5b22d5ca..868b257b636 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj
@@ -1,7 +1,3 @@
-/**
- * Standard file is based on the TextParser.jj from lucene 2.3
- */
-
 options {
   STATIC=false;
   JAVA_UNICODE_ESCAPE=true;
@@ -13,7 +9,7 @@ options {
 PARSER_BEGIN(StandardSyntaxParser)
 package org.apache.lucene.queryparser.flexible.standard.parser;
 
-/**
+/*
  * 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.
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java
index 21975cd3d31..3395fe17639 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. StandardSyntaxParserTokenManager.java */
 package org.apache.lucene.queryparser.flexible.standard.parser;
-/**
+/*
  * 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.
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanQuery2ModifierNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanQuery2ModifierNodeProcessor.java
index db8f3082f9c..11906d7eee2 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanQuery2ModifierNodeProcessor.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanQuery2ModifierNodeProcessor.java
@@ -1,6 +1,6 @@
 package org.apache.lucene.queryparser.flexible.standard.processors;
 
-/**
+/*
  * 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.
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj
index f1d13b7de1a..d63189d73aa 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
diff --git a/lucene/queryparser/src/java/overview.html b/lucene/queryparser/src/java/overview.html
index be6b63b6b4f..6e02af90976 100644
--- a/lucene/queryparser/src/java/overview.html
+++ b/lucene/queryparser/src/java/overview.html
@@ -63,8 +63,8 @@ It's currently divided in 2 main packages:
             that can be converted into similar syntax QueryNode trees.
  • QueryNode Processors - Optimize, validate, rewrite the 
             QueryNode trees
    • 
-		
  • Processors Pipelines - Select your favorite Processor
-		    and build a processor pipeline, to implement the features you need
    • 
+    
  • Processors Pipelines - Select your favorite Processor
+        and build a processor pipeline, to implement the features you need
  • Config Interfaces - Allow the consumer of the Query Parser to implement
             a diff Config Handler Objects to suite their needs.
  • Standard Builders - convert QueryNode's into several lucene 
diff --git a/lucene/site/changes/changes2html.pl b/lucene/site/changes/changes2html.pl
index 2e16f0b2445..5399930d657 100755
--- a/lucene/site/changes/changes2html.pl
+++ b/lucene/site/changes/changes2html.pl
@@ -579,19 +579,19 @@ for my $rel (@releases) {
                   ~gex;
         # Find multiple Bugzilla issues
         $item =~ s~(?<=(?i:bugs))(\s*)(\d+)(\s*(?i:\&|and)\s*)(\d+)
-		              ~ my $leading_whitespace = $1;
-		                my $issue_num_1 = $2;
-		                my $interlude = $3;
+                  ~ my $leading_whitespace = $1;
+                    my $issue_num_1 = $2;
+                    my $interlude = $3;
                     my $issue_num_2 = $4;
                     # Link to JIRA copies
                     my $jira_issue_1 = $lucene_bugzilla_jira_map{$issue_num_1};
                     my $issue1
-		                    = qq!!
+                        = qq!!
                         . qq!$issue_num_1 [LUCENE-$jira_issue_1]!
                       if (defined($jira_issue_1));
                     my $jira_issue_2 = $lucene_bugzilla_jira_map{$issue_num_2};
                     my $issue2
-		                    = qq!!
+                        = qq!!
                         . qq!$issue_num_2 [LUCENE-$jira_issue_2]!
                       if (defined($jira_issue_2));
                     $leading_whitespace . $issue1 . $interlude . $issue2;
@@ -654,7 +654,7 @@ sub markup_trailing_attribution {
     # Rule of thumb: if a trailing parenthesized expression with a following
     # period does not contain "LUCENE-XXX", and it either has three or
     # fewer words or it includes the word "via" or the phrase "updates from",
-	  # then it is considered to be an attribution.
+    # then it is considered to be an attribution.
 
     $item =~ s{(\s+(\((?![Ss]ee\ )
                       (?!spans\b)
@@ -675,7 +675,7 @@ sub markup_trailing_attribution {
               {
                 my $subst = $1;  # default: no change
                 my $parenthetical = $2;
-	              my $trailing_period_and_or_issue = $3;
+                my $trailing_period_and_or_issue = $3;
                 if ($parenthetical !~ /LUCENE-\d+/) {
                   my ($no_parens) = $parenthetical =~ /^\((.*)\)$/s;
                   my @words = grep {/\S/} split /\s+/, $no_parens;
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/NGramDistance.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/NGramDistance.java
index 65e3a60ce27..38cd01a04b2 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/spell/NGramDistance.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/NGramDistance.java
@@ -1,6 +1,6 @@
 package org.apache.lucene.search.spell;
 
-/**
+/*
 * 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.
diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucenePostings.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucenePostings.java
index 857e1ea8dc7..f85a1906a7e 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucenePostings.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucenePostings.java
@@ -1,6 +1,6 @@
 package org.apache.lucene.codecs.bloom;
 
-/**
+/*
  * 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.
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/HeartBeater.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/HeartBeater.java
index 229235b96b6..5fd0cb51e82 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/HeartBeater.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/HeartBeater.java
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrMapper.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrMapper.java
index 2a6d699b541..6c73f1bfe9f 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrMapper.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrMapper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java
index 2fbb1fe5b94..72936d30d4b 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrOutputFormat.java
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java
index 7d2e7bab7c8..b96b0f469ad 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java
index 3a952aec521..939a414811a 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrReducer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/Utils.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/Utils.java
index 2ce79fcd186..fa101542939 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/Utils.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/Utils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
index 6bed45cf85a..2a3a375b609 100644
--- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
+++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
diff --git a/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java b/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java
index 188b379a47b..774764d762d 100644
--- a/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java
+++ b/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
diff --git a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java
index 165fc27c3ea..b409905ea34 100644
--- a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java
+++ b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java
@@ -117,24 +117,6 @@ public final class TokenizeTextBuilder implements CommandBuilder {
 
   }
   
-  
-  // Copied from org.apache.lucene.document.Field.java from lucene-4.3.0
-  /*
-   * 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.
-   */
   private static final class ReusableStringReader extends Reader {
     private int pos = 0, size = 0;
     private String s = null;
diff --git a/solr/contrib/morphlines-core/src/test-files/test-documents/boilerplate.html b/solr/contrib/morphlines-core/src/test-files/test-documents/boilerplate.html
index 0286578693c..615f84e85ee 100644
--- a/solr/contrib/morphlines-core/src/test-files/test-documents/boilerplate.html
+++ b/solr/contrib/morphlines-core/src/test-files/test-documents/boilerplate.html
@@ -20,22 +20,22 @@
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 
-	
-	Title
+  
+  Title
 
 
 
 
    • 
 
 
    <ConstantScoreQuery>'s children
    
         
         
         
    
-	
-		
-	
+  
+    
+  
    
-			
-				
-					
-					
-				
-			
    boilerplatetext
    
-		
    
+      
+        
+          
+          
+        
+      
    boilerplatetext
    
+    
    
 
    
 
 
    This is the real meat of the page, 
diff --git a/solr/core/src/java/org/apache/solr/parser/QueryParser.jj b/solr/core/src/java/org/apache/solr/parser/QueryParser.jj
index 01f5913b617..f12c40e8879 100644
--- a/solr/core/src/java/org/apache/solr/parser/QueryParser.jj
+++ b/solr/core/src/java/org/apache/solr/parser/QueryParser.jj
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
diff --git a/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollector.java b/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollector.java
index e05eee3a22c..7a90a462f68 100644
--- a/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollector.java
+++ b/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollector.java
@@ -1,6 +1,6 @@
 package org.apache.solr.search;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollectorException.java b/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollectorException.java
index ed662ff9c8d..555ea423c11 100644
--- a/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollectorException.java
+++ b/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollectorException.java
@@ -1,6 +1,6 @@
 package org.apache.solr.search;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/java/org/apache/solr/search/stats/CollectionStats.java b/solr/core/src/java/org/apache/solr/search/stats/CollectionStats.java
index 5f956b91521..9607b3f8c61 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/CollectionStats.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/CollectionStats.java
@@ -1,6 +1,6 @@
 package org.apache.solr.search.stats;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java
index 0d0cf1a970d..411e5a59782 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java
@@ -1,6 +1,6 @@
 package org.apache.solr.search.stats;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/java/org/apache/solr/search/stats/LocalStatsSource.java b/solr/core/src/java/org/apache/solr/search/stats/LocalStatsSource.java
index be3a0d94657..ff2806cca4a 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/LocalStatsSource.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/LocalStatsSource.java
@@ -1,6 +1,6 @@
 package org.apache.solr.search.stats;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/java/org/apache/solr/search/stats/StatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/StatsCache.java
index 353f16a3f30..f1c3a56a4f5 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/StatsCache.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/StatsCache.java
@@ -1,6 +1,6 @@
 package org.apache.solr.search.stats;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/java/org/apache/solr/search/stats/StatsSource.java b/solr/core/src/java/org/apache/solr/search/stats/StatsSource.java
index 80936dbfb44..0de098abe14 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/StatsSource.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/StatsSource.java
@@ -1,6 +1,6 @@
 package org.apache.solr.search.stats;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java b/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java
index f543c0a2745..4e79842ba22 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java
@@ -1,6 +1,6 @@
 package org.apache.solr.search.stats;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/java/org/apache/solr/search/stats/TermStats.java b/solr/core/src/java/org/apache/solr/search/stats/TermStats.java
index 5675dce796f..0c8f11da3f8 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/TermStats.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/TermStats.java
@@ -1,6 +1,6 @@
 package org.apache.solr.search.stats;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/CachedIndexOutput.java b/solr/core/src/java/org/apache/solr/store/blockcache/CachedIndexOutput.java
index d1e0bdcd4f1..320d79e8063 100644
--- a/solr/core/src/java/org/apache/solr/store/blockcache/CachedIndexOutput.java
+++ b/solr/core/src/java/org/apache/solr/store/blockcache/CachedIndexOutput.java
@@ -1,6 +1,6 @@
 package org.apache.solr.store.blockcache;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java b/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java
index 00a79067d72..d47b48de5c7 100644
--- a/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java
+++ b/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java
@@ -1,6 +1,6 @@
 package org.apache.solr;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationHandlerTest.java b/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationHandlerTest.java
index ec59ce7af68..881e55a26cf 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationHandlerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2015 Renaud Delbru. All Rights Reserved.
  */
 package org.apache.solr.cloud;
diff --git a/solr/core/src/test/org/apache/solr/search/TestElisionMultitermQuery.java b/solr/core/src/test/org/apache/solr/search/TestElisionMultitermQuery.java
index 7f90b27775e..d8874c4382a 100644
--- a/solr/core/src/test/org/apache/solr/search/TestElisionMultitermQuery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestElisionMultitermQuery.java
@@ -4,7 +4,7 @@ import org.apache.solr.SolrTestCaseJ4;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestBaseStatsCache.java b/solr/core/src/test/org/apache/solr/search/stats/TestBaseStatsCache.java
index 3ecd2de954d..b15172325f4 100644
--- a/solr/core/src/test/org/apache/solr/search/stats/TestBaseStatsCache.java
+++ b/solr/core/src/test/org/apache/solr/search/stats/TestBaseStatsCache.java
@@ -1,6 +1,6 @@
 package org.apache.solr.search.stats;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestDefaultStatsCache.java b/solr/core/src/test/org/apache/solr/search/stats/TestDefaultStatsCache.java
index b93b8973c85..1f153181fb3 100644
--- a/solr/core/src/test/org/apache/solr/search/stats/TestDefaultStatsCache.java
+++ b/solr/core/src/test/org/apache/solr/search/stats/TestDefaultStatsCache.java
@@ -1,6 +1,6 @@
 package org.apache.solr.search.stats;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestExactSharedStatsCache.java b/solr/core/src/test/org/apache/solr/search/stats/TestExactSharedStatsCache.java
index b959944a9d6..4d9e46c2675 100644
--- a/solr/core/src/test/org/apache/solr/search/stats/TestExactSharedStatsCache.java
+++ b/solr/core/src/test/org/apache/solr/search/stats/TestExactSharedStatsCache.java
@@ -1,6 +1,6 @@
 package org.apache.solr.search.stats;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestExactStatsCache.java b/solr/core/src/test/org/apache/solr/search/stats/TestExactStatsCache.java
index 56f42941791..7307af20d95 100644
--- a/solr/core/src/test/org/apache/solr/search/stats/TestExactStatsCache.java
+++ b/solr/core/src/test/org/apache/solr/search/stats/TestExactStatsCache.java
@@ -1,6 +1,6 @@
 package org.apache.solr.search.stats;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestLRUStatsCache.java b/solr/core/src/test/org/apache/solr/search/stats/TestLRUStatsCache.java
index a1a0d2e5f1a..f807103b293 100644
--- a/solr/core/src/test/org/apache/solr/search/stats/TestLRUStatsCache.java
+++ b/solr/core/src/test/org/apache/solr/search/stats/TestLRUStatsCache.java
@@ -1,6 +1,6 @@
 package org.apache.solr.search.stats;
 
-/**
+/*
  * 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.
diff --git a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
index 10cad42fb28..177e77c620c 100644
--- a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
+++ b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
@@ -1,3 +1,20 @@
+/*
+ * 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.solr.update;
 
 import java.io.ByteArrayInputStream;
@@ -49,23 +66,6 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
-/**
- * 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.
- */
-
 public class AddBlockUpdateTest extends SolrTestCaseJ4 {
   
   private static final String child = "child_s";
diff --git a/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java b/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java
index 1f5984abe3e..a2ad86d43e8 100644
--- a/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java
+++ b/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java
@@ -1,6 +1,6 @@
 package org.apache.solr.util;
 
-/**
+/*
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/solr/webapp/web/index.html b/solr/webapp/web/index.html
index 4adbe529f86..2e210a4884b 100644
--- a/solr/webapp/web/index.html
+++ b/solr/webapp/web/index.html
@@ -107,16 +107,16 @@ limitations under the License.
           
    Connection to Solr lost
    
           
    Please check the Solr instance.
    
         
-	
    
-	  
    Connection recovered...
    
-	  
    Continuing to load data...
    
-	
    
+  
    
+    
    Connection recovered...
    
+    
    Continuing to load data...
    
+  
    
       
 
       
    
         
    Exception
    
-	
    {{exception}}
    
-	hide exception
+  
    {{exception}}
    
+  hide exception
       
    
 
       
    
@@ -180,7 +180,7 @@ limitations under the License.
               
  • Replication
    • 
               
  • Schema Browser
    • 
               
  • Segments info
    • 
-	    
+      
           
    
 
         
diff --git a/solr/webapp/web/partials/index.html b/solr/webapp/web/partials/index.html
index aac7589189a..61c341d36c9 100644
--- a/solr/webapp/web/partials/index.html
+++ b/solr/webapp/web/partials/index.html
@@ -106,8 +106,8 @@ limitations under the License.
       
    
 
           
    System
-	  {{load_average[0]}} {{load_average[1]}} {{load_average[2]}}
-	  
    
+    {{load_average[0]}} {{load_average[1]}} {{load_average[2]}}
+    
           reload
 
           
    
@@ -115,8 +115,8 @@ limitations under the License.
             
    
 
               
    Physical Memory
-	       {{memoryPercentage}}
-	      
    
+         {{memoryPercentage}}
+        
    
               
    
 
                 
    
@@ -136,8 +136,8 @@ limitations under the License.
             
    
 
               
    Swap Space
-	        {{swapPercentage}}
-	      
    
+          {{swapPercentage}}
+        
    
               
    
 
                 
    
@@ -157,8 +157,8 @@ limitations under the License.
           
    
 
               
    File Descriptor Count
-	        {{fileDescriptorPercentage}}
-	      
    
+          {{fileDescriptorPercentage}}
+        
    
               
    
 
                 
    
@@ -224,8 +224,8 @@ limitations under the License.
       
    
 
           
    JVM-Memory
-	     {{javaMemoryPercentage}}
-	  
    
+       {{javaMemoryPercentage}}
+    
 
           
    
 
diff --git a/solr/webapp/web/partials/segments.html b/solr/webapp/web/partials/segments.html
index 8db76f2ea47..1212edded0c 100644
--- a/solr/webapp/web/partials/segments.html
+++ b/solr/webapp/web/partials/segments.html
@@ -14,28 +14,28 @@ 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.
 -->
-
    	
-	
    
-		
-		
    
-			
-			
    Segments
    
+
      
+  
    
+    
+    
    
+      
+      
    Segments
    
             
    Auto-Refresh
    
-			reload
-			
-			
    
-	        	
    
-	      	
    
-	
-	      	
    	      		
-				
-				  
    
-				 
-				    
    
-				
-				      
    
-			
-				         
      
+      reload
+      
+      
      
+            
      
+          
      
+  
+          
                  
+        
+          
      
+         
+            
      
+        
+              
      
+      
+                 
        
                              
      • 
                                  
        
                                      
        
@@ -85,15 +85,15 @@ limitations under the License.
                                  
        
                              
        • 
                          
      
-				
-				       
      
-				    
-				    
      
-				    
-				
      
-	      	
      
-		
    
-		
-	
    	
+        
+               
    
+            
+            
    
+            
+        
    
+          
    
+    
    
+    
+  
      
 
 
    
\ No newline at end of file
diff --git a/solr/webapp/web/tpl/segments.html b/solr/webapp/web/tpl/segments.html
index f0d21dce2e5..ffc21770468 100644
--- a/solr/webapp/web/tpl/segments.html
+++ b/solr/webapp/web/tpl/segments.html
@@ -14,36 +14,36 @@ 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.
 -->
-
    	
-	
    
-		
-		
    
-			
-			
    Segments
    
-			reload
-			
-			
    
-	        	
    
-	      	
    
-	
-	      	
    	      		
-				
-				  
    
-				 
-				    
    
-				
-				      
    
-			
-				         
      
-				
-				       
      
-				    
-				    
      
-				    
-				
      
-	      	
      
-		
      
-		
-	
      	
+
        
+  
      
+    
+    
      
+      
+      
      Segments
      
+      reload
+      
+      
      
+            
      
+          
      
+
+          
                  
+        
+          
      
+         
+            
      
+        
+              
      
+      
+                 
        
+        
+               
        
+            
+            
        
+            
+        
        
+          
        
+    
        
+    
+  
          
 
 
        
\ No newline at end of file