From 2cd434e786065fe639d912230d44bf410024c85d Mon Sep 17 00:00:00 2001 From: Alexandre Rafalovitch Date: Sun, 22 Oct 2017 22:50:11 -0400 Subject: [PATCH] SOLR-11490: Undo since tags for pre-3.1 classes Reverse some of the added tags, to reduce possible solr/lucene version confusion --- .../lucene/analysis/ar/ArabicNormalizationFilterFactory.java | 1 - .../org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java | 1 - .../apache/lucene/analysis/br/BrazilianStemFilterFactory.java | 1 - .../lucene/analysis/commongrams/CommonGramsFilterFactory.java | 1 - .../analysis/commongrams/CommonGramsQueryFilterFactory.java | 1 - .../compound/DictionaryCompoundWordTokenFilterFactory.java | 1 - .../apache/lucene/analysis/core/LowerCaseFilterFactory.java | 1 - .../org/apache/lucene/analysis/core/StopFilterFactory.java | 1 - .../org/apache/lucene/analysis/de/GermanStemFilterFactory.java | 1 - .../apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java | 1 - .../org/apache/lucene/analysis/en/PorterStemFilterFactory.java | 1 - .../lucene/analysis/fa/PersianNormalizationFilterFactory.java | 1 - .../analysis/miscellaneous/ASCIIFoldingFilterFactory.java | 1 - .../analysis/miscellaneous/HyphenatedWordsFilterFactory.java | 1 - .../lucene/analysis/miscellaneous/KeepWordFilterFactory.java | 1 - .../lucene/analysis/miscellaneous/LengthFilterFactory.java | 1 - .../miscellaneous/RemoveDuplicatesTokenFilterFactory.java | 1 - .../lucene/analysis/miscellaneous/TrimFilterFactory.java | 1 - .../analysis/miscellaneous/WordDelimiterFilterFactory.java | 1 - .../apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java | 1 - .../org/apache/lucene/analysis/ngram/NGramFilterFactory.java | 1 - .../lucene/analysis/pattern/PatternReplaceFilterFactory.java | 1 - .../analysis/payloads/DelimitedPayloadTokenFilterFactory.java | 1 - .../analysis/payloads/NumericPayloadTokenFilterFactory.java | 1 - .../payloads/TokenOffsetPayloadTokenFilterFactory.java | 1 - .../analysis/payloads/TypeAsPayloadTokenFilterFactory.java | 1 - .../apache/lucene/analysis/shingle/ShingleFilterFactory.java | 1 - .../lucene/analysis/snowball/SnowballPorterFilterFactory.java | 1 - .../apache/lucene/analysis/standard/StandardFilterFactory.java | 1 - .../apache/lucene/analysis/synonym/SynonymFilterFactory.java | 1 - .../org/apache/lucene/analysis/util/ElisionFilterFactory.java | 1 - .../org/apache/lucene/analysis/util/TokenFilterFactory.java | 1 - .../lucene/analysis/phonetic/DoubleMetaphoneFilterFactory.java | 1 - .../apache/lucene/analysis/phonetic/PhoneticFilterFactory.java | 1 - .../apache/solr/analysis/ReversedWildcardFilterFactory.java | 1 - .../solr/update/processor/SignatureUpdateProcessorFactory.java | 3 --- 36 files changed, 38 deletions(-) diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java index b3632cc3d36..05686142b0c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java @@ -34,7 +34,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.ArabicNormalizationFilterFactory"/> * </analyzer> * </fieldType> - * @since 1.4.0 */ public class ArabicNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java index 69689a37db9..ec8b2ed3487 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java @@ -33,7 +33,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.ArabicStemFilterFactory"/> * </analyzer> * </fieldType> - * @since 1.4.0 */ public class ArabicStemFilterFactory extends TokenFilterFactory { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java index dfc95223031..19aa2bed846 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java @@ -33,7 +33,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.BrazilianStemFilterFactory"/> * </analyzer> * </fieldType> - * @since 1.3.0 */ public class BrazilianStemFilterFactory extends TokenFilterFactory { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java index ace70aa83a9..946003f8c73 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java @@ -35,7 +35,6 @@ import org.apache.lucene.analysis.util.*; * <filter class="solr.CommonGramsFilterFactory" words="commongramsstopwords.txt" ignoreCase="false"/> * </analyzer> * </fieldType> - * @since 1.4.0 */ public class CommonGramsFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { // TODO: shared base class for Stop/Keep/CommonGrams? diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java index cd65428f1a8..034ed56254c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java @@ -34,7 +34,6 @@ import org.apache.lucene.analysis.commongrams.CommonGramsQueryFilter; * <filter class="solr.CommonGramsQueryFilterFactory" words="commongramsquerystopwords.txt" ignoreCase="false"/> * </analyzer> * </fieldType> - * @since 1.4.0 */ public class CommonGramsQueryFilterFactory extends CommonGramsFilterFactory { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java index 322f6d73962..d31cdf8ace5 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java @@ -36,7 +36,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * minWordSize="5" minSubwordSize="2" maxSubwordSize="15" onlyLongestMatch="true"/> * </analyzer> * </fieldType> - * @since 1.3.0 */ public class DictionaryCompoundWordTokenFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { private CharArraySet dictionary; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java index 85d77b2987c..91ff877d57a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java @@ -33,7 +33,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.LowerCaseFilterFactory"/> * </analyzer> * </fieldType> - * @since 1.1.0 */ public class LowerCaseFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java index 4dd04499694..b6b8b609863 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java @@ -68,7 +68,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * for details. * * - * @since 1.1.0 */ public class StopFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { public static final String FORMAT_WORDSET = "wordset"; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java index 4876a0d3125..d7f578e9193 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java @@ -33,7 +33,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.GermanStemFilterFactory"/> * </analyzer> * </fieldType> - * @since 1.3.0 */ public class GermanStemFilterFactory extends TokenFilterFactory { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java index 6d3d05a68b8..ce1ec082d1c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java @@ -34,7 +34,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.GreekLowerCaseFilterFactory"/> * </analyzer> * </fieldType> - * @since 1.3.0 */ public class GreekLowerCaseFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java index a2a7a81a1d4..61b56626dda 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java @@ -33,7 +33,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.PorterStemFilterFactory"/> * </analyzer> * </fieldType> - * @since 1.1.0 */ public class PorterStemFilterFactory extends TokenFilterFactory { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java index ce858c43a43..e5d78de360f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java @@ -35,7 +35,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.PersianNormalizationFilterFactory"/> * </analyzer> * </fieldType> - * @since 1.4.0 */ public class PersianNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java index 2f4592f18b2..4e64abe3c22 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java @@ -35,7 +35,6 @@ import org.apache.lucene.analysis.TokenStream; * <filter class="solr.ASCIIFoldingFilterFactory" preserveOriginal="false"/> * </analyzer> * </fieldType> - * @since 1.4.0 */ public class ASCIIFoldingFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { private static final String PRESERVE_ORIGINAL = "preserveOriginal"; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java index b929f47ff00..4df514e6553 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java @@ -32,7 +32,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.HyphenatedWordsFilterFactory"/> * </analyzer> * </fieldType> - * @since 1.1.0 */ public class HyphenatedWordsFilterFactory extends TokenFilterFactory { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java index 0ddf731bbb2..8967c5b8d69 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java @@ -35,7 +35,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.KeepWordFilterFactory" words="keepwords.txt" ignoreCase="false"/> * </analyzer> * </fieldType> - * @since 1.3.0 */ public class KeepWordFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { private final boolean ignoreCase; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java index 86f28d2e4b4..4e1ec6ba932 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java @@ -31,7 +31,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.LengthFilterFactory" min="0" max="1" /> * </analyzer> * </fieldType> - * @since 1.1.0 */ public class LengthFilterFactory extends TokenFilterFactory { final int min; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilterFactory.java index b0733c57bb8..ee0a0c91594 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilterFactory.java @@ -32,7 +32,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.RemoveDuplicatesTokenFilterFactory"/> * </analyzer> * </fieldType> - * @since 1.1.0 */ public class RemoveDuplicatesTokenFilterFactory extends TokenFilterFactory { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java index ef5ecba0b0e..aa3e8bd3693 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java @@ -34,7 +34,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * </fieldType> * * @see TrimFilter - * @since 1.2.0 */ public class TrimFilterFactory extends TokenFilterFactory { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java index 4b525fe19d5..0002d65331c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java @@ -52,7 +52,6 @@ import static org.apache.lucene.analysis.miscellaneous.WordDelimiterFilter.*; * @deprecated Use {@link WordDelimiterGraphFilterFactory} instead: it produces a correct * token graph so that e.g. {@link PhraseQuery} works correctly when it's used in * the search time analyzer. - * @since 1.1.0 */ @Deprecated public class WordDelimiterFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java index a0690de7b54..020b85bb5e9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java @@ -32,7 +32,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.EdgeNGramFilterFactory" minGramSize="1" maxGramSize="1"/> * </analyzer> * </fieldType> - * @since 1.3.0 */ public class EdgeNGramFilterFactory extends TokenFilterFactory { private final int maxGramSize; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java index cd1b309bfad..2064716b78b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java @@ -32,7 +32,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.NGramFilterFactory" minGramSize="1" maxGramSize="2"/> * </analyzer> * </fieldType> - * @since 1.3.0 */ public class NGramFilterFactory extends TokenFilterFactory { private final int maxGramSize; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java index b568e5cd88e..57e5e11f97c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java @@ -36,7 +36,6 @@ import java.util.regex.Pattern; * </fieldType> * * @see PatternReplaceFilter - * @since 1.2.0 */ public class PatternReplaceFilterFactory extends TokenFilterFactory { final Pattern pattern; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java index 1977bafe2b1..cd261acbc47 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java @@ -33,7 +33,6 @@ import java.util.Map; * <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="float" delimiter="|"/> * </analyzer> * </fieldType> - * @since 1.4.0 */ public class DelimitedPayloadTokenFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { public static final String ENCODER_ATTR = "encoder"; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java index 266652b59f3..98783b07c5b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java @@ -30,7 +30,6 @@ import java.util.Map; * <filter class="solr.NumericPayloadTokenFilterFactory" payload="24" typeMatch="word"/> * </analyzer> * </fieldType> - * @since 1.3.0 */ public class NumericPayloadTokenFilterFactory extends TokenFilterFactory { private final float payload; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterFactory.java index 098f926075c..56c38da57cb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterFactory.java @@ -32,7 +32,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.TokenOffsetPayloadTokenFilterFactory"/> * </analyzer> * </fieldType> - * @since 1.3.0 */ public class TokenOffsetPayloadTokenFilterFactory extends TokenFilterFactory { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterFactory.java index 0df17618aba..a0c598962e6 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterFactory.java @@ -32,7 +32,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.TypeAsPayloadTokenFilterFactory"/> * </analyzer> * </fieldType> - * @since 1.3.0 */ public class TypeAsPayloadTokenFilterFactory extends TokenFilterFactory { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java index f77664fec86..c6b1519b96b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java @@ -32,7 +32,6 @@ import java.util.Map; * outputUnigrams="true" outputUnigramsIfNoShingles="false" tokenSeparator=" " fillerToken="_"/> * </analyzer> * </fieldType> - * @since 1.3.0 */ public class ShingleFilterFactory extends TokenFilterFactory { private final int minShingleSize; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java index 7004e8d93ac..d598a099176 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java @@ -41,7 +41,6 @@ import org.tartarus.snowball.SnowballProgram; * <filter class="solr.SnowballPorterFilterFactory" protected="protectedkeyword.txt" language="English"/> * </analyzer> * </fieldType> - * @since 1.1.0 */ public class SnowballPorterFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { public static final String PROTECTED_TOKENS = "protected"; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilterFactory.java index b4bc6e33ff2..ac9e6eaaf4a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilterFactory.java @@ -32,7 +32,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.StandardFilterFactory"/> * </analyzer> * </fieldType> - * @since 1.1.0 */ public class StandardFilterFactory extends TokenFilterFactory { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java index 1ec2d19ea8d..87ddc08219b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java @@ -76,7 +76,6 @@ import org.apache.lucene.analysis.util.TokenizerFactory; * * @deprecated Use {@link SynonymGraphFilterFactory} instead, but be sure to also * use {@link FlattenGraphFilterFactory} at index time (not at search time) as well. - * @since 1.1.0 */ @Deprecated public class SynonymFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilterFactory.java index e77fd5d86a8..fff3edcbc9f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilterFactory.java @@ -35,7 +35,6 @@ import org.apache.lucene.analysis.fr.FrenchAnalyzer; * articles="stopwordarticles.txt" ignoreCase="true"/> * </analyzer> * </fieldType> - * @since 1.3.0 */ public class ElisionFilterFactory extends TokenFilterFactory implements ResourceLoaderAware, MultiTermAwareComponent { private final String articlesFile; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java index 51c03d95562..7eec6ddd7bc 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java @@ -25,7 +25,6 @@ import org.apache.lucene.analysis.TokenStream; /** * Abstract parent class for analysis factories that create {@link org.apache.lucene.analysis.TokenFilter} * instances. - * @since 1.1.0 */ public abstract class TokenFilterFactory extends AbstractAnalysisFactory { diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterFactory.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterFactory.java index 02c46e1adb8..fdaecb2a1ad 100644 --- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterFactory.java +++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterFactory.java @@ -32,7 +32,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * <filter class="solr.DoubleMetaphoneFilterFactory" inject="true" maxCodeLength="4"/> * </analyzer> * </fieldType> - * @since 1.4.0 */ public class DoubleMetaphoneFilterFactory extends TokenFilterFactory { diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java index b0f8d8bc354..fc69a61f123 100644 --- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java +++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java @@ -62,7 +62,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * </fieldType> * * @see PhoneticFilter - * @since 1.2.0 */ public class PhoneticFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { /** parameter name: either a short name or a full class name */ diff --git a/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java index 52bb0789294..e64957f26f4 100644 --- a/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java @@ -60,7 +60,6 @@ import org.apache.lucene.analysis.util.TokenFilterFactory; * </analyzer> * </fieldType> * - * @since 1.4.0 */ public class ReversedWildcardFilterFactory extends TokenFilterFactory { diff --git a/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java index cb6f21e334a..40ef3983c7d 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java @@ -36,9 +36,6 @@ import org.apache.solr.core.SolrCore; import org.apache.solr.schema.SchemaField; import org.apache.solr.util.plugin.SolrCoreAware; -/** - * @since 1.4.0 - */ public class SignatureUpdateProcessorFactory extends UpdateRequestProcessorFactory implements SolrCoreAware {