diff --git a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
index 65a18b7215c..136d8405645 100644
--- a/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
+++ b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
@@ -40,7 +40,6 @@ import org.apache.lucene.util.Version;
* become h?user
when using this parser and thus no match would be found (i.e.
* using this parser will be no improvement over QueryParser in such cases).
*
- * @version $Revision$, $Date$
*/
public class AnalyzingQueryParser extends org.apache.lucene.queryParser.QueryParser {
diff --git a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java b/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java
index a8817fe715b..8613f8e4642 100644
--- a/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java
+++ b/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/analyzing/TestAnalyzingQueryParser.java
@@ -29,7 +29,6 @@ import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.util.LuceneTestCase;
/**
- * @version $Revision$, $Date$
*/
public class TestAnalyzingQueryParser extends LuceneTestCase {
diff --git a/lucene/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java b/lucene/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
index b2f865e7016..4e0dd68818c 100644
--- a/lucene/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
+++ b/lucene/src/java/org/apache/lucene/queryParser/MultiFieldQueryParser.java
@@ -32,7 +32,6 @@ import org.apache.lucene.util.Version;
/**
* A QueryParser which constructs queries to search multiple fields.
*
- * @version $Revision$
*/
public class MultiFieldQueryParser extends QueryParser
{
diff --git a/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java b/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
index fc9598078d8..e427094efe0 100644
--- a/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
+++ b/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
@@ -40,7 +40,6 @@ import org.apache.lucene.util.Bits;
* prefix using IndexReader.terms(Term), and use MultiPhraseQuery.add(Term[]
* terms) to add them to the query.
*
- * @version 1.0
*/
public class MultiPhraseQuery extends Query {
private String field;
diff --git a/lucene/src/test/org/apache/lucene/search/TestDateFilter.java b/lucene/src/test/org/apache/lucene/search/TestDateFilter.java
index f92b60b7f4d..966f0da44df 100644
--- a/lucene/src/test/org/apache/lucene/search/TestDateFilter.java
+++ b/lucene/src/test/org/apache/lucene/search/TestDateFilter.java
@@ -32,7 +32,6 @@ import java.io.IOException;
* DateFilter JUnit tests.
*
*
- * @version $Revision$
*/
public class TestDateFilter extends LuceneTestCase {
diff --git a/lucene/src/test/org/apache/lucene/search/TestDocBoost.java b/lucene/src/test/org/apache/lucene/search/TestDocBoost.java
index 11d1505b240..885b30de7b6 100644
--- a/lucene/src/test/org/apache/lucene/search/TestDocBoost.java
+++ b/lucene/src/test/org/apache/lucene/search/TestDocBoost.java
@@ -31,7 +31,6 @@ import org.apache.lucene.util.LuceneTestCase;
/** Document boost unit test.
*
*
- * @version $Revision$
*/
public class TestDocBoost extends LuceneTestCase {
diff --git a/lucene/src/test/org/apache/lucene/search/TestNot.java b/lucene/src/test/org/apache/lucene/search/TestNot.java
index 2e9e445294e..7aa971a4ed6 100644
--- a/lucene/src/test/org/apache/lucene/search/TestNot.java
+++ b/lucene/src/test/org/apache/lucene/search/TestNot.java
@@ -30,7 +30,6 @@ import org.apache.lucene.document.Field;
/** Similarity unit test.
*
*
- * @version $Revision$
*/
public class TestNot extends LuceneTestCase {
diff --git a/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java b/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
index eecf803c9f4..3da48522336 100644
--- a/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
+++ b/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
@@ -54,7 +54,6 @@ import org.apache.lucene.util.BytesRef;
* Term position unit test.
*
*
- * @version $Revision$
*/
public class TestPositionIncrement extends LuceneTestCase {
diff --git a/lucene/src/test/org/apache/lucene/search/TestSetNorm.java b/lucene/src/test/org/apache/lucene/search/TestSetNorm.java
index 92bf2cc6873..906aeb039b9 100644
--- a/lucene/src/test/org/apache/lucene/search/TestSetNorm.java
+++ b/lucene/src/test/org/apache/lucene/search/TestSetNorm.java
@@ -31,7 +31,6 @@ import org.apache.lucene.store.Directory;
/** Document boost unit test.
*
*
- * @version $Revision$
*/
public class TestSetNorm extends LuceneTestCase {
diff --git a/lucene/src/test/org/apache/lucene/search/TestSimilarity.java b/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
index 9324969ce6c..3afeb25566f 100644
--- a/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
+++ b/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
@@ -35,7 +35,6 @@ import org.apache.lucene.search.Explanation.IDFExplanation;
/** Similarity unit test.
*
*
- * @version $Revision$
*/
public class TestSimilarity extends LuceneTestCase {
diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseFilter.java
index 60503da29c9..aa9743bbee5 100644
--- a/modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseFilter.java
+++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseFilter.java
@@ -41,7 +41,6 @@ import org.apache.lucene.util.Version;
*
Intelligent Chinese word extraction
*
*
- * @version 1.0
* @deprecated (3.1) Use {@link StopFilter} instead, which has the same functionality.
* This filter will be removed in Lucene 5.0
*/
diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseTokenizer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseTokenizer.java
index 13890039d6d..ddbbf18e4d9 100644
--- a/modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseTokenizer.java
+++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseTokenizer.java
@@ -52,7 +52,6 @@ import org.apache.lucene.util.AttributeSource;
* C4C2, C1C2C3 ... the ChineseTokenizer works, but the
* CJKTokenizer will not work.
*
- * @version 1.0
* @deprecated (3.1) Use {@link StandardTokenizer} instead, which has the same functionality.
* This filter will be removed in Lucene 5.0
*/
diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
index 8383816380f..587e2f3d6fa 100644
--- a/modules/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
+++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java
@@ -32,7 +32,6 @@ import org.apache.lucene.util.Version;
/**
* {@link Analyzer} for Thai language. It uses {@link java.text.BreakIterator} to break words.
- * @version 0.2
*
* NOTE : This class uses the same {@link Version}
* dependent settings as {@link StandardAnalyzer}.
diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java
index 2cfb6bfb112..07fc7ad47f9 100644
--- a/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java
+++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java
@@ -26,7 +26,6 @@ import org.apache.lucene.util.Version;
/**
* Test case for FrenchAnalyzer.
*
- * @version $version$
*/
public class TestFrenchAnalyzer extends BaseTokenStreamTestCase {
diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java
index 256cbacd1ca..4daa39cf171 100644
--- a/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java
+++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java
@@ -26,7 +26,6 @@ import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.*;
/**
- * @version $Id:$
*/
public class TestTrimFilter extends BaseTokenStreamTestCase {
diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java
index 12e0982d61e..dd0e10c403a 100644
--- a/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java
+++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java
@@ -25,7 +25,6 @@ import java.io.StringReader;
import java.util.regex.Pattern;
/**
- * @version $Id:$
*/
public class TestPatternReplaceFilter extends BaseTokenStreamTestCase {
diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilter.java
index 7af49add83b..82c2e1ce6ae 100644
--- a/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilter.java
+++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilter.java
@@ -33,7 +33,6 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer;
import org.apache.lucene.analysis.tokenattributes.*;
/**
- * @version $Id$
*/
public class TestSynonymFilter extends BaseTokenStreamTestCase {
diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
index 6247bbf97be..81f2e278204 100644
--- a/modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
+++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
@@ -27,7 +27,6 @@ import org.apache.lucene.util.Version;
/**
* Test case for ThaiAnalyzer, modified from TestFrenchAnalyzer
*
- * @version 0.1
*/
public class TestThaiAnalyzer extends BaseTokenStreamTestCase {
diff --git a/modules/suggest/src/java/org/apache/lucene/search/spell/Dictionary.java b/modules/suggest/src/java/org/apache/lucene/search/spell/Dictionary.java
index b54b3122c7b..4dee7146309 100755
--- a/modules/suggest/src/java/org/apache/lucene/search/spell/Dictionary.java
+++ b/modules/suggest/src/java/org/apache/lucene/search/spell/Dictionary.java
@@ -23,7 +23,6 @@ import java.util.Iterator;
* here is just a list of words.
*
*
- * @version 1.0
*/
public interface Dictionary {
diff --git a/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java b/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
index bfeae31581e..a57e552b2bf 100755
--- a/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
+++ b/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
@@ -64,7 +64,6 @@ import org.apache.lucene.util.Version;
*
*
*
- * @version 1.0
*/
public class SpellChecker implements java.io.Closeable {
diff --git a/solr/contrib/dataimporthandler/src/extras/main/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java b/solr/contrib/dataimporthandler/src/extras/main/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
index 0231d1ec7e3..1db93273e87 100644
--- a/solr/contrib/dataimporthandler/src/extras/main/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/extras/main/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
@@ -42,7 +42,6 @@ import java.util.*;
* http://wiki.apache.org/solr/DataImportHandler for more
* details. This API is experimental and subject to change
*
- * @version $Id$
* @since solr 1.4
*/
public class MailEntityProcessor extends EntityProcessorBase {
diff --git a/solr/contrib/dataimporthandler/src/extras/main/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java b/solr/contrib/dataimporthandler/src/extras/main/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java
index 9913c15cf18..b76c03885c2 100644
--- a/solr/contrib/dataimporthandler/src/extras/main/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/extras/main/java/org/apache/solr/handler/dataimport/TikaEntityProcessor.java
@@ -52,7 +52,6 @@ import static org.apache.solr.handler.dataimport.XPathEntityProcessor.URL;
* An implementation of {@link EntityProcessor} which reads data from rich docs
* using Apache Tika
*
- * @version $Id$
* @since solr 3.1
*/
public class TikaEntityProcessor extends EntityProcessorBase {
diff --git a/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java b/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
index 2ac19b32192..d12496a871a 100644
--- a/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
@@ -40,7 +40,6 @@ import java.util.Map;
*
* TODO: Find a way to make the tests actually test code
*
- * @version $Id$
* @see org.apache.solr.handler.dataimport.MailEntityProcessor
* @since solr 1.4
*/
diff --git a/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java b/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
index 019fa85a0a5..934430db5f0 100644
--- a/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
@@ -20,7 +20,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
/**Testcase for TikaEntityProcessor
- * @version $Id$
* @since solr 1.5
*/
public class TestTikaEntityProcessor extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/BinContentStreamDataSource.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/BinContentStreamDataSource.java
index 1187f65e92d..cb6ffe9cdd3 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/BinContentStreamDataSource.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/BinContentStreamDataSource.java
@@ -29,7 +29,6 @@ import java.util.Properties;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.5
*/
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/BinFileDataSource.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/BinFileDataSource.java
index e473ab8da32..986404ca8cf 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/BinFileDataSource.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/BinFileDataSource.java
@@ -37,7 +37,6 @@ import java.util.Properties;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.5
*/
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/BinURLDataSource.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/BinURLDataSource.java
index 045d6fa3bd0..fb8a47e7fd0 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/BinURLDataSource.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/BinURLDataSource.java
@@ -32,7 +32,6 @@ import java.util.Properties;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.5
*/
public class BinURLDataSource extends DataSource{
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/CachedSqlEntityProcessor.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/CachedSqlEntityProcessor.java
index 864e772288e..a2ef3b97dd7 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/CachedSqlEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/CachedSqlEntityProcessor.java
@@ -32,7 +32,6 @@ import java.util.Map;
*
* This API is experimental and subject to change
*
- * @version $Id$
* @since solr 1.3
*/
public class CachedSqlEntityProcessor extends SqlEntityProcessor {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ClobTransformer.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ClobTransformer.java
index ae970d25fdb..45aff148a11 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ClobTransformer.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ClobTransformer.java
@@ -33,7 +33,6 @@ import java.util.Map;
*
* This API is experimental and subject to change
*
- * @version $Id$
* @since solr 1.4
*/
public class ClobTransformer extends Transformer {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContentStreamDataSource.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContentStreamDataSource.java
index 58ed19ed595..a2de2876ee5 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContentStreamDataSource.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContentStreamDataSource.java
@@ -31,7 +31,6 @@ import java.util.Properties;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.4
*/
public class ContentStreamDataSource extends DataSource {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Context.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Context.java
index 290b202b2d5..d629d8f6e4d 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Context.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Context.java
@@ -35,7 +35,6 @@ import java.util.Map;
*
* This API is experimental and subject to change
*
- * @version $Id$
* @since solr 1.3
*/
public abstract class Context {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContextImpl.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContextImpl.java
index bd726835e2d..87b1ae2be45 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContextImpl.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContextImpl.java
@@ -30,7 +30,6 @@ import java.util.concurrent.ConcurrentHashMap;
*
* This API is experimental and subject to change
*
- * @version $Id$
* @since solr 1.3
*/
public class ContextImpl extends Context {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java
index f0a9e412427..ab958860acb 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java
@@ -40,7 +40,6 @@ import java.util.*;
*
* This API is experimental and subject to change
*
- * @version $Id$
* @since solr 1.3
*/
public class DataConfig {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java
index 83e546d0c32..5da8b133a06 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java
@@ -63,7 +63,6 @@ import org.xml.sax.InputSource;
*
* This API is experimental and subject to change
*
- * @version $Id$
* @since solr 1.3
*/
public class DataImportHandler extends RequestHandlerBase implements
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
index b0fb60d6889..7c7bc3beb0d 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
@@ -51,7 +51,6 @@ import java.util.concurrent.ConcurrentHashMap;
*
* This API is experimental and subject to change
*
- * @version $Id$
* @since solr 1.3
*/
public class DataImporter {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataSource.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataSource.java
index 0226f504928..e76e4ee0091 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataSource.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataSource.java
@@ -36,7 +36,6 @@ import java.util.Properties;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.3
*/
public abstract class DataSource {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
index 95c601e8911..f093f973f1b 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
@@ -37,7 +37,6 @@ import org.slf4j.LoggerFactory;
*
* This API is experimental and subject to change
*
- * @version $Id$
* @since solr 1.3
*/
public class DateFormatTransformer extends Transformer {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DebugLogger.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DebugLogger.java
index 8ee0126dc25..4b2ebafafba 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DebugLogger.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DebugLogger.java
@@ -39,7 +39,6 @@ import java.util.Stack;
*
* This API is experimental and subject to change
*
- * @version $Id$
* @since solr 1.3
*/
class DebugLogger {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
index 974fe214480..a1091493e58 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
@@ -37,7 +37,6 @@ import java.util.concurrent.*;
*
* This API is experimental and subject to change
*
- * @version $Id$
* @since solr 1.3
*/
public class DocBuilder {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessor.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessor.java
index be3fe49d33b..f285be31273 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessor.java
@@ -36,7 +36,6 @@ import java.util.Map;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.3
*/
public abstract class EntityProcessor {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java
index 10d8c147d6c..9aaa5374841 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java
@@ -29,7 +29,6 @@ import java.util.*;
*
* This API is experimental and subject to change
*
- * @version $Id$
* @since solr 1.3
*/
public class EntityProcessorBase extends EntityProcessor {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
index 92fc9d48b62..c85dec109a8 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorWrapper.java
@@ -32,7 +32,6 @@ import java.util.Map;
/**
* A Wrapper over {@link EntityProcessor} instance which performs transforms and handles multi-row outputs correctly.
*
- * @version $Id$
* @since solr 1.4
*/
public class EntityProcessorWrapper extends EntityProcessor {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Evaluator.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Evaluator.java
index 46ed2a33158..3393ad4ace2 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Evaluator.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Evaluator.java
@@ -30,7 +30,6 @@ package org.apache.solr.handler.dataimport;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.3
*/
public abstract class Evaluator {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EvaluatorBag.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EvaluatorBag.java
index 24e728d82c0..076734e2d95 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EvaluatorBag.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EvaluatorBag.java
@@ -41,7 +41,6 @@ import java.util.regex.Pattern;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.3
*/
public class EvaluatorBag {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EventListener.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EventListener.java
index 5ac603cff9d..b3cbee20ae8 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EventListener.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EventListener.java
@@ -21,7 +21,6 @@ package org.apache.solr.handler.dataimport;
*
* This API is experimental and subject to change
*
- * @version $Id$
* @since solr 1.4
*/
public interface EventListener {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java
index b9d9ec74ab9..0fa0ddbbf94 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldReaderDataSource.java
@@ -42,7 +42,6 @@ import java.util.Properties;
*
* Supports String, BLOB, CLOB data types and there is an extra field (in the entity) 'encoding' for BLOB types
*
- * @version $Id$
* @since 1.4
*/
public class FieldReaderDataSource extends DataSource {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java
index 132367cc0fa..252e8f08cc6 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FieldStreamDataSource.java
@@ -43,7 +43,6 @@ import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVE
* This may be used with any {@link EntityProcessor} which uses a {@link DataSource}<{@link InputStream}> eg: {@link TikaEntityProcessor}
*
*
- * @version $Id$
* @since 3.1
*/
public class FieldStreamDataSource extends DataSource {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileDataSource.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileDataSource.java
index 2f5a5aa1e2e..ca37c7368bc 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileDataSource.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileDataSource.java
@@ -41,7 +41,6 @@ import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVE
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.3
*/
public class FileDataSource extends DataSource {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileListEntityProcessor.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileListEntityProcessor.java
index 7549af7dfbd..520943f4e04 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileListEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/FileListEntityProcessor.java
@@ -50,7 +50,6 @@ import java.util.regex.Pattern;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.3
* @see Pattern
*/
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HTMLStripTransformer.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HTMLStripTransformer.java
index b8bc4207db9..526976c4cc2 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HTMLStripTransformer.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HTMLStripTransformer.java
@@ -30,7 +30,6 @@ import java.util.Map;
* A {@link Transformer} implementation which strip off HTML tags using {@link HTMLStripCharFilter} This is useful
* in case you don't need this HTML anyway.
*
- * @version $Id$
* @see HTMLStripCharFilter
* @since solr 1.4
*/
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HttpDataSource.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HttpDataSource.java
index 82646534119..a65831056db 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HttpDataSource.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HttpDataSource.java
@@ -30,7 +30,6 @@ package org.apache.solr.handler.dataimport;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.3
* @deprecated use {@link org.apache.solr.handler.dataimport.URLDataSource} instead
*/
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
index f48ca2cda86..df4b33f06a7 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
@@ -33,7 +33,6 @@ import java.util.concurrent.Callable;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.3
*/
public class JdbcDataSource extends
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LineEntityProcessor.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LineEntityProcessor.java
index 30e366316f7..e526e83c800 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LineEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LineEntityProcessor.java
@@ -52,7 +52,6 @@ import org.apache.commons.io.IOUtils;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.4
* @see Pattern
*/
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LogTransformer.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LogTransformer.java
index 5a603a74049..704a03cba4d 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LogTransformer.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/LogTransformer.java
@@ -29,7 +29,6 @@ import java.util.Map;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.4
*/
public class LogTransformer extends Transformer {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/MockDataSource.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/MockDataSource.java
index 6fd7213b5a7..32048eaa1f1 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/MockDataSource.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/MockDataSource.java
@@ -28,7 +28,6 @@ import java.util.Properties;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.3
*/
public class MockDataSource extends
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java
index 36efecf5320..754e39b198d 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java
@@ -42,7 +42,6 @@ import java.util.regex.Pattern;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.3
*/
public class NumberFormatTransformer extends Transformer {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java
index 2d32eee0122..b88c85fc1fa 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java
@@ -33,7 +33,6 @@ import java.util.Map;
* An implementation of {@link EntityProcessor} which reads data from a url/file and give out a row which contains one String
* value. The name of the field is 'plainText'.
*
- * @version $Id$
* @since solr 1.4
*/
public class PlainTextEntityProcessor extends EntityProcessorBase {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java
index 429bb0cf2f3..d680c9d0ffb 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java
@@ -36,7 +36,6 @@ import java.util.regex.Pattern;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.3
* @see Pattern
*/
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java
index 547fc66cf2a..a4ea3afad3a 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java
@@ -37,7 +37,6 @@ import java.util.Map;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.3
*/
public class ScriptTransformer extends Transformer {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java
index c342427a994..f548316b4f4 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java
@@ -34,7 +34,6 @@ import java.util.Properties;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
* @since solr 1.3
*/
public class SolrWriter {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java
index 1748998720b..5f77063b3cb 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java
@@ -38,7 +38,7 @@ import java.util.regex.Pattern;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class SqlEntityProcessor extends EntityProcessorBase {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateString.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateString.java
index d39bbec4fe5..7724de89219 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateString.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateString.java
@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TemplateString {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
index 6fd0665c700..97a4b11d153 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TemplateTransformer extends Transformer {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Transformer.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Transformer.java
index 995302884af..758b243adf9 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Transformer.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/Transformer.java
@@ -35,7 +35,7 @@ import java.util.Map;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public abstract class Transformer {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/URLDataSource.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/URLDataSource.java
index 234fb56f264..626040b4083 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/URLDataSource.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/URLDataSource.java
@@ -35,7 +35,7 @@ import java.util.regex.Pattern;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class URLDataSource extends DataSource {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolver.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolver.java
index 2ce695550c1..8a91f0f0470 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolver.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolver.java
@@ -30,7 +30,7 @@ package org.apache.solr.handler.dataimport;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public abstract class VariableResolver {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java
index 8d39dd13bde..10ed0ac14a4 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java
@@ -28,7 +28,7 @@ import java.util.regex.Pattern;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
+ *
* @see VariableResolver
* @since solr 1.3
*/
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
index 86be8d7fc74..b6500b808d7 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
@@ -49,7 +49,7 @@ import java.util.concurrent.atomic.AtomicReference;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
+ *
* @see XPathRecordReader
* @since solr 1.3
*/
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathRecordReader.java b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
index a3c4b168f95..000727840f9 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
+++ b/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
*
* This API is experimental and may change in the future.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class XPathRecordReader {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
index 5df5f3d2df4..f4ebad9e8d3 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
@@ -46,7 +46,7 @@ import java.util.Map;
*
* This API is experimental and subject to change
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public abstract class AbstractDataImportHandlerTestCase extends
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java
index 0037d6796ca..89c79a64a5a 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java
@@ -28,7 +28,7 @@ import java.util.Map;
* Test for CachedSqlEntityProcessor
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestCachedSqlEntityProcessor extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestClobTransformer.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestClobTransformer.java
index 055a707b1d3..b1eb3947147 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestClobTransformer.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestClobTransformer.java
@@ -28,7 +28,7 @@ import java.util.*;
/**
* Test for ClobTransformer
*
- * @version $Id$
+ *
* @see org.apache.solr.handler.dataimport.ClobTransformer
* @since solr 1.4
*/
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
index 692272d4e04..0ea8b1db84c 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
@@ -35,7 +35,7 @@ import java.util.List;
/**
* Test for ContentStreamDataSource
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class TestContentStreamDataSource extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDataConfig.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDataConfig.java
index 39b01ddedce..3efcc1e17db 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDataConfig.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDataConfig.java
@@ -31,7 +31,7 @@ import java.util.List;
* Test for DataConfig
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestDataConfig extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDateFormatTransformer.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDateFormatTransformer.java
index bd37053f47f..606d5735630 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDateFormatTransformer.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDateFormatTransformer.java
@@ -26,7 +26,7 @@ import java.util.*;
* Test for DateFormatTransformer
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestDateFormatTransformer extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java
index a16b7017ab4..27ba8b39362 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java
@@ -28,7 +28,7 @@ import java.util.*;
* Test for DocBuilder
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java
index 4632318fa17..daa32cab7bf 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java
@@ -32,7 +32,7 @@ import java.io.File;
* Test for DocBuilder using the test harness
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java
index 42b29610666..a3cff08840f 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java
@@ -28,7 +28,7 @@ import java.util.Map;
* Test for EntityProcessorBase
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestEntityProcessorBase extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java
index 64f58df4ff4..d46635cd194 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java
@@ -29,7 +29,7 @@ import org.junit.BeforeClass;
/**
* Tests exception handling during imports in DataImportHandler
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class TestErrorHandling extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java
index 41ac1dc5d15..502182f069a 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java
@@ -27,7 +27,7 @@ import java.util.*;
/**
* Test for EvaluatorBag
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestEvaluatorBag extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFieldReader.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFieldReader.java
index 46f2ab5a4c9..4bf1e97d4c1 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFieldReader.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFieldReader.java
@@ -25,7 +25,7 @@ import java.util.Map;
/**
* Test for FieldReaderDataSource
*
- * @version $Id$
+ *
* @see org.apache.solr.handler.dataimport.FieldReaderDataSource
* @since 1.4
*/
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
index e28ccbde537..cb2bc8ad157 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
@@ -28,7 +28,7 @@ import java.util.*;
* Test for FileListEntityProcessor
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestFileListEntityProcessor extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
index ac6626462ee..ba0642f8a48 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
@@ -39,7 +39,7 @@ import org.junit.Test;
* Note: The tests are ignored for the lack of DB support for testing
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestJdbcDataSource extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java
index 91f8d034cda..5548924641f 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java
@@ -27,7 +27,7 @@ import java.util.*;
/**
* Test for TestLineEntityProcessor
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestNumberFormatTransformer.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestNumberFormatTransformer.java
index 67ba544d682..b799717c13d 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestNumberFormatTransformer.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestNumberFormatTransformer.java
@@ -29,7 +29,7 @@ import java.util.Map;
* Test for NumberFormatTransformer
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestNumberFormatTransformer extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java
index e0a5b8bf39c..a67c1fe38cf 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java
@@ -24,7 +24,7 @@ import java.util.Properties;
/**
* Test for PlainTextEntityProcessor
*
- * @version $Id$
+ *
* @see org.apache.solr.handler.dataimport.PlainTextEntityProcessor
* @since solr 1.4
*/
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestRegexTransformer.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestRegexTransformer.java
index ca3143b511d..50835d73be0 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestRegexTransformer.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestRegexTransformer.java
@@ -31,7 +31,7 @@ import java.util.Map;
/**
* Test for RegexTransformer
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestRegexTransformer extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestScriptTransformer.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestScriptTransformer.java
index 7c1076512a3..25477ef0cb1 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestScriptTransformer.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestScriptTransformer.java
@@ -37,7 +37,7 @@ import java.util.Map;
* All tests in this have been ignored because script support is only available
* in Java 1.6+
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestScriptTransformer extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java
index 0fbfb846eae..b9e5588220b 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java
@@ -25,7 +25,7 @@ import java.util.*;
* Test for SqlEntityProcessor
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestSqlEntityProcessor extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java
index 6c0627e3e07..4429887d8df 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java
@@ -32,7 +32,7 @@ import java.text.ParseException;
* test harness
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestSqlEntityProcessor2 extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
index ade265f50f7..60f1ae5ecd0 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
@@ -30,7 +30,7 @@ import java.util.List;
*
*
*
- * @version $Id: TestSqlEntityProcessor2.java 723824 2008-12-05 19:14:11Z shalin $
+ *
* @since solr 1.3
*/
public class TestSqlEntityProcessorDelta extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta2.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta2.java
index bab66071d5c..c3ce3824b9f 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta2.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta2.java
@@ -30,7 +30,7 @@ import java.util.List;
*
*
*
- * @version $Id: TestSqlEntityProcessor2.java 723824 2008-12-05 19:14:11Z shalin $
+ *
* @since solr 1.3
*/
public class TestSqlEntityProcessorDelta2 extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDeltaPrefixedPk.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDeltaPrefixedPk.java
index 51fc50b9f1a..2cc40a4f840 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDeltaPrefixedPk.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDeltaPrefixedPk.java
@@ -31,7 +31,7 @@ import java.util.logging.*;
*
*
*
- * @version $Id$
+ *
* @since solr 3.1
*/
public class TestSqlEntityProcessorDeltaPrefixedPk extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateString.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateString.java
index 5eea4d72ecd..5334ec18d8f 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateString.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateString.java
@@ -28,7 +28,7 @@ import java.util.regex.Pattern;
* Test for TemplateString
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestTemplateString extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
index e279ab3bdec..846aa9bc04f 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
@@ -28,7 +28,7 @@ import java.util.Arrays;
* Test for TemplateTransformer
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestTemplateTransformer extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java
index 55c4b91ee34..15eff57c3a3 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java
@@ -27,7 +27,7 @@ import java.util.*;
* Test for VariableResolver
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestVariableResolver extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
index 596fa33b9d9..f6738692ab9 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;
* Test for XPathEntityProcessor
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestXPathEntityProcessor extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathRecordReader.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathRecordReader.java
index dad5510610c..619e45b5650 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathRecordReader.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathRecordReader.java
@@ -26,7 +26,7 @@ import java.util.Map;
/**
* Test for XPathRecordReader
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestXPathRecordReader extends AbstractDataImportHandlerTestCase {
diff --git a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java
index 054857ab563..8cbab1bc668 100644
--- a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java
+++ b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java
@@ -22,7 +22,7 @@ import java.util.Map;
/**
* Configuration holding all the configurable parameters for calling UIMA inside Solr
*
- * @version $Id$
+ *
*/
public class SolrUIMAConfiguration {
diff --git a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java
index 1792fd7cd29..98e6c88d3a5 100644
--- a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java
+++ b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java
@@ -27,7 +27,7 @@ import org.apache.solr.uima.processor.SolrUIMAConfiguration.MapField;
/**
* Read configuration for Solr-UIMA integration
*
- * @version $Id$
+ *
*
*/
public class SolrUIMAConfigurationReader {
diff --git a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
index 6d8cdc50c0d..dfc531a34e1 100644
--- a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
+++ b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
/**
* Map UIMA types and features over fields of a Solr document
*
- * @version $Id$
+ *
*/
public class UIMAToSolrMapper {
diff --git a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
index 33154feb933..69d8d934690 100644
--- a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
+++ b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
@@ -38,7 +38,7 @@ import org.apache.uima.resource.ResourceInitializationException;
/**
* Update document(s) to be indexed with UIMA extracted information
*
- * @version $Id$
+ *
*/
public class UIMAUpdateRequestProcessor extends UpdateRequestProcessor {
diff --git a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java
index 9cb46018ffa..8fab664c58c 100644
--- a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java
+++ b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java
@@ -26,7 +26,7 @@ import org.apache.solr.update.processor.UpdateRequestProcessorFactory;
/**
* Factory for {@link UIMAUpdateRequestProcessor}
*
- * @version $Id$
+ *
*/
public class UIMAUpdateRequestProcessorFactory extends UpdateRequestProcessorFactory {
diff --git a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/AEProvider.java b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/AEProvider.java
index 89c981ab6e3..2f6ac479eed 100644
--- a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/AEProvider.java
+++ b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/AEProvider.java
@@ -23,7 +23,7 @@ import org.apache.uima.resource.ResourceInitializationException;
/**
* provide an Apache UIMA {@link AnalysisEngine}
*
- * @version $Id$
+ *
*/
public interface AEProvider {
diff --git a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/AEProviderFactory.java b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/AEProviderFactory.java
index bc5ad81367e..2bd2417936e 100644
--- a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/AEProviderFactory.java
+++ b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/AEProviderFactory.java
@@ -23,7 +23,7 @@ import java.util.Map;
/**
* Singleton factory class responsible of {@link AEProvider}s' creation
*
- * @version $Id$
+ *
*/
public class AEProviderFactory {
diff --git a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/OverridingParamsAEProvider.java b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/OverridingParamsAEProvider.java
index 586c0cd9aab..f3af7c4435e 100644
--- a/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/OverridingParamsAEProvider.java
+++ b/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/ae/OverridingParamsAEProvider.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
* injecting runtime parameters defined in the solrconfig.xml Solr configuration file and assigning
* them as overriding parameters in the aggregate AE
*
- * @version $Id$
+ *
*/
public class OverridingParamsAEProvider implements AEProvider {
diff --git a/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java b/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
index 2c8a21bdab9..b921d15808b 100644
--- a/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
+++ b/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
@@ -43,7 +43,7 @@ import org.junit.Test;
/**
* TestCase for {@link UIMAUpdateRequestProcessor}
*
- * @version $Id$
+ *
*/
public class UIMAUpdateRequestProcessorTest extends SolrTestCaseJ4 {
diff --git a/solr/src/common/org/apache/solr/common/SolrDocument.java b/solr/src/common/org/apache/solr/common/SolrDocument.java
index 1864e09ea2a..54624d1fb03 100644
--- a/solr/src/common/org/apache/solr/common/SolrDocument.java
+++ b/solr/src/common/org/apache/solr/common/SolrDocument.java
@@ -37,7 +37,7 @@ import org.apache.solr.common.util.NamedList;
* For indexing documents, use the SolrInputDocument that contains extra information
* for document and field boosting.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class SolrDocument implements Map, Iterable>, Serializable
diff --git a/solr/src/common/org/apache/solr/common/SolrDocumentList.java b/solr/src/common/org/apache/solr/common/SolrDocumentList.java
index a7f3d4b15b7..b7a4629d01e 100644
--- a/solr/src/common/org/apache/solr/common/SolrDocumentList.java
+++ b/solr/src/common/org/apache/solr/common/SolrDocumentList.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
* Represent a list of SolrDocuments returned from a search. This includes
* position and offset information.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class SolrDocumentList extends ArrayList
diff --git a/solr/src/common/org/apache/solr/common/SolrException.java b/solr/src/common/org/apache/solr/common/SolrException.java
index 8df79c4ab28..135e5f384ee 100644
--- a/solr/src/common/org/apache/solr/common/SolrException.java
+++ b/solr/src/common/org/apache/solr/common/SolrException.java
@@ -26,7 +26,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * @version $Id$
+ *
*/
public class SolrException extends RuntimeException {
diff --git a/solr/src/common/org/apache/solr/common/SolrInputDocument.java b/solr/src/common/org/apache/solr/common/SolrInputDocument.java
index 089f0e9b0b9..9002de2b877 100644
--- a/solr/src/common/org/apache/solr/common/SolrInputDocument.java
+++ b/solr/src/common/org/apache/solr/common/SolrInputDocument.java
@@ -29,7 +29,7 @@ import java.util.Set;
* a Lucene Document. Like the SolrDocument, the field values should
* match those specified in schema.xml
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class SolrInputDocument implements Map, Iterable, Serializable
diff --git a/solr/src/common/org/apache/solr/common/SolrInputField.java b/solr/src/common/org/apache/solr/common/SolrInputField.java
index 5e9102ccdac..02c87f9203d 100644
--- a/solr/src/common/org/apache/solr/common/SolrInputField.java
+++ b/solr/src/common/org/apache/solr/common/SolrInputField.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.Iterator;
/**
- * @version $Id$
+ *
* @since solr 1.3
*/
public class SolrInputField implements Iterable, Serializable
diff --git a/solr/src/common/org/apache/solr/common/luke/FieldFlag.java b/solr/src/common/org/apache/solr/common/luke/FieldFlag.java
index 6755e13e07d..f3d1eea02bc 100644
--- a/solr/src/common/org/apache/solr/common/luke/FieldFlag.java
+++ b/solr/src/common/org/apache/solr/common/luke/FieldFlag.java
@@ -18,7 +18,7 @@ package org.apache.solr.common.luke;
/**
- * @version $Id: AdminHandlers.java 608150 2008-01-02 17:15:30Z ryan $
+ *
* @since solr 1.3
*/
public enum FieldFlag {
diff --git a/solr/src/common/org/apache/solr/common/params/AnalysisParams.java b/solr/src/common/org/apache/solr/common/params/AnalysisParams.java
index 6e066f2c5d5..c3372b8c26a 100644
--- a/solr/src/common/org/apache/solr/common/params/AnalysisParams.java
+++ b/solr/src/common/org/apache/solr/common/params/AnalysisParams.java
@@ -20,7 +20,7 @@ package org.apache.solr.common.params;
/**
* Defines the request parameters used by all analysis request handlers.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public interface AnalysisParams {
diff --git a/solr/src/common/org/apache/solr/common/params/DefaultSolrParams.java b/solr/src/common/org/apache/solr/common/params/DefaultSolrParams.java
index b71d9cacba0..edfad64bbe3 100644
--- a/solr/src/common/org/apache/solr/common/params/DefaultSolrParams.java
+++ b/solr/src/common/org/apache/solr/common/params/DefaultSolrParams.java
@@ -22,7 +22,7 @@ import java.util.Iterator;
import org.apache.solr.common.util.IteratorChain;
/**
- * @version $Id$
+ *
*/
public class DefaultSolrParams extends SolrParams {
protected final SolrParams params;
diff --git a/solr/src/common/org/apache/solr/common/params/HighlightParams.java b/solr/src/common/org/apache/solr/common/params/HighlightParams.java
index d874a2ec7f7..b8af3ad631d 100644
--- a/solr/src/common/org/apache/solr/common/params/HighlightParams.java
+++ b/solr/src/common/org/apache/solr/common/params/HighlightParams.java
@@ -18,7 +18,7 @@
package org.apache.solr.common.params;
/**
- * @version $Id$
+ *
* @since solr 1.3
*/
public interface HighlightParams {
diff --git a/solr/src/common/org/apache/solr/common/params/MapSolrParams.java b/solr/src/common/org/apache/solr/common/params/MapSolrParams.java
index 95c71d2d95d..a2481589676 100644
--- a/solr/src/common/org/apache/solr/common/params/MapSolrParams.java
+++ b/solr/src/common/org/apache/solr/common/params/MapSolrParams.java
@@ -24,7 +24,7 @@ import java.util.Map;
import java.io.IOException;
/**
- * @version $Id$
+ *
*/
public class MapSolrParams extends SolrParams {
protected final Map map;
diff --git a/solr/src/common/org/apache/solr/common/params/MultiMapSolrParams.java b/solr/src/common/org/apache/solr/common/params/MultiMapSolrParams.java
index 781c1dabfe6..68202d5cbc0 100644
--- a/solr/src/common/org/apache/solr/common/params/MultiMapSolrParams.java
+++ b/solr/src/common/org/apache/solr/common/params/MultiMapSolrParams.java
@@ -24,7 +24,7 @@ import java.util.Map;
import java.io.IOException;
/**
- * @version $Id$
+ *
*/
public class MultiMapSolrParams extends SolrParams {
protected final Map map;
diff --git a/solr/src/common/org/apache/solr/common/params/RequiredSolrParams.java b/solr/src/common/org/apache/solr/common/params/RequiredSolrParams.java
index 7abf75b4799..16817c2f0f3 100755
--- a/solr/src/common/org/apache/solr/common/params/RequiredSolrParams.java
+++ b/solr/src/common/org/apache/solr/common/params/RequiredSolrParams.java
@@ -31,7 +31,7 @@ import java.util.Iterator;
* (If you pass in null
as the default value, you can
* get a null return value)
*
- * @version $Id$
+ *
* @since solr 1.2
*/
public class RequiredSolrParams extends SolrParams {
diff --git a/solr/src/common/org/apache/solr/common/params/SolrParams.java b/solr/src/common/org/apache/solr/common/params/SolrParams.java
index b0315259f75..ae7b291cf09 100644
--- a/solr/src/common/org/apache/solr/common/params/SolrParams.java
+++ b/solr/src/common/org/apache/solr/common/params/SolrParams.java
@@ -29,7 +29,7 @@ import org.apache.solr.common.util.StrUtils;
/** SolrParams hold request parameters.
*
- * @version $Id$
+ *
*/
public abstract class SolrParams implements Serializable {
diff --git a/solr/src/common/org/apache/solr/common/params/UpdateParams.java b/solr/src/common/org/apache/solr/common/params/UpdateParams.java
index 915ed7582cd..ab9d42ce4e9 100644
--- a/solr/src/common/org/apache/solr/common/params/UpdateParams.java
+++ b/solr/src/common/org/apache/solr/common/params/UpdateParams.java
@@ -20,7 +20,7 @@ package org.apache.solr.common.params;
/**
* A collection of standard params used by Update handlers
*
- * @version $Id$
+ *
* @since solr 1.2
*/
public interface UpdateParams
diff --git a/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java b/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java
index e3de94f7396..eb9e882fa08 100644
--- a/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java
+++ b/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java
@@ -40,7 +40,7 @@ import java.lang.ref.WeakReference;
* cleanup does not remove enough items to reach the 'acceptableWaterMark' limit, it can
* remove more items forcefully regardless of access order.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class ConcurrentLRUCache {
diff --git a/solr/src/common/org/apache/solr/common/util/ContentStream.java b/solr/src/common/org/apache/solr/common/util/ContentStream.java
index 72494199259..de8d48bcf50 100755
--- a/solr/src/common/org/apache/solr/common/util/ContentStream.java
+++ b/solr/src/common/org/apache/solr/common/util/ContentStream.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
import java.io.Reader;
/**
- * @version $Id$
+ *
* @since solr 1.2
*/
public interface ContentStream {
diff --git a/solr/src/common/org/apache/solr/common/util/ContentStreamBase.java b/solr/src/common/org/apache/solr/common/util/ContentStreamBase.java
index 5ba7f440600..9d4861d3627 100755
--- a/solr/src/common/org/apache/solr/common/util/ContentStreamBase.java
+++ b/solr/src/common/org/apache/solr/common/util/ContentStreamBase.java
@@ -34,7 +34,7 @@ import java.util.Locale;
/**
* Three concrete implementations for ContentStream - one for File/URL/String
*
- * @version $Id$
+ *
* @since solr 1.2
*/
public abstract class ContentStreamBase implements ContentStream
diff --git a/solr/src/common/org/apache/solr/common/util/DOMUtil.java b/solr/src/common/org/apache/solr/common/util/DOMUtil.java
index d02be759bbd..2d937aa447f 100644
--- a/solr/src/common/org/apache/solr/common/util/DOMUtil.java
+++ b/solr/src/common/org/apache/solr/common/util/DOMUtil.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
- * @version $Id$
+ *
*/
public class DOMUtil {
diff --git a/solr/src/common/org/apache/solr/common/util/FileUtils.java b/solr/src/common/org/apache/solr/common/util/FileUtils.java
index 3c9e6fcbe18..94ef65e3a49 100644
--- a/solr/src/common/org/apache/solr/common/util/FileUtils.java
+++ b/solr/src/common/org/apache/solr/common/util/FileUtils.java
@@ -21,7 +21,7 @@ import java.io.*;
import java.nio.channels.FileChannel;
/**
- * @version $Id$
+ *
*/
public class FileUtils {
diff --git a/solr/src/common/org/apache/solr/common/util/NamedList.java b/solr/src/common/org/apache/solr/common/util/NamedList.java
index 10b1996e608..45fa7ac5fbf 100644
--- a/solr/src/common/org/apache/solr/common/util/NamedList.java
+++ b/solr/src/common/org/apache/solr/common/util/NamedList.java
@@ -47,7 +47,7 @@ import java.io.Serializable;
* or simply use a regular {@link Map}
*
*
- * @version $Id$
+ *
*/
public class NamedList implements Cloneable, Serializable, Iterable> {
protected final List nvPairs;
diff --git a/solr/src/common/org/apache/solr/common/util/RTimer.java b/solr/src/common/org/apache/solr/common/util/RTimer.java
index cd10d23ee1c..db561d9d90c 100644
--- a/solr/src/common/org/apache/solr/common/util/RTimer.java
+++ b/solr/src/common/org/apache/solr/common/util/RTimer.java
@@ -27,7 +27,7 @@ import java.util.*;
* started automatically when created.
*
* @since solr 1.3
- * @version $Id$
+ *
*/
public class RTimer {
diff --git a/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java b/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java
index af3af18c5d0..6bba26e5f31 100644
--- a/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java
+++ b/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java
@@ -23,7 +23,7 @@ import java.util.regex.*;
/**
* Accepts any file whose name matches the pattern
- * @version $Id$
+ *
*/
public final class RegexFileFilter implements FileFilter {
diff --git a/solr/src/common/org/apache/solr/common/util/StrUtils.java b/solr/src/common/org/apache/solr/common/util/StrUtils.java
index fc2187aa44a..931ef5fd29a 100644
--- a/solr/src/common/org/apache/solr/common/util/StrUtils.java
+++ b/solr/src/common/org/apache/solr/common/util/StrUtils.java
@@ -26,7 +26,7 @@ import java.io.IOException;
import org.apache.solr.common.SolrException;
/**
- * @version $Id$
+ *
*/
public class StrUtils {
public static final char[] HEX_DIGITS = { '0', '1', '2', '3', '4', '5', '6',
diff --git a/solr/src/common/org/apache/solr/common/util/XML.java b/solr/src/common/org/apache/solr/common/util/XML.java
index 2183311be0f..b8df2a638bc 100644
--- a/solr/src/common/org/apache/solr/common/util/XML.java
+++ b/solr/src/common/org/apache/solr/common/util/XML.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.util.Map;
/**
- * @version $Id$
+ *
*/
public class XML {
diff --git a/solr/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java b/solr/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java
index 5926713b02d..7f336cb3e54 100644
--- a/solr/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.TokenStream;
* <filter class="solr.ASCIIFoldingFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class ASCIIFoldingFilterFactory extends BaseTokenFilterFactory {
public ASCIIFoldingFilter create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java b/solr/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java
index f777959aa21..d7319428ca3 100644
--- a/solr/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java
@@ -29,7 +29,7 @@ import org.apache.lucene.analysis.ar.ArabicNormalizationFilter;
* <filter class="solr.ArabicNormalizationFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class ArabicNormalizationFilterFactory extends BaseTokenFilterFactory{
diff --git a/solr/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java
index 0cbb097f31c..0766f74a7f9 100644
--- a/solr/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.ar.ArabicStemFilter;
* <filter class="solr.ArabicStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class ArabicStemFilterFactory extends BaseTokenFilterFactory{
diff --git a/solr/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java b/solr/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java
index 62ff65dd0ef..a7cef830349 100644
--- a/solr/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java
@@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory;
/**
*
-* @version $Id$
* @since Solr 1.4
*
*/
diff --git a/solr/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java b/solr/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java
index 90ad366c33b..0714d4623a6 100644
--- a/solr/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java
@@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory;
/**
* Simple abstract implementation that handles init arg processing.
*
- * @version $Id$
+ *
*/
public abstract class BaseTokenFilterFactory extends BaseTokenStreamFactory implements TokenFilterFactory {
public static final Logger log = LoggerFactory.getLogger(BaseTokenFilterFactory.class);
diff --git a/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java b/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java
index 632b5dddbc4..bc5adddd0ee 100644
--- a/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
* a factory as it implements no interface, but removes code duplication
* in its subclasses.
*
- * @version $Id$
+ *
*/
abstract class BaseTokenStreamFactory {
/** The init args */
diff --git a/solr/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java
index 5e4666377a2..8f0b81e5eab 100644
--- a/solr/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java
@@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory;
/**
* Simple abstract implementation that handles init arg processing.
*
- * @version $Id$
+ *
*/
public abstract class BaseTokenizerFactory extends BaseTokenStreamFactory implements TokenizerFactory {
public static final Logger log = LoggerFactory.getLogger(BaseTokenizerFactory.class);
diff --git a/solr/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java
index a6af3dbf9ec..e2e8e97207d 100644
--- a/solr/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java
@@ -31,7 +31,7 @@ import org.apache.lucene.analysis.br.BrazilianStemFilter;
* <filter class="solr.BrazilianStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class BrazilianStemFilterFactory extends BaseTokenFilterFactory {
public BrazilianStemFilter create(TokenStream in) {
diff --git a/solr/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java
index 13d323089fe..0386351762a 100644
--- a/solr/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.bg.BulgarianStemFilter;
* <filter class="solr.BulgarianStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class BulgarianStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java
index c3ba41b6be7..d48bc922828 100644
--- a/solr/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java
@@ -30,7 +30,7 @@ import java.io.Reader;
* <tokenizer class="solr.CJKTokenizerFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class CJKTokenizerFactory extends BaseTokenizerFactory {
public CJKTokenizer create(Reader in) {
diff --git a/solr/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java b/solr/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java
index 81747847333..080b1348961 100644
--- a/solr/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java
@@ -53,7 +53,7 @@ import java.util.StringTokenizer;
* </analyzer>
* </fieldType>
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class CapitalizationFilterFactory extends BaseTokenFilterFactory {
diff --git a/solr/src/java/org/apache/solr/analysis/CharFilterFactory.java b/solr/src/java/org/apache/solr/analysis/CharFilterFactory.java
index 9f6158e6ced..29e99aacfec 100644
--- a/solr/src/java/org/apache/solr/analysis/CharFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/CharFilterFactory.java
@@ -23,7 +23,6 @@ import org.apache.lucene.analysis.CharStream;
/**
*
-* @version $Id$
* @since Solr 1.4
*
*/
diff --git a/solr/src/java/org/apache/solr/analysis/ClassicFilterFactory.java b/solr/src/java/org/apache/solr/analysis/ClassicFilterFactory.java
index 1d8f02c1d11..eba8e056543 100644
--- a/solr/src/java/org/apache/solr/analysis/ClassicFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/ClassicFilterFactory.java
@@ -31,7 +31,7 @@ import org.apache.lucene.analysis.standard.ClassicFilter;
* </analyzer>
* </fieldType>
*
- * @version $Id$
+ *
*/
public class ClassicFilterFactory extends BaseTokenFilterFactory {
public TokenFilter create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java
index edaf6e2f996..3b8a54b61ad 100644
--- a/solr/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java
@@ -32,7 +32,7 @@ import java.util.Map;
* </analyzer>
* </fieldType>
*
- * @version $Id$
+ *
*/
public class ClassicTokenizerFactory extends BaseTokenizerFactory {
diff --git a/solr/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java b/solr/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java
index dede00a5e4b..5eef2dd4c01 100644
--- a/solr/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java
@@ -35,7 +35,7 @@ import org.apache.solr.util.plugin.ResourceLoaderAware;
* <filter class="solr.CommonGramsFilterFactory" words="commongramsstopwords.txt" ignoreCase="false"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
/*
diff --git a/solr/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java b/solr/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java
index 8a27adc2df9..e1bb85c350d 100644
--- a/solr/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java
@@ -40,7 +40,7 @@ import org.apache.solr.util.plugin.ResourceLoaderAware;
* <filter class="solr.CommonGramsQueryFilterFactory" words="commongramsquerystopwords.txt" ignoreCase="false"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class CommonGramsQueryFilterFactory extends BaseTokenFilterFactory
implements ResourceLoaderAware {
diff --git a/solr/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java b/solr/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java
index de1ab11ab15..c970e94fa74 100644
--- a/solr/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java
@@ -39,7 +39,7 @@ import java.util.Map;
* <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="float" delimiter="|"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*
*/
public class DelimitedPayloadTokenFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
diff --git a/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java b/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java
index e3010ead884..5e79216c4ba 100644
--- a/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java
@@ -38,7 +38,7 @@ import java.io.IOException;
* minWordSize="5" minSubwordSize="2" maxSubwordSize="15" onlyLongestMatch="true"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class DictionaryCompoundWordTokenFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
private CharArraySet dictionary;
diff --git a/solr/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java b/solr/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java
index 2089f4835c1..5d8753136e3 100644
--- a/solr/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.phonetic.DoubleMetaphoneFilter;
* <filter class="solr.DoubleMetaphoneFilterFactory" inject="true" maxCodeLength="4"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class DoubleMetaphoneFilterFactory extends BaseTokenFilterFactory
{
diff --git a/solr/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java b/solr/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java
index c7f07796176..623f66a255a 100644
--- a/solr/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter;
* <filter class="solr.EdgeNGramFilterFactory" side="front" minGramSize="1" maxGramSize="1"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class EdgeNGramFilterFactory extends BaseTokenFilterFactory {
private int maxGramSize = 0;
diff --git a/solr/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java
index 9945d5f12a4..f2464437bc9 100755
--- a/solr/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java
@@ -30,7 +30,7 @@ import java.util.Map;
* <tokenizer class="solr.EdgeNGramTokenizerFactory" side="front" minGramSize="1" maxGramSize="1"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class EdgeNGramTokenizerFactory extends BaseTokenizerFactory {
private int maxGramSize = 0;
diff --git a/solr/src/java/org/apache/solr/analysis/ElisionFilterFactory.java b/solr/src/java/org/apache/solr/analysis/ElisionFilterFactory.java
index 027766843bb..e1a536cd616 100644
--- a/solr/src/java/org/apache/solr/analysis/ElisionFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/ElisionFilterFactory.java
@@ -37,7 +37,7 @@ import org.apache.lucene.analysis.TokenStream;
* <filter class="solr.ElisionFilterFactory" articles="stopwordarticles.txt"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class ElisionFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
diff --git a/solr/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java
index 5d2292e9c4a..98cdedeb742 100644
--- a/solr/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.en.EnglishMinimalStemFilter;
* <filter class="solr.EnglishMinimalStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class EnglishMinimalStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java b/solr/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java
index 30b9ea5afae..110dd6e2952 100644
--- a/solr/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.en.EnglishPossessiveFilter;
* <filter class="solr.EnglishPossessiveFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class EnglishPossessiveFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java
index 6d4bf82133c..308fe129051 100644
--- a/solr/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.fi.FinnishLightStemFilter;
* <filter class="solr.FinnishLightStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class FinnishLightStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java
index e0325465e86..ef74a66eee5 100644
--- a/solr/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java
@@ -31,7 +31,7 @@ import org.apache.lucene.analysis.fr.FrenchLightStemFilter;
* <filter class="solr.FrenchLightStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class FrenchLightStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java
index 753984f122e..98bce9a6809 100644
--- a/solr/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java
@@ -31,7 +31,7 @@ import org.apache.lucene.analysis.fr.FrenchMinimalStemFilter;
* <filter class="solr.FrenchMinimalStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class FrenchMinimalStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java
index bb32d502dbe..e6cf77106d5 100644
--- a/solr/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.gl.GalicianStemFilter;
* <filter class="solr.GalicianStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class GalicianStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java
index 601d12e668c..111fff46046 100644
--- a/solr/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.de.GermanLightStemFilter;
* <filter class="solr.GermanLightStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class GermanLightStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java
index ac145878778..2ccba340e96 100644
--- a/solr/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.de.GermanMinimalStemFilter;
* <filter class="solr.GermanMinimalStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class GermanMinimalStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java
index c2f3d03dfb8..5e9088c5428 100644
--- a/solr/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java
@@ -32,7 +32,7 @@ import org.apache.lucene.analysis.TokenStream;
* <filter class="solr.GermanStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class GermanStemFilterFactory extends BaseTokenFilterFactory {
public GermanStemFilter create(TokenStream in) {
diff --git a/solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java b/solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java
index ecd02e2f703..2742260ef3e 100644
--- a/solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java
@@ -35,7 +35,7 @@ import org.apache.solr.common.SolrException.ErrorCode;
* <filter class="solr.GreekLowerCaseFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class GreekLowerCaseFilterFactory extends BaseTokenFilterFactory
{
diff --git a/solr/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java
index 0a12b04f8a1..90720dace21 100644
--- a/solr/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.el.GreekStemFilter;
* <filter class="solr.GreekStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class GreekStemFilterFactory extends BaseTokenFilterFactory {
diff --git a/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java b/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java
index 096a07b896c..c318a78aaa7 100644
--- a/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.charfilter.HTMLStripCharFilter;
* <tokenizer class="solr.WhitespaceTokenizerFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class HindiNormalizationFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java
index 7dd3544015c..657f04d936e 100644
--- a/solr/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java
@@ -29,7 +29,7 @@ import org.apache.lucene.analysis.hi.HindiStemFilter;
* <filter class="solr.HindiStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class HindiStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java
index 0b06fa99ed3..c635f42f37d 100644
--- a/solr/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.hu.HungarianLightStemFilter;
* <filter class="solr.HungarianLightStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class HungarianLightStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java b/solr/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java
index 7e68d4e727f..17a4ad58c39 100755
--- a/solr/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.solr.analysis.BaseTokenFilterFactory;
* <filter class="solr.HyphenatedWordsFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class HyphenatedWordsFilterFactory extends BaseTokenFilterFactory {
public HyphenatedWordsFilter create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java b/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java
index 7fca6f2349b..274ac3bb595 100644
--- a/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java
@@ -56,7 +56,7 @@ import org.xml.sax.InputSource;
* dictionary="dictionary.txt" minWordSize="5" minSubwordSize="2" maxSubwordSize="15" onlyLongestMatch="false"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
* @see HyphenationCompoundWordTokenFilter
*/
public class HyphenationCompoundWordTokenFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
diff --git a/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java b/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java
index 588946cc15a..ac0d1db0b71 100644
--- a/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java
@@ -29,7 +29,7 @@ import org.apache.lucene.analysis.in.IndicNormalizationFilter;
* <filter class="solr.IndicNormalizationFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class IndicNormalizationFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java
index bf3497a01a3..c2e2bc93f0f 100644
--- a/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java
@@ -32,7 +32,7 @@ import org.apache.lucene.analysis.id.IndonesianStemFilter;
* <filter class="solr.IndonesianStemFilterFactory" stemDerivational="true"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class IndonesianStemFilterFactory extends BaseTokenFilterFactory {
private boolean stemDerivational = true;
diff --git a/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java
index 1ca00e3090a..c0d9ede0163 100644
--- a/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.it.ItalianLightStemFilter;
* <filter class="solr.ItalianLightStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class ItalianLightStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java b/solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java
index ca38a761fb5..e394dcf2380 100644
--- a/solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java
@@ -36,7 +36,7 @@ import java.io.IOException;
* <filter class="solr.KeepWordFilterFactory" words="keepwords.txt" ignoreCase="false" enablePositionIncrements="false"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class KeepWordFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
diff --git a/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java b/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java
index 0c47b6314ba..bd96d6cad16 100644
--- a/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java
@@ -34,7 +34,7 @@ import org.apache.solr.util.plugin.ResourceLoaderAware;
* <filter class="solr.KeywordMarkerFilterFactory" protected="protectedkeyword.txt" ignoreCase="false"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class KeywordMarkerFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public static final String PROTECTED_TOKENS = "protected";
diff --git a/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java
index 7a6d324a717..8f70f9eb530 100644
--- a/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java
@@ -29,7 +29,7 @@ import java.io.Reader;
* <tokenizer class="solr.KeywordTokenizerFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class KeywordTokenizerFactory extends BaseTokenizerFactory {
public KeywordTokenizer create(Reader input) {
diff --git a/solr/src/java/org/apache/solr/analysis/LengthFilterFactory.java b/solr/src/java/org/apache/solr/analysis/LengthFilterFactory.java
index 97d7703a72f..dc28d672bc5 100644
--- a/solr/src/java/org/apache/solr/analysis/LengthFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/LengthFilterFactory.java
@@ -31,7 +31,7 @@ import java.util.Map;
* <filter class="solr.LengthFilterFactory" min="0" max="1" enablePositionIncrements="false"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class LengthFilterFactory extends BaseTokenFilterFactory {
int min,max;
diff --git a/solr/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java
index 0c04c0519f9..e067d53c6e6 100644
--- a/solr/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java
@@ -30,7 +30,7 @@ import java.util.Map;
* <tokenizer class="solr.LetterTokenizerFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class LetterTokenizerFactory extends BaseTokenizerFactory {
diff --git a/solr/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java b/solr/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java
index 12da7f321d0..b4c0bce72ce 100644
--- a/solr/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java
@@ -31,7 +31,7 @@ import org.apache.lucene.analysis.miscellaneous.LimitTokenCountFilter;
* <filter class="solr.LimitTokenCountFilterFactory" maxTokenCount="10"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class LimitTokenCountFilterFactory extends BaseTokenFilterFactory {
diff --git a/solr/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java b/solr/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java
index b094eccc2f1..422ba68ad9d 100644
--- a/solr/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java
@@ -31,7 +31,7 @@ import org.apache.lucene.analysis.core.LowerCaseFilter;
* <filter class="solr.LowerCaseFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class LowerCaseFilterFactory extends BaseTokenFilterFactory {
@Override
diff --git a/solr/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java
index 5bd59db62a4..e2980e75b70 100644
--- a/solr/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java
@@ -30,7 +30,7 @@ import java.util.Map;
* <tokenizer class="solr.LowerCaseTokenizerFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class LowerCaseTokenizerFactory extends BaseTokenizerFactory {
@Override
diff --git a/solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java b/solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java
index a401c31aa91..aaba0430f49 100644
--- a/solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java
@@ -41,7 +41,7 @@ import org.apache.solr.util.plugin.ResourceLoaderAware;
* </analyzer>
* </fieldType>
*
- * @version $Id$
+ *
* @since Solr 1.4
*
*/
diff --git a/solr/src/java/org/apache/solr/analysis/NGramFilterFactory.java b/solr/src/java/org/apache/solr/analysis/NGramFilterFactory.java
index 20849c9551a..6dc5eaebad0 100644
--- a/solr/src/java/org/apache/solr/analysis/NGramFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/NGramFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.ngram.NGramTokenFilter;
* <filter class="solr.NGramFilterFactory" minGramSize="1" maxGramSize="2"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class NGramFilterFactory extends BaseTokenFilterFactory {
private int maxGramSize = 0;
diff --git a/solr/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java
index a9525b2d1a3..1b775230a92 100755
--- a/solr/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java
@@ -31,7 +31,7 @@ import java.util.Map;
* <tokenizer class="solr.NGramTokenizerFactory" minGramSize="1" maxGramSize="2"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class NGramTokenizerFactory extends BaseTokenizerFactory {
private int maxGramSize = 0;
diff --git a/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java b/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java
index 2406da54231..21922e18c84 100644
--- a/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java
@@ -32,7 +32,7 @@ import java.util.Map;
* <filter class="solr.NumericPayloadTokenFilterFactory" payload="24" typeMatch="word"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class NumericPayloadTokenFilterFactory extends BaseTokenFilterFactory {
private float payload;
diff --git a/solr/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java
index 35ad58d4f9f..2a4b5249bd4 100644
--- a/solr/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java
@@ -32,7 +32,7 @@ import org.apache.lucene.analysis.path.ReversePathHierarchyTokenizer;
* <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="\" replace="/"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class PathHierarchyTokenizerFactory extends BaseTokenizerFactory {
diff --git a/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java b/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java
index aff0b9892cc..81c77a66830 100644
--- a/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java
@@ -35,7 +35,7 @@ import org.apache.lucene.analysis.pattern.PatternReplaceCharFilter;
* </analyzer>
* </fieldType>
*
- * @version $Id$
+ *
* @since Solr 3.1
*/
public class PatternReplaceCharFilterFactory extends BaseCharFilterFactory {
diff --git a/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java b/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java
index 039408e208c..55d08f78719 100644
--- a/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java
@@ -33,7 +33,7 @@ import java.util.regex.PatternSyntaxException;
* replace="all"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
* @see PatternReplaceFilter
*/
public class PatternReplaceFilterFactory extends BaseTokenFilterFactory {
diff --git a/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java
index 2e748f5fe04..8996bb4b705 100644
--- a/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java
@@ -62,7 +62,7 @@ import org.apache.solr.common.SolrException;
*
* @see PatternTokenizer
* @since solr1.2
- * @version $Id$
+ *
*/
public class PatternTokenizerFactory extends BaseTokenizerFactory
{
diff --git a/solr/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java b/solr/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java
index 8afd32c3ebd..f860c1de58e 100644
--- a/solr/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java
@@ -29,7 +29,7 @@ import org.apache.lucene.analysis.fa.PersianCharFilter;
* <tokenizer class="solr.StandardTokenizerFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class PersianCharFilterFactory extends BaseCharFilterFactory {
diff --git a/solr/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java b/solr/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java
index d6e9733ab75..970d9036bb0 100644
--- a/solr/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java
@@ -32,7 +32,7 @@ import org.apache.lucene.analysis.TokenStream;
* <filter class="solr.PersianNormalizationFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class PersianNormalizationFilterFactory extends BaseTokenFilterFactory {
public PersianNormalizationFilter create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java b/solr/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java
index 6653ee44b05..624fbbf71b4 100644
--- a/solr/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java
@@ -52,7 +52,7 @@ import org.apache.solr.common.SolrException;
* </analyzer>
* </fieldType>
*
- * @version $Id$
+ *
* @see PhoneticFilter
*/
public class PhoneticFilterFactory extends BaseTokenFilterFactory
diff --git a/solr/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java
index 17e9d6cbd55..64f0afb23dc 100644
--- a/solr/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.en.PorterStemFilter;
* <filter class="solr.PorterStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class PorterStemFilterFactory extends BaseTokenFilterFactory {
public PorterStemFilter create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java
index 1e91e8804c4..3da115aaaca 100644
--- a/solr/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.pt.PortugueseLightStemFilter;
* <filter class="solr.PortugueseLightStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class PortugueseLightStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java
index 32d67fafb9d..21aad294d56 100644
--- a/solr/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.pt.PortugueseMinimalStemFilter;
* <filter class="solr.PortugueseMinimalStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class PortugueseMinimalStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java
index 2c264a10bed..df0477ba332 100644
--- a/solr/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.pt.PortugueseStemFilter;
* <filter class="solr.PortugueseStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class PortugueseStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java b/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java
index 7f6a01fe02e..f30480927b5 100644
--- a/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java
@@ -34,7 +34,7 @@ import java.util.Map;
* </analyzer>
* </fieldType>
*
- * @version $Id$
+ *
* @see org.apache.lucene.analysis.position.PositionFilter
* @since solr 1.4
*/
diff --git a/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java b/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java
index 4b14f33b6fd..e26ae5fe802 100644
--- a/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java
@@ -29,7 +29,7 @@ import org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilter;
* <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class RemoveDuplicatesTokenFilterFactory extends BaseTokenFilterFactory {
public RemoveDuplicatesTokenFilter create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java b/solr/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java
index 103a694b506..65d8f54adc3 100644
--- a/solr/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.reverse.ReverseStringFilter;
* </analyzer>
* </fieldType>
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class ReverseStringFilterFactory extends BaseTokenFilterFactory {
diff --git a/solr/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java b/solr/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java
index b4c1b7bb538..22cba337d0b 100644
--- a/solr/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java
@@ -59,7 +59,7 @@ import org.apache.lucene.analysis.reverse.ReverseStringFilter;
* <tokenizer class="solr.WhitespaceTokenizerFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class ReversedWildcardFilterFactory extends BaseTokenFilterFactory {
diff --git a/solr/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java
index e3307597a26..6a11a3c2172 100644
--- a/solr/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.ru.RussianLightStemFilter;
* <filter class="solr.RussianLightStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class RussianLightStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java b/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java
index 913a4882338..de82dfde5f4 100644
--- a/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java
@@ -36,7 +36,7 @@ import java.util.Map;
* outputUnigrams="true" outputUnigramsIfNoShingles="false" tokenSeparator=" "/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class ShingleFilterFactory extends BaseTokenFilterFactory {
private int minShingleSize;
diff --git a/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java b/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java
index 2c1f8fb4d1f..d9dd65b0b6e 100644
--- a/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java
@@ -41,7 +41,7 @@ import org.tartarus.snowball.SnowballProgram;
* </analyzer>
* </fieldType>
*
- * @version $Id$
+ *
*/
public class SnowballPorterFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public static final String PROTECTED_TOKENS = "protected";
diff --git a/solr/src/java/org/apache/solr/analysis/SolrAnalyzer.java b/solr/src/java/org/apache/solr/analysis/SolrAnalyzer.java
index b0b03cc2b3d..aad0807b260 100644
--- a/solr/src/java/org/apache/solr/analysis/SolrAnalyzer.java
+++ b/solr/src/java/org/apache/solr/analysis/SolrAnalyzer.java
@@ -23,7 +23,7 @@ import java.io.Reader;
import java.io.IOException;
/**
- * @version $Id$
+ *
*/
public abstract class SolrAnalyzer extends Analyzer {
int posIncGap=0;
diff --git a/solr/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java
index 107679f7622..9e706cdaa66 100644
--- a/solr/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.es.SpanishLightStemFilter;
* <filter class="solr.SpanishLightStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class SpanishLightStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/StandardFilterFactory.java b/solr/src/java/org/apache/solr/analysis/StandardFilterFactory.java
index 91daca19f20..9c521083d0d 100644
--- a/solr/src/java/org/apache/solr/analysis/StandardFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/StandardFilterFactory.java
@@ -31,7 +31,7 @@ import org.apache.lucene.analysis.standard.StandardFilter;
* <filter class="solr.StandardFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class StandardFilterFactory extends BaseTokenFilterFactory {
@Override
diff --git a/solr/src/java/org/apache/solr/analysis/StandardTokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/StandardTokenizerFactory.java
index 32087dfb465..14a090041e0 100644
--- a/solr/src/java/org/apache/solr/analysis/StandardTokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/StandardTokenizerFactory.java
@@ -31,7 +31,7 @@ import java.util.Map;
* <tokenizer class="solr.StandardTokenizerFactory" maxTokenLength="255"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class StandardTokenizerFactory extends BaseTokenizerFactory {
diff --git a/solr/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java b/solr/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java
index 0ac0db28380..976113f040e 100644
--- a/solr/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java
@@ -36,7 +36,7 @@ import org.apache.solr.util.plugin.ResourceLoaderAware;
* <filter class="solr.StemmerOverrideFilterFactory" dictionary="dictionary.txt" ignoreCase="false"/>
* </analyzer>
* </fieldType>
- * @version $Id
+ *
*/
public class StemmerOverrideFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
private CharArrayMap dictionary = null;
diff --git a/solr/src/java/org/apache/solr/analysis/StopFilterFactory.java b/solr/src/java/org/apache/solr/analysis/StopFilterFactory.java
index 67fa11c17f8..42256d6465c 100644
--- a/solr/src/java/org/apache/solr/analysis/StopFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/StopFilterFactory.java
@@ -38,7 +38,7 @@ import java.io.IOException;
* words="stopwords.txt" enablePositionIncrements="true"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class StopFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
diff --git a/solr/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java b/solr/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java
index 429f7ac1ed6..2e208a43796 100644
--- a/solr/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.sv.SwedishLightStemFilter;
* <filter class="solr.SwedishLightStemFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class SwedishLightStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/SynonymFilterFactory.java b/solr/src/java/org/apache/solr/analysis/SynonymFilterFactory.java
index 162913e7899..3b8e4802b7d 100644
--- a/solr/src/java/org/apache/solr/analysis/SynonymFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/SynonymFilterFactory.java
@@ -44,7 +44,7 @@ import java.util.Map;
* expand="true" tokenizerFactory="solr.WhitespaceTokenizerFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class SynonymFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
diff --git a/solr/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java b/solr/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java
index 8ed23ff9973..3f4c366a7ca 100644
--- a/solr/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java
@@ -31,7 +31,7 @@ import org.apache.lucene.analysis.TokenStream;
* <filter class="solr.ThaiWordFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class ThaiWordFilterFactory extends BaseTokenFilterFactory {
public ThaiWordFilter create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/TokenFilterFactory.java b/solr/src/java/org/apache/solr/analysis/TokenFilterFactory.java
index 937e19f7b6e..1ae90e88c5b 100644
--- a/solr/src/java/org/apache/solr/analysis/TokenFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/TokenFilterFactory.java
@@ -44,7 +44,7 @@ import java.util.Map;
* A single instance of any registered TokenFilterFactory is created
* via the default constructor and is reused for each FieldType.
*
- * @version $Id$
+ *
*/
public interface TokenFilterFactory {
diff --git a/solr/src/java/org/apache/solr/analysis/TokenOffsetPayloadTokenFilterFactory.java b/solr/src/java/org/apache/solr/analysis/TokenOffsetPayloadTokenFilterFactory.java
index 981aab415a9..f13dcdeff5d 100644
--- a/solr/src/java/org/apache/solr/analysis/TokenOffsetPayloadTokenFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/TokenOffsetPayloadTokenFilterFactory.java
@@ -31,7 +31,7 @@ import org.apache.lucene.analysis.TokenStream;
* <filter class="solr.TokenOffsetPayloadTokenFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class TokenOffsetPayloadTokenFilterFactory extends BaseTokenFilterFactory {
public TokenOffsetPayloadTokenFilter create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/TokenizerChain.java b/solr/src/java/org/apache/solr/analysis/TokenizerChain.java
index 3fd48842077..cf04a82c17d 100644
--- a/solr/src/java/org/apache/solr/analysis/TokenizerChain.java
+++ b/solr/src/java/org/apache/solr/analysis/TokenizerChain.java
@@ -25,7 +25,7 @@ import org.apache.lucene.analysis.Tokenizer;
import java.io.Reader;
/**
- * @version $Id$
+ *
*/
//
diff --git a/solr/src/java/org/apache/solr/analysis/TokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/TokenizerFactory.java
index fe248566758..a46a8025be8 100644
--- a/solr/src/java/org/apache/solr/analysis/TokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/TokenizerFactory.java
@@ -44,7 +44,7 @@ import org.apache.lucene.analysis.*;
* A single instance of any registered TokenizerFactory is created
* via the default constructor and is reused for each FieldType.
*
- * @version $Id$
+ *
*/
public interface TokenizerFactory {
/** init
will be called just once, immediately after creation.
diff --git a/solr/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java
index 24b8de7f99d..bf2a3edae6e 100644
--- a/solr/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java
@@ -33,7 +33,7 @@ import java.io.Reader;
*
* Refer to {@link org.apache.lucene.search.NumericRangeQuery} for more details.
*
- * @version $Id$
+ *
* @see org.apache.lucene.search.NumericRangeQuery
* @see org.apache.solr.schema.TrieField
* @since solr 1.4
diff --git a/solr/src/java/org/apache/solr/analysis/TrimFilterFactory.java b/solr/src/java/org/apache/solr/analysis/TrimFilterFactory.java
index 31f85c32ba0..218878543f0 100644
--- a/solr/src/java/org/apache/solr/analysis/TrimFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/TrimFilterFactory.java
@@ -32,7 +32,7 @@ import org.apache.solr.common.SolrException;
* <filter class="solr.TrimFilterFactory" updateOffsets="false"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
* @see TrimFilter
*/
public class TrimFilterFactory extends BaseTokenFilterFactory {
diff --git a/solr/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java b/solr/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java
index 660a278fdf4..153ad026b2a 100644
--- a/solr/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java
@@ -29,7 +29,7 @@ import org.apache.lucene.analysis.tr.TurkishLowerCaseFilter;
* <filter class="solr.TurkishLowerCaseFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class TurkishLowerCaseFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/TypeAsPayloadTokenFilterFactory.java b/solr/src/java/org/apache/solr/analysis/TypeAsPayloadTokenFilterFactory.java
index c34c40f0358..b06a9a12a8b 100644
--- a/solr/src/java/org/apache/solr/analysis/TypeAsPayloadTokenFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/TypeAsPayloadTokenFilterFactory.java
@@ -31,7 +31,7 @@ import org.apache.lucene.analysis.TokenStream;
* <filter class="solr.TypeAsPayloadTokenFilterFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class TypeAsPayloadTokenFilterFactory extends BaseTokenFilterFactory {
public TypeAsPayloadTokenFilter create(TokenStream input) {
diff --git a/solr/src/java/org/apache/solr/analysis/UAX29URLEmailTokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/UAX29URLEmailTokenizerFactory.java
index 3b071c7c816..e3dd931ca7f 100644
--- a/solr/src/java/org/apache/solr/analysis/UAX29URLEmailTokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/UAX29URLEmailTokenizerFactory.java
@@ -34,7 +34,7 @@ import java.util.Map;
* <tokenizer class="solr.UAX29URLEmailTokenizerFactory" maxTokenLength="255"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*
*/
diff --git a/solr/src/java/org/apache/solr/analysis/WhitespaceTokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/WhitespaceTokenizerFactory.java
index c94b12a03ea..0946e2a8932 100644
--- a/solr/src/java/org/apache/solr/analysis/WhitespaceTokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/WhitespaceTokenizerFactory.java
@@ -30,7 +30,7 @@ import java.util.Map;
* <tokenizer class="solr.WhitespaceTokenizerFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class WhitespaceTokenizerFactory extends BaseTokenizerFactory {
@Override
diff --git a/solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java b/solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java
index 54a944fa7ac..49df72a9472 100644
--- a/solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.wikipedia.WikipediaTokenizer;
* <tokenizer class="solr.WikipediaTokenizerFactory"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class WikipediaTokenizerFactory extends BaseTokenizerFactory {
// TODO: add support for WikipediaTokenizer's advanced options.
diff --git a/solr/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java b/solr/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java
index 093a5df9ce5..f9737af6fa8 100644
--- a/solr/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java
+++ b/solr/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java
@@ -48,7 +48,7 @@ import java.io.IOException;
* generateWordParts="1" generateNumberParts="1" stemEnglishPossessive="1"/>
* </analyzer>
* </fieldType>
- * @version $Id$
+ *
*/
public class WordDelimiterFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public static final String PROTECTED_TOKENS = "protected";
diff --git a/solr/src/java/org/apache/solr/core/Config.java b/solr/src/java/org/apache/solr/core/Config.java
index f939a0af687..60440e31c36 100644
--- a/solr/src/java/org/apache/solr/core/Config.java
+++ b/solr/src/java/org/apache/solr/core/Config.java
@@ -46,7 +46,7 @@ import java.util.Locale;
import java.util.concurrent.atomic.AtomicBoolean;
/**
- * @version $Id$
+ *
*/
public class Config {
public static final Logger log = LoggerFactory.getLogger(Config.class);
diff --git a/solr/src/java/org/apache/solr/core/CoreContainer.java b/solr/src/java/org/apache/solr/core/CoreContainer.java
index ef8dc62a4e8..513ae8e2430 100644
--- a/solr/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/src/java/org/apache/solr/core/CoreContainer.java
@@ -54,7 +54,7 @@ import org.xml.sax.InputSource;
/**
- * @version $Id$
+ *
* @since solr 1.3
*/
public class CoreContainer
diff --git a/solr/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java b/solr/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
index f85c37fc2ff..f6f26c31982 100644
--- a/solr/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
+++ b/solr/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicInteger;
* commit points for certain amounts of time to support features such as index replication
* or snapshooting directly out of a live index directory.
*
- * @version $Id$
+ *
* @see org.apache.lucene.index.IndexDeletionPolicy
*/
public class IndexDeletionPolicyWrapper implements IndexDeletionPolicy {
diff --git a/solr/src/java/org/apache/solr/core/JmxMonitoredMap.java b/solr/src/java/org/apache/solr/core/JmxMonitoredMap.java
index 15c956ffe30..823dd9c0f2b 100644
--- a/solr/src/java/org/apache/solr/core/JmxMonitoredMap.java
+++ b/solr/src/java/org/apache/solr/core/JmxMonitoredMap.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
* Please see http://wiki.apache.org/solr/SolrJmx for instructions on usage and configuration
*
*
- * @version $Id$
+ *
* @see org.apache.solr.core.SolrConfig.JmxConfiguration
* @since solr 1.3
*/
diff --git a/solr/src/java/org/apache/solr/core/PluginInfo.java b/solr/src/java/org/apache/solr/core/PluginInfo.java
index be97adf9940..35611b20bdb 100644
--- a/solr/src/java/org/apache/solr/core/PluginInfo.java
+++ b/solr/src/java/org/apache/solr/core/PluginInfo.java
@@ -27,7 +27,7 @@ import static java.util.Collections.unmodifiableMap;
/**
* An Object which represents a Plugin of any type
- * @version $Id$
+ *
*/
public class PluginInfo {
public final String name, className, type;
diff --git a/solr/src/java/org/apache/solr/core/QuerySenderListener.java b/solr/src/java/org/apache/solr/core/QuerySenderListener.java
index d5485ce3665..12b388d6b3c 100644
--- a/solr/src/java/org/apache/solr/core/QuerySenderListener.java
+++ b/solr/src/java/org/apache/solr/core/QuerySenderListener.java
@@ -30,7 +30,7 @@ import org.apache.solr.response.SolrQueryResponse;
import java.util.List;
/**
- * @version $Id$
+ *
*/
public class QuerySenderListener extends AbstractSolrEventListener {
public QuerySenderListener(SolrCore core) {
diff --git a/solr/src/java/org/apache/solr/core/RequestHandlers.java b/solr/src/java/org/apache/solr/core/RequestHandlers.java
index 9541dc32043..80c7c04d72f 100644
--- a/solr/src/java/org/apache/solr/core/RequestHandlers.java
+++ b/solr/src/java/org/apache/solr/core/RequestHandlers.java
@@ -209,7 +209,6 @@ final class RequestHandlers {
* This is a private class - if there is a real need for it to be public, it could
* move
*
- * @version $Id$
* @since solr 1.2
*/
private static final class LazyRequestHandlerWrapper implements SolrRequestHandler, SolrInfoMBean
diff --git a/solr/src/java/org/apache/solr/core/SolrConfig.java b/solr/src/java/org/apache/solr/core/SolrConfig.java
index 3bdd551c5a4..7e96557cbf2 100644
--- a/solr/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/src/java/org/apache/solr/core/SolrConfig.java
@@ -66,7 +66,7 @@ import java.io.IOException;
* configuration data for a a Solr instance -- typically found in
* "solrconfig.xml".
*
- * @version $Id$
+ *
*/
public class SolrConfig extends Config {
diff --git a/solr/src/java/org/apache/solr/core/SolrCore.java b/solr/src/java/org/apache/solr/core/SolrCore.java
index 4bf9288999a..1afc3be2269 100644
--- a/solr/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/src/java/org/apache/solr/core/SolrCore.java
@@ -71,7 +71,7 @@ import java.lang.reflect.Constructor;
/**
- * @version $Id$
+ *
*/
public final class SolrCore implements SolrInfoMBean {
public static final String version="1.0";
diff --git a/solr/src/java/org/apache/solr/core/SolrDeletionPolicy.java b/solr/src/java/org/apache/solr/core/SolrDeletionPolicy.java
index e165484677e..c5e5278d860 100644
--- a/solr/src/java/org/apache/solr/core/SolrDeletionPolicy.java
+++ b/solr/src/java/org/apache/solr/core/SolrDeletionPolicy.java
@@ -38,7 +38,7 @@ import java.util.Locale;
* for certain amounts of time to support features such as index replication
* or snapshooting directly out of a live index directory.
*
- * @version $Id$
+ *
* @see org.apache.lucene.index.IndexDeletionPolicy
*/
public class SolrDeletionPolicy implements IndexDeletionPolicy, NamedListInitializedPlugin {
diff --git a/solr/src/java/org/apache/solr/core/SolrEventListener.java b/solr/src/java/org/apache/solr/core/SolrEventListener.java
index f499e85a2c1..62c97ea258b 100644
--- a/solr/src/java/org/apache/solr/core/SolrEventListener.java
+++ b/solr/src/java/org/apache/solr/core/SolrEventListener.java
@@ -24,7 +24,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * @version $Id$
+ *
*/
public interface SolrEventListener extends NamedListInitializedPlugin{
static final Logger log = LoggerFactory.getLogger(SolrCore.class);
diff --git a/solr/src/java/org/apache/solr/core/SolrInfoMBean.java b/solr/src/java/org/apache/solr/core/SolrInfoMBean.java
index 3e70e165b86..4858559b5c2 100644
--- a/solr/src/java/org/apache/solr/core/SolrInfoMBean.java
+++ b/solr/src/java/org/apache/solr/core/SolrInfoMBean.java
@@ -26,7 +26,7 @@ import org.apache.solr.common.util.NamedList;
* for use by objects which are 'pluggable' to make server administration
* easier.
*
- * @version $Id$
+ *
*/
public interface SolrInfoMBean {
diff --git a/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java b/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
index bb0e73d9061..dd83506462e 100644
--- a/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
+++ b/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
@@ -47,7 +47,7 @@ import java.util.*;
/**
* A base class for all analysis request handlers.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public abstract class AnalysisRequestHandlerBase extends RequestHandlerBase {
diff --git a/solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java b/solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
index c9f92857b1c..05c0067bc1b 100644
--- a/solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
+++ b/solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
@@ -38,7 +38,7 @@ import java.util.List;
/**
* Update handler which uses the JavaBin format
*
- * @version $Id$
+ *
* @see org.apache.solr.client.solrj.request.JavaBinUpdateRequestCodec
* @see org.apache.solr.common.util.JavaBinCodec
* @since solr 1.4
diff --git a/solr/src/java/org/apache/solr/handler/CSVRequestHandler.java b/solr/src/java/org/apache/solr/handler/CSVRequestHandler.java
index 6ba5ead5f89..f1bfb118bb2 100755
--- a/solr/src/java/org/apache/solr/handler/CSVRequestHandler.java
+++ b/solr/src/java/org/apache/solr/handler/CSVRequestHandler.java
@@ -37,7 +37,7 @@ import java.util.List;
import java.io.*;
/**
- * @version $Id$
+ *
*/
public class CSVRequestHandler extends ContentStreamHandlerBase {
diff --git a/solr/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java b/solr/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
index 0f18012aa14..610a043ca33 100644
--- a/solr/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
+++ b/solr/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
@@ -73,7 +73,7 @@ import java.util.*;
* supports the "analysis.showmatch" parameter which when set to {@code true}, all field tokens that match the query
* tokens will be marked as a "match".
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class DocumentAnalysisRequestHandler extends AnalysisRequestHandlerBase {
diff --git a/solr/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java b/solr/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java
index b30ae6135ab..d0848272bcf 100644
--- a/solr/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java
+++ b/solr/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java
@@ -86,7 +86,7 @@ import java.io.IOException;
* Note that if neither analysis.fieldname and analysis.fieldtype is specified, then the default search field's
* analyzer is used.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class FieldAnalysisRequestHandler extends AnalysisRequestHandlerBase {
diff --git a/solr/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/src/java/org/apache/solr/handler/ReplicationHandler.java
index 71780562890..8fcc7e54fe4 100644
--- a/solr/src/java/org/apache/solr/handler/ReplicationHandler.java
+++ b/solr/src/java/org/apache/solr/handler/ReplicationHandler.java
@@ -61,7 +61,7 @@ import java.util.zip.DeflaterOutputStream;
* Abort a snap pull (command=abort) Enable/Disable polling the master for new versions (command=enablepoll
* or command=disablepoll)
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAware {
diff --git a/solr/src/java/org/apache/solr/handler/RequestHandlerUtils.java b/solr/src/java/org/apache/solr/handler/RequestHandlerUtils.java
index d7d85767a61..3d23322e723 100755
--- a/solr/src/java/org/apache/solr/handler/RequestHandlerUtils.java
+++ b/solr/src/java/org/apache/solr/handler/RequestHandlerUtils.java
@@ -32,7 +32,7 @@ import org.apache.solr.update.processor.UpdateRequestProcessor;
/**
* Common helper functions for RequestHandlers
*
- * @version $Id$
+ *
* @since solr 1.2
*/
public class RequestHandlerUtils
diff --git a/solr/src/java/org/apache/solr/handler/SnapPuller.java b/solr/src/java/org/apache/solr/handler/SnapPuller.java
index 20ce25e485d..70d33ab7243 100644
--- a/solr/src/java/org/apache/solr/handler/SnapPuller.java
+++ b/solr/src/java/org/apache/solr/handler/SnapPuller.java
@@ -57,7 +57,7 @@ import java.util.zip.InflaterInputStream;
*
Provides functionality of downloading changed index files as well as config files and a timer for scheduling fetches from the
* master.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class SnapPuller {
diff --git a/solr/src/java/org/apache/solr/handler/SnapShooter.java b/solr/src/java/org/apache/solr/handler/SnapShooter.java
index b534d04a97e..d0afaa2ece7 100644
--- a/solr/src/java/org/apache/solr/handler/SnapShooter.java
+++ b/solr/src/java/org/apache/solr/handler/SnapShooter.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
/**
*
Provides functionality equivalent to the snapshooter script
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class SnapShooter {
diff --git a/solr/src/java/org/apache/solr/handler/StandardRequestHandler.java b/solr/src/java/org/apache/solr/handler/StandardRequestHandler.java
index 09dcf64e461..2489e5d71c6 100644
--- a/solr/src/java/org/apache/solr/handler/StandardRequestHandler.java
+++ b/solr/src/java/org/apache/solr/handler/StandardRequestHandler.java
@@ -23,7 +23,7 @@ import java.net.MalformedURLException;
import java.net.URL;
/**
- * @version $Id$
+ *
*
* All of the following options may be configured for this handler
* in the solrconfig as defaults, and may be overriden as request parameters.
diff --git a/solr/src/java/org/apache/solr/handler/admin/AdminHandlers.java b/solr/src/java/org/apache/solr/handler/admin/AdminHandlers.java
index e030fb6db22..0f4a0a98a09 100644
--- a/solr/src/java/org/apache/solr/handler/admin/AdminHandlers.java
+++ b/solr/src/java/org/apache/solr/handler/admin/AdminHandlers.java
@@ -31,7 +31,7 @@ import org.apache.solr.util.plugin.SolrCoreAware;
/**
* A special Handler that registers all standard admin handlers
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class AdminHandlers implements SolrCoreAware, SolrRequestHandler
diff --git a/solr/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
index 63f72c3ddc8..39b9a048e22 100644
--- a/solr/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
+++ b/solr/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
@@ -45,7 +45,7 @@ import java.io.IOException;
import java.util.Date;
/**
- * @version $Id$
+ *
* @since solr 1.3
*/
public class CoreAdminHandler extends RequestHandlerBase {
diff --git a/solr/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/solr/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
index 17ff7730984..0127915004a 100644
--- a/solr/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
+++ b/solr/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
@@ -81,7 +81,7 @@ import org.apache.solr.search.SolrIndexSearcher;
* For more documentation see:
* http://wiki.apache.org/solr/LukeRequestHandler
*
- * @version $Id$
+ *
* @since solr 1.2
*/
public class LukeRequestHandler extends RequestHandlerBase
diff --git a/solr/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java b/solr/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
index 86f98c67c31..c0707dfd49e 100644
--- a/solr/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
+++ b/solr/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
@@ -36,7 +36,7 @@ import org.apache.solr.response.SolrQueryResponse;
* that it works nicely with an XSLT transformation. Until we have a nice
* XSLT front end for /admin, the format is still open to change.
*
- * @version $Id$
+ *
* @since solr 1.2
*/
public class PluginInfoHandler extends RequestHandlerBase
diff --git a/solr/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java b/solr/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java
index 12ee354b5fa..f24ac8d5cb6 100644
--- a/solr/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java
+++ b/solr/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java
@@ -25,7 +25,7 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
/**
- * @version $Id$
+ *
* @since solr 1.2
*/
public class PropertiesRequestHandler extends RequestHandlerBase
diff --git a/solr/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java b/solr/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
index cda4b94bd81..2c30558f301 100644
--- a/solr/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
+++ b/solr/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
@@ -72,7 +72,7 @@ import org.apache.solr.response.SolrQueryResponse;
* http://localhost:8983/solr/admin/file?file=schema.xml&contentType=text/plain
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class ShowFileRequestHandler extends RequestHandlerBase
diff --git a/solr/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java b/solr/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
index 4a123944624..8dc782424a8 100644
--- a/solr/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
+++ b/solr/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
* that it works nicely with an XSLT transformation. Until we have a nice
* XSLT front end for /admin, the format is still open to change.
*
- * @version $Id$
+ *
* @since solr 1.2
*/
public class SystemInfoHandler extends RequestHandlerBase
diff --git a/solr/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java b/solr/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
index f8850160696..a39d63c568a 100644
--- a/solr/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
+++ b/solr/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
@@ -35,7 +35,7 @@ import org.apache.solr.response.SolrQueryResponse;
* that it works nicely with an XSLT transformation. Until we have a nice
* XSLT front end for /admin, the format is still open to change.
*
- * @version $Id$
+ *
* @since solr 1.2
*/
public class ThreadDumpHandler extends RequestHandlerBase
diff --git a/solr/src/java/org/apache/solr/handler/component/DebugComponent.java b/solr/src/java/org/apache/solr/handler/component/DebugComponent.java
index a6717981786..6d133bb6990 100644
--- a/solr/src/java/org/apache/solr/handler/component/DebugComponent.java
+++ b/solr/src/java/org/apache/solr/handler/component/DebugComponent.java
@@ -34,7 +34,7 @@ import org.apache.solr.util.SolrPluginUtils;
/**
* Adds debugging information to a request.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class DebugComponent extends SearchComponent
diff --git a/solr/src/java/org/apache/solr/handler/component/FacetComponent.java b/solr/src/java/org/apache/solr/handler/component/FacetComponent.java
index 3a5ee6149bd..a398967ccdf 100644
--- a/solr/src/java/org/apache/solr/handler/component/FacetComponent.java
+++ b/solr/src/java/org/apache/solr/handler/component/FacetComponent.java
@@ -38,7 +38,7 @@ import java.util.*;
/**
* TODO!
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class FacetComponent extends SearchComponent
diff --git a/solr/src/java/org/apache/solr/handler/component/HighlightComponent.java b/solr/src/java/org/apache/solr/handler/component/HighlightComponent.java
index 137f30b52c3..f055e29faf3 100644
--- a/solr/src/java/org/apache/solr/handler/component/HighlightComponent.java
+++ b/solr/src/java/org/apache/solr/handler/component/HighlightComponent.java
@@ -41,7 +41,7 @@ import java.util.List;
/**
* TODO!
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class HighlightComponent extends SearchComponent implements PluginInfoInitialized, SolrCoreAware
diff --git a/solr/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java b/solr/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
index 8851ff7761d..33251f04361 100644
--- a/solr/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
+++ b/solr/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
@@ -34,7 +34,7 @@ import org.apache.solr.search.SolrIndexSearcher;
/**
* TODO!
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class MoreLikeThisComponent extends SearchComponent
diff --git a/solr/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/src/java/org/apache/solr/handler/component/QueryComponent.java
index 1d26b374d06..98602d280a6 100644
--- a/solr/src/java/org/apache/solr/handler/component/QueryComponent.java
+++ b/solr/src/java/org/apache/solr/handler/component/QueryComponent.java
@@ -56,7 +56,7 @@ import java.util.*;
/**
* TODO!
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class QueryComponent extends SearchComponent
diff --git a/solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java b/solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
index 743cca317c2..008bc91ca17 100644
--- a/solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
+++ b/solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
@@ -72,7 +72,7 @@ import org.xml.sax.InputSource;
/**
* A component to elevate some documents to the top of the result set.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class QueryElevationComponent extends SearchComponent implements SolrCoreAware
diff --git a/solr/src/java/org/apache/solr/handler/component/ResponseBuilder.java b/solr/src/java/org/apache/solr/handler/component/ResponseBuilder.java
index 5bcb5a967d2..47ef191c962 100644
--- a/solr/src/java/org/apache/solr/handler/component/ResponseBuilder.java
+++ b/solr/src/java/org/apache/solr/handler/component/ResponseBuilder.java
@@ -36,7 +36,7 @@ import java.util.Map;
/**
* This class is experimental and will be changing in the future.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class ResponseBuilder
diff --git a/solr/src/java/org/apache/solr/handler/component/SearchComponent.java b/solr/src/java/org/apache/solr/handler/component/SearchComponent.java
index 2908fbc033d..425b7d8c341 100644
--- a/solr/src/java/org/apache/solr/handler/component/SearchComponent.java
+++ b/solr/src/java/org/apache/solr/handler/component/SearchComponent.java
@@ -28,7 +28,7 @@ import org.apache.solr.util.plugin.NamedListInitializedPlugin;
/**
* TODO!
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public abstract class SearchComponent implements SolrInfoMBean, NamedListInitializedPlugin
diff --git a/solr/src/java/org/apache/solr/handler/component/StatsComponent.java b/solr/src/java/org/apache/solr/handler/component/StatsComponent.java
index a8b0c4a65d4..805ad10c668 100644
--- a/solr/src/java/org/apache/solr/handler/component/StatsComponent.java
+++ b/solr/src/java/org/apache/solr/handler/component/StatsComponent.java
@@ -42,7 +42,7 @@ import org.apache.solr.request.UnInvertedField;
/**
* Stats component calculates simple statistics on numeric field values
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class StatsComponent extends SearchComponent {
diff --git a/solr/src/java/org/apache/solr/handler/component/TermVectorComponent.java b/solr/src/java/org/apache/solr/handler/component/TermVectorComponent.java
index 24c5256576b..7b78735447e 100644
--- a/solr/src/java/org/apache/solr/handler/component/TermVectorComponent.java
+++ b/solr/src/java/org/apache/solr/handler/component/TermVectorComponent.java
@@ -74,7 +74,7 @@ import java.util.Map;
* </arr>
* </requestHandler>
*
- * @version $Id$
+ *
*/
public class TermVectorComponent extends SearchComponent implements SolrCoreAware {
diff --git a/solr/src/java/org/apache/solr/handler/component/TermsComponent.java b/solr/src/java/org/apache/solr/handler/component/TermsComponent.java
index 4ce9f9f507a..7158b733e2c 100644
--- a/solr/src/java/org/apache/solr/handler/component/TermsComponent.java
+++ b/solr/src/java/org/apache/solr/handler/component/TermsComponent.java
@@ -56,7 +56,7 @@ import java.util.regex.Pattern;
*
* @see org.apache.solr.common.params.TermsParams
* See Lucene's TermEnum class
- * @version $Id$
+ *
*/
public class TermsComponent extends SearchComponent {
public static final int UNLIMITED_MAX_COUNT = -1;
diff --git a/solr/src/java/org/apache/solr/request/LocalSolrQueryRequest.java b/solr/src/java/org/apache/solr/request/LocalSolrQueryRequest.java
index 427cf0d1c5d..900cb860fe9 100644
--- a/solr/src/java/org/apache/solr/request/LocalSolrQueryRequest.java
+++ b/solr/src/java/org/apache/solr/request/LocalSolrQueryRequest.java
@@ -31,7 +31,7 @@ import java.util.Iterator;
// retained more for backward compatibility.
/**
- * @version $Id$
+ *
*/
public class LocalSolrQueryRequest extends SolrQueryRequestBase {
public final static Map emptyArgs = new HashMap(0,1);
diff --git a/solr/src/java/org/apache/solr/request/ServletSolrParams.java b/solr/src/java/org/apache/solr/request/ServletSolrParams.java
index 49922c81332..18dc7559b21 100644
--- a/solr/src/java/org/apache/solr/request/ServletSolrParams.java
+++ b/solr/src/java/org/apache/solr/request/ServletSolrParams.java
@@ -22,7 +22,7 @@ import javax.servlet.ServletRequest;
import org.apache.solr.common.params.MultiMapSolrParams;
/**
- * @version $Id$
+ *
*/
public class ServletSolrParams extends MultiMapSolrParams {
public ServletSolrParams(ServletRequest req) {
diff --git a/solr/src/java/org/apache/solr/request/SolrQueryRequest.java b/solr/src/java/org/apache/solr/request/SolrQueryRequest.java
index eeb3c60408f..931acbc123d 100644
--- a/solr/src/java/org/apache/solr/request/SolrQueryRequest.java
+++ b/solr/src/java/org/apache/solr/request/SolrQueryRequest.java
@@ -29,7 +29,7 @@ import java.util.Map;
* Container for a request to execute a query.
* SolrQueryRequest
is not thread safe.
*
- * @version $Id$
+ *
*/
public interface SolrQueryRequest {
diff --git a/solr/src/java/org/apache/solr/request/SolrQueryRequestBase.java b/solr/src/java/org/apache/solr/request/SolrQueryRequestBase.java
index 699cbe7c74d..82d28728d34 100644
--- a/solr/src/java/org/apache/solr/request/SolrQueryRequestBase.java
+++ b/solr/src/java/org/apache/solr/request/SolrQueryRequestBase.java
@@ -38,7 +38,7 @@ import java.util.HashMap;
*
*
*
- * @version $Id$
+ *
*/
public abstract class SolrQueryRequestBase implements SolrQueryRequest {
protected final SolrCore core;
diff --git a/solr/src/java/org/apache/solr/request/SolrRequestHandler.java b/solr/src/java/org/apache/solr/request/SolrRequestHandler.java
index 45a80fda622..50adac068f9 100644
--- a/solr/src/java/org/apache/solr/request/SolrRequestHandler.java
+++ b/solr/src/java/org/apache/solr/request/SolrRequestHandler.java
@@ -37,7 +37,7 @@ import org.apache.solr.response.SolrQueryResponse;
* A single instance of any registered SolrRequestHandler is created
* via the default constructor and is reused for all relevant queries.
*
- * @version $Id$
+ *
*/
public interface SolrRequestHandler extends SolrInfoMBean {
diff --git a/solr/src/java/org/apache/solr/response/CSVResponseWriter.java b/solr/src/java/org/apache/solr/response/CSVResponseWriter.java
index 3116467a5c7..d35ad3c2bd6 100755
--- a/solr/src/java/org/apache/solr/response/CSVResponseWriter.java
+++ b/solr/src/java/org/apache/solr/response/CSVResponseWriter.java
@@ -43,7 +43,7 @@ import java.io.Writer;
import java.util.*;
/**
- * @version $Id$
+ *
*/
public class CSVResponseWriter implements QueryResponseWriter {
diff --git a/solr/src/java/org/apache/solr/response/JSONResponseWriter.java b/solr/src/java/org/apache/solr/response/JSONResponseWriter.java
index 7a515788f62..0e328fcca41 100644
--- a/solr/src/java/org/apache/solr/response/JSONResponseWriter.java
+++ b/solr/src/java/org/apache/solr/response/JSONResponseWriter.java
@@ -37,7 +37,7 @@ import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.ReturnFields;
/**
- * @version $Id$
+ *
*/
public class JSONResponseWriter implements QueryResponseWriter {
diff --git a/solr/src/java/org/apache/solr/response/QueryResponseWriter.java b/solr/src/java/org/apache/solr/response/QueryResponseWriter.java
index eeae6c7c5c1..81e19b7b63c 100644
--- a/solr/src/java/org/apache/solr/response/QueryResponseWriter.java
+++ b/solr/src/java/org/apache/solr/response/QueryResponseWriter.java
@@ -40,7 +40,7 @@ import org.apache.solr.util.plugin.NamedListInitializedPlugin;
* A single instance of any registered QueryResponseWriter is created
* via the default constructor and is reused for all relevant queries.
*
- * @version $Id$
+ *
*/
public interface QueryResponseWriter extends NamedListInitializedPlugin {
public static String CONTENT_TYPE_XML_UTF8="application/xml; charset=UTF-8";
diff --git a/solr/src/java/org/apache/solr/response/RawResponseWriter.java b/solr/src/java/org/apache/solr/response/RawResponseWriter.java
index e34691c192d..dba1eaca790 100644
--- a/solr/src/java/org/apache/solr/response/RawResponseWriter.java
+++ b/solr/src/java/org/apache/solr/response/RawResponseWriter.java
@@ -42,7 +42,7 @@ import org.apache.solr.request.SolrQueryRequest;
* defaults to the "standard" writer.
*
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class RawResponseWriter implements BinaryQueryResponseWriter
diff --git a/solr/src/java/org/apache/solr/response/ResultContext.java b/solr/src/java/org/apache/solr/response/ResultContext.java
index f1da1d6c73a..e218df5e1f7 100644
--- a/solr/src/java/org/apache/solr/response/ResultContext.java
+++ b/solr/src/java/org/apache/solr/response/ResultContext.java
@@ -23,7 +23,7 @@ import org.apache.solr.search.DocList;
/**
* A class to hold the QueryResult and the Query
*
- * @version $Id$
+ *
*/
public class ResultContext {
public Query query;
diff --git a/solr/src/java/org/apache/solr/response/SolrQueryResponse.java b/solr/src/java/org/apache/solr/response/SolrQueryResponse.java
index a0ca1c4bfff..0afec1ee02b 100644
--- a/solr/src/java/org/apache/solr/response/SolrQueryResponse.java
+++ b/solr/src/java/org/apache/solr/response/SolrQueryResponse.java
@@ -55,7 +55,7 @@ import java.util.*;
* that QueryResponseWriters will be able to deal with unexpected types.
*
*
- * @version $Id$
+ *
* @since solr 0.9
*/
public class SolrQueryResponse {
diff --git a/solr/src/java/org/apache/solr/response/TextResponseWriter.java b/solr/src/java/org/apache/solr/response/TextResponseWriter.java
index fae3e6b7da4..9a7d9cf5b0f 100644
--- a/solr/src/java/org/apache/solr/response/TextResponseWriter.java
+++ b/solr/src/java/org/apache/solr/response/TextResponseWriter.java
@@ -37,7 +37,7 @@ import org.apache.solr.search.ReturnFields;
/** Base class for text-oriented response writers.
*
- * @version $Id$
+ *
*/
public abstract class TextResponseWriter {
diff --git a/solr/src/java/org/apache/solr/response/XMLResponseWriter.java b/solr/src/java/org/apache/solr/response/XMLResponseWriter.java
index a883e9d82cc..95d46544434 100644
--- a/solr/src/java/org/apache/solr/response/XMLResponseWriter.java
+++ b/solr/src/java/org/apache/solr/response/XMLResponseWriter.java
@@ -24,7 +24,7 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
/**
- * @version $Id$
+ *
*/
public class XMLResponseWriter implements QueryResponseWriter {
public void init(NamedList n) {
diff --git a/solr/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java b/solr/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java
index c4e19a1d171..8c23d31f348 100644
--- a/solr/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java
+++ b/solr/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java
@@ -21,7 +21,7 @@ import org.apache.solr.common.params.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
/**
- * @version $Id$
+ *
* @since solr 4.0
*/
public class DocIdAugmenterFactory extends TransformerFactory
diff --git a/solr/src/java/org/apache/solr/response/transform/DocTransformer.java b/solr/src/java/org/apache/solr/response/transform/DocTransformer.java
index a882238446c..bcc827f6f55 100644
--- a/solr/src/java/org/apache/solr/response/transform/DocTransformer.java
+++ b/solr/src/java/org/apache/solr/response/transform/DocTransformer.java
@@ -24,7 +24,7 @@ import org.apache.solr.common.SolrDocument;
/**
* New instance for each request
*
- * @version $Id$
+ *
*/
public abstract class DocTransformer
{
diff --git a/solr/src/java/org/apache/solr/response/transform/DocTransformers.java b/solr/src/java/org/apache/solr/response/transform/DocTransformers.java
index 3aef76eda7f..6906f2f3ea9 100644
--- a/solr/src/java/org/apache/solr/response/transform/DocTransformers.java
+++ b/solr/src/java/org/apache/solr/response/transform/DocTransformers.java
@@ -27,7 +27,7 @@ import org.apache.solr.common.SolrDocument;
/**
* Transform a document before it gets sent out
*
- * @version $Id$
+ *
*/
public class DocTransformers extends DocTransformer
{
diff --git a/solr/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java b/solr/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
index a65b0daed69..3b0d4297406 100644
--- a/solr/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
+++ b/solr/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
@@ -28,7 +28,7 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.SolrPluginUtils;
/**
- * @version $Id$
+ *
* @since solr 4.0
*/
public class ExplainAugmenterFactory extends TransformerFactory
diff --git a/solr/src/java/org/apache/solr/response/transform/RenameFieldsTransformer.java b/solr/src/java/org/apache/solr/response/transform/RenameFieldsTransformer.java
index 76a40f4397b..1c09b653e6f 100644
--- a/solr/src/java/org/apache/solr/response/transform/RenameFieldsTransformer.java
+++ b/solr/src/java/org/apache/solr/response/transform/RenameFieldsTransformer.java
@@ -22,7 +22,7 @@ import org.apache.solr.common.util.NamedList;
/**
* Return a field with a name that is different that what is indexed
*
- * @version $Id$
+ *
* @since solr 4.0
*/
public class RenameFieldsTransformer extends DocTransformer
diff --git a/solr/src/java/org/apache/solr/response/transform/ScoreAugmenter.java b/solr/src/java/org/apache/solr/response/transform/ScoreAugmenter.java
index f4a1effc1ef..69cae827fd4 100644
--- a/solr/src/java/org/apache/solr/response/transform/ScoreAugmenter.java
+++ b/solr/src/java/org/apache/solr/response/transform/ScoreAugmenter.java
@@ -21,7 +21,7 @@ import org.apache.solr.common.SolrDocument;
/**
* Simple Augmenter that adds the docId
*
- * @version $Id$
+ *
* @since solr 4.0
*/
public class ScoreAugmenter extends TransformerWithContext
diff --git a/solr/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java b/solr/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java
index 670bbbea158..42979b60fe8 100644
--- a/solr/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java
+++ b/solr/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java
@@ -22,7 +22,7 @@ import org.apache.solr.request.SolrQueryRequest;
/**
- * @version $Id$
+ *
* @since solr 4.0
*/
public class ShardAugmenterFactory extends TransformerFactory
diff --git a/solr/src/java/org/apache/solr/response/transform/TransformContext.java b/solr/src/java/org/apache/solr/response/transform/TransformContext.java
index 3bd8ad3cba0..dc71e58b691 100644
--- a/solr/src/java/org/apache/solr/response/transform/TransformContext.java
+++ b/solr/src/java/org/apache/solr/response/transform/TransformContext.java
@@ -23,7 +23,7 @@ import org.apache.solr.search.SolrIndexSearcher;
/**
* Environment variables for the transformed documents
*
- * @version $Id$
+ *
* @since solr 4.0
*/
public class TransformContext
diff --git a/solr/src/java/org/apache/solr/response/transform/TransformerFactory.java b/solr/src/java/org/apache/solr/response/transform/TransformerFactory.java
index 832d009ceb7..9b316d67217 100644
--- a/solr/src/java/org/apache/solr/response/transform/TransformerFactory.java
+++ b/solr/src/java/org/apache/solr/response/transform/TransformerFactory.java
@@ -28,7 +28,7 @@ import org.apache.solr.util.plugin.NamedListInitializedPlugin;
/**
* New instance for each request
*
- * @version $Id$
+ *
*/
public abstract class TransformerFactory implements NamedListInitializedPlugin
{
diff --git a/solr/src/java/org/apache/solr/response/transform/TransformerWithContext.java b/solr/src/java/org/apache/solr/response/transform/TransformerWithContext.java
index 3b1ad181f69..060bfd55748 100644
--- a/solr/src/java/org/apache/solr/response/transform/TransformerWithContext.java
+++ b/solr/src/java/org/apache/solr/response/transform/TransformerWithContext.java
@@ -18,7 +18,7 @@ package org.apache.solr.response.transform;
/**
- * @version $Id$
+ *
* @since solr 4.0
*/
public abstract class TransformerWithContext extends DocTransformer
diff --git a/solr/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java b/solr/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java
index f319f71d4da..a62e709f2d1 100644
--- a/solr/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java
+++ b/solr/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java
@@ -25,7 +25,7 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
/**
- * @version $Id$
+ *
* @since solr 4.0
*/
public class ValueAugmenterFactory extends TransformerFactory
diff --git a/solr/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java b/solr/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java
index 51d40dba98e..89d9b975d06 100644
--- a/solr/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java
+++ b/solr/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java
@@ -33,7 +33,7 @@ import org.apache.solr.search.function.ValueSource;
*
* NOT really sure how or if this could work...
*
- * @version $Id$
+ *
* @since solr 4.0
*/
public class ValueSourceAugmenter extends DocTransformer
diff --git a/solr/src/java/org/apache/solr/schema/BCDIntField.java b/solr/src/java/org/apache/solr/schema/BCDIntField.java
index 534a7dcf1b0..2568db97491 100644
--- a/solr/src/java/org/apache/solr/schema/BCDIntField.java
+++ b/solr/src/java/org/apache/solr/schema/BCDIntField.java
@@ -27,7 +27,7 @@ import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
import java.io.IOException;
/**
- * @version $Id$
+ *
*/
public class BCDIntField extends FieldType {
@Override
diff --git a/solr/src/java/org/apache/solr/schema/BCDLongField.java b/solr/src/java/org/apache/solr/schema/BCDLongField.java
index 5a4c4f01264..fa78ba2b190 100644
--- a/solr/src/java/org/apache/solr/schema/BCDLongField.java
+++ b/solr/src/java/org/apache/solr/schema/BCDLongField.java
@@ -19,7 +19,7 @@ package org.apache.solr.schema;
import org.apache.lucene.document.Fieldable;
/**
- * @version $Id$
+ *
*/
public class BCDLongField extends BCDIntField {
@Override
diff --git a/solr/src/java/org/apache/solr/schema/BCDStrField.java b/solr/src/java/org/apache/solr/schema/BCDStrField.java
index ab27f81d7c1..a7bf0828688 100644
--- a/solr/src/java/org/apache/solr/schema/BCDStrField.java
+++ b/solr/src/java/org/apache/solr/schema/BCDStrField.java
@@ -19,7 +19,7 @@ package org.apache.solr.schema;
import org.apache.lucene.document.Fieldable;
/**
- * @version $Id$
+ *
*/
public class BCDStrField extends BCDIntField {
/**
diff --git a/solr/src/java/org/apache/solr/schema/BoolField.java b/solr/src/java/org/apache/solr/schema/BoolField.java
index 3cd50247abc..10e1c862be7 100644
--- a/solr/src/java/org/apache/solr/schema/BoolField.java
+++ b/solr/src/java/org/apache/solr/schema/BoolField.java
@@ -38,7 +38,7 @@ import java.util.Map;
import java.io.Reader;
import java.io.IOException;
/**
- * @version $Id$
+ *
*/
public class BoolField extends FieldType {
@Override
diff --git a/solr/src/java/org/apache/solr/schema/ByteField.java b/solr/src/java/org/apache/solr/schema/ByteField.java
index 091f1e9fca8..ce5901045c7 100644
--- a/solr/src/java/org/apache/solr/schema/ByteField.java
+++ b/solr/src/java/org/apache/solr/schema/ByteField.java
@@ -30,7 +30,7 @@ import java.io.IOException;
import java.util.Map;
/**
- * @version $Id$
+ *
*/
public class ByteField extends FieldType {
@Override
diff --git a/solr/src/java/org/apache/solr/schema/DateField.java b/solr/src/java/org/apache/solr/schema/DateField.java
index d7bcef0ca0a..f7e16bd6708 100644
--- a/solr/src/java/org/apache/solr/schema/DateField.java
+++ b/solr/src/java/org/apache/solr/schema/DateField.java
@@ -93,7 +93,7 @@ import java.util.*;
* acronym UTC was chosen as a compromise."
*
*
- * @version $Id$
+ *
* @see XML schema part 2
*
*/
diff --git a/solr/src/java/org/apache/solr/schema/DoubleField.java b/solr/src/java/org/apache/solr/schema/DoubleField.java
index 80f5e988f62..c07f43d4703 100644
--- a/solr/src/java/org/apache/solr/schema/DoubleField.java
+++ b/solr/src/java/org/apache/solr/schema/DoubleField.java
@@ -30,7 +30,7 @@ import java.io.IOException;
import java.util.Map;
/**
- * @version $Id$
+ *
*/
public class DoubleField extends FieldType {
@Override
diff --git a/solr/src/java/org/apache/solr/schema/ExternalFileField.java b/solr/src/java/org/apache/solr/schema/ExternalFileField.java
index 2eb539426b8..90ce98d4ca1 100755
--- a/solr/src/java/org/apache/solr/schema/ExternalFileField.java
+++ b/solr/src/java/org/apache/solr/schema/ExternalFileField.java
@@ -51,7 +51,7 @@ import java.io.IOException;
*
The external file may be sorted or unsorted by the key field, but it will be substantially slower (untested) if it isn't sorted.
*
Fields of this type may currently only be used as a ValueSource in a FunctionQuery.
*
- * @version $Id$
+ *
*/
public class ExternalFileField extends FieldType {
private FieldType ftype;
diff --git a/solr/src/java/org/apache/solr/schema/FieldProperties.java b/solr/src/java/org/apache/solr/schema/FieldProperties.java
index c1cc519b1f8..07cbd148314 100644
--- a/solr/src/java/org/apache/solr/schema/FieldProperties.java
+++ b/solr/src/java/org/apache/solr/schema/FieldProperties.java
@@ -21,7 +21,7 @@ import java.util.Map;
import java.util.HashMap;
/**
- * @version $Id$
+ *
*
* @lucene.internal
*/
diff --git a/solr/src/java/org/apache/solr/schema/FieldType.java b/solr/src/java/org/apache/solr/schema/FieldType.java
index 325064bf9b7..43daec385bf 100644
--- a/solr/src/java/org/apache/solr/schema/FieldType.java
+++ b/solr/src/java/org/apache/solr/schema/FieldType.java
@@ -50,7 +50,7 @@ import java.util.Map;
/**
* Base class for all field types used by an index schema.
*
- * @version $Id$
+ *
*/
public abstract class FieldType extends FieldProperties {
public static final Logger log = LoggerFactory.getLogger(FieldType.class);
diff --git a/solr/src/java/org/apache/solr/schema/FloatField.java b/solr/src/java/org/apache/solr/schema/FloatField.java
index b7c7fbfbb96..4c9c46af0f1 100644
--- a/solr/src/java/org/apache/solr/schema/FloatField.java
+++ b/solr/src/java/org/apache/solr/schema/FloatField.java
@@ -29,7 +29,7 @@ import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
import java.io.IOException;
/**
- * @version $Id$
+ *
*/
public class FloatField extends FieldType {
@Override
diff --git a/solr/src/java/org/apache/solr/schema/IndexSchema.java b/solr/src/java/org/apache/solr/schema/IndexSchema.java
index 818f8d85a56..4fd106d25e0 100644
--- a/solr/src/java/org/apache/solr/schema/IndexSchema.java
+++ b/solr/src/java/org/apache/solr/schema/IndexSchema.java
@@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory;
* IndexSchema
contains information about the valid fields in an index
* and the types of those fields.
*
- * @version $Id$
+ *
*/
public final class IndexSchema {
public static final String DEFAULT_SCHEMA_FILE = "schema.xml";
diff --git a/solr/src/java/org/apache/solr/schema/IntField.java b/solr/src/java/org/apache/solr/schema/IntField.java
index 7b681e59dfc..3199ff8e1fd 100644
--- a/solr/src/java/org/apache/solr/schema/IntField.java
+++ b/solr/src/java/org/apache/solr/schema/IntField.java
@@ -29,7 +29,7 @@ import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
import java.io.IOException;
/**
- * @version $Id$
+ *
*/
public class IntField extends FieldType {
@Override
diff --git a/solr/src/java/org/apache/solr/schema/LongField.java b/solr/src/java/org/apache/solr/schema/LongField.java
index 239dc1f2a70..7c0d2ac8f29 100644
--- a/solr/src/java/org/apache/solr/schema/LongField.java
+++ b/solr/src/java/org/apache/solr/schema/LongField.java
@@ -29,7 +29,7 @@ import org.apache.solr.search.function.LongFieldSource;
import java.io.IOException;
import java.util.Map;
/**
- * @version $Id$
+ *
*/
public class LongField extends FieldType {
@Override
diff --git a/solr/src/java/org/apache/solr/schema/RandomSortField.java b/solr/src/java/org/apache/solr/schema/RandomSortField.java
index f5b1ee0a042..80353fd567c 100644
--- a/solr/src/java/org/apache/solr/schema/RandomSortField.java
+++ b/solr/src/java/org/apache/solr/schema/RandomSortField.java
@@ -59,7 +59,7 @@ import org.apache.solr.search.function.ValueSource;
*
* Note that multiple calls to the same URL will return the same sorting order.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class RandomSortField extends FieldType {
diff --git a/solr/src/java/org/apache/solr/schema/SchemaField.java b/solr/src/java/org/apache/solr/schema/SchemaField.java
index bb2d3e7a523..4425753f19d 100644
--- a/solr/src/java/org/apache/solr/schema/SchemaField.java
+++ b/solr/src/java/org/apache/solr/schema/SchemaField.java
@@ -31,7 +31,7 @@ import java.io.IOException;
/**
* Encapsulates all information about a Field in a Solr Schema
*
- * @version $Id$
+ *
*/
public final class SchemaField extends FieldProperties {
final String name;
diff --git a/solr/src/java/org/apache/solr/schema/SortableDoubleField.java b/solr/src/java/org/apache/solr/schema/SortableDoubleField.java
index 0a0d53a6fe1..e31a6719820 100644
--- a/solr/src/java/org/apache/solr/schema/SortableDoubleField.java
+++ b/solr/src/java/org/apache/solr/schema/SortableDoubleField.java
@@ -35,7 +35,7 @@ import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
import java.io.IOException;
/**
- * @version $Id$
+ *
*
* @deprecated use {@link DoubleField} or {@link TrieDoubleField} - will be removed in 5.x
*/
diff --git a/solr/src/java/org/apache/solr/schema/SortableFloatField.java b/solr/src/java/org/apache/solr/schema/SortableFloatField.java
index 876a5f9eede..d5a5315b1aa 100644
--- a/solr/src/java/org/apache/solr/schema/SortableFloatField.java
+++ b/solr/src/java/org/apache/solr/schema/SortableFloatField.java
@@ -35,7 +35,7 @@ import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
import java.io.IOException;
/**
- * @version $Id$
+ *
*
* @deprecated use {@link FloatField} or {@link TrieFloatField} - will be removed in 5.x
*/
diff --git a/solr/src/java/org/apache/solr/schema/SortableIntField.java b/solr/src/java/org/apache/solr/schema/SortableIntField.java
index 74f52f80b91..e13c2c3af07 100644
--- a/solr/src/java/org/apache/solr/schema/SortableIntField.java
+++ b/solr/src/java/org/apache/solr/schema/SortableIntField.java
@@ -35,7 +35,7 @@ import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
import java.io.IOException;
/**
- * @version $Id$
+ *
*
* @deprecated use {@link IntField} or {@link TrieIntField} - will be removed in 5.x
*/
diff --git a/solr/src/java/org/apache/solr/schema/SortableLongField.java b/solr/src/java/org/apache/solr/schema/SortableLongField.java
index 6a6e8b49ee2..78344312463 100644
--- a/solr/src/java/org/apache/solr/schema/SortableLongField.java
+++ b/solr/src/java/org/apache/solr/schema/SortableLongField.java
@@ -35,7 +35,7 @@ import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
import java.io.IOException;
/**
- * @version $Id$
+ *
*
* @deprecated use {@link LongField} or {@link TrieLongField} - will be removed in 5.x
*/
diff --git a/solr/src/java/org/apache/solr/schema/StrField.java b/solr/src/java/org/apache/solr/schema/StrField.java
index ae07be17121..c8d15aa3765 100644
--- a/solr/src/java/org/apache/solr/schema/StrField.java
+++ b/solr/src/java/org/apache/solr/schema/StrField.java
@@ -27,7 +27,7 @@ import org.apache.solr.search.QParser;
import java.util.Map;
import java.io.IOException;
/**
- * @version $Id$
+ *
*/
public class StrField extends FieldType {
@Override
diff --git a/solr/src/java/org/apache/solr/schema/TextField.java b/solr/src/java/org/apache/solr/schema/TextField.java
index 72782252dac..4fab9466972 100644
--- a/solr/src/java/org/apache/solr/schema/TextField.java
+++ b/solr/src/java/org/apache/solr/schema/TextField.java
@@ -43,7 +43,7 @@ import java.io.StringReader;
/** TextField
is the basic type for configurable text analysis.
* Analyzers for field types using this implementation should be defined in the schema.
- * @version $Id$
+ *
*/
public class TextField extends FieldType {
protected boolean autoGeneratePhraseQueries;
diff --git a/solr/src/java/org/apache/solr/schema/TrieField.java b/solr/src/java/org/apache/solr/schema/TrieField.java
index 608596a8dc7..8fbde52d84c 100644
--- a/solr/src/java/org/apache/solr/schema/TrieField.java
+++ b/solr/src/java/org/apache/solr/schema/TrieField.java
@@ -55,7 +55,7 @@ import java.util.Date;
* Note that if you use a precisionStep of 32 for int/float and 64 for long/double/date, then multiple terms will not be
* generated, range search will be no faster than any other number field, but sorting will still be possible.
*
- * @version $Id$
+ *
* @see org.apache.lucene.search.NumericRangeQuery
* @since solr 1.4
*/
diff --git a/solr/src/java/org/apache/solr/schema/UUIDField.java b/solr/src/java/org/apache/solr/schema/UUIDField.java
index f1bfa424bff..71da5615f34 100644
--- a/solr/src/java/org/apache/solr/schema/UUIDField.java
+++ b/solr/src/java/org/apache/solr/schema/UUIDField.java
@@ -33,7 +33,7 @@ import org.apache.solr.response.TextResponseWriter;
*
* @see UUID#toString
* @see UUID#randomUUID
- * @version $Id$
+ *
*/
public class UUIDField extends StrField {
private static final String NEW = "NEW";
diff --git a/solr/src/java/org/apache/solr/search/BitDocSet.java b/solr/src/java/org/apache/solr/search/BitDocSet.java
index d5cd85d6d2e..2ffe6f086dc 100644
--- a/solr/src/java/org/apache/solr/search/BitDocSet.java
+++ b/solr/src/java/org/apache/solr/search/BitDocSet.java
@@ -25,7 +25,7 @@ import org.apache.lucene.search.DocIdSetIterator;
* BitDocSet
represents an unordered set of Lucene Document Ids
* using a BitSet. A set bit represents inclusion in the set for that document.
*
- * @version $Id$
+ *
* @since solr 0.9
*/
public class BitDocSet extends DocSetBase {
diff --git a/solr/src/java/org/apache/solr/search/CacheConfig.java b/solr/src/java/org/apache/solr/search/CacheConfig.java
index 736b2d98724..f4dc05480c5 100644
--- a/solr/src/java/org/apache/solr/search/CacheConfig.java
+++ b/solr/src/java/org/apache/solr/search/CacheConfig.java
@@ -34,7 +34,7 @@ import javax.xml.xpath.XPathConstants;
* stored in the solrconfig.xml file, and implements a
* factory to create caches.
*
- * @version $Id$
+ *
*/
public class CacheConfig {
private String nodeName;
diff --git a/solr/src/java/org/apache/solr/search/CacheRegenerator.java b/solr/src/java/org/apache/solr/search/CacheRegenerator.java
index a72cab1ac5d..9c96c57d519 100644
--- a/solr/src/java/org/apache/solr/search/CacheRegenerator.java
+++ b/solr/src/java/org/apache/solr/search/CacheRegenerator.java
@@ -26,7 +26,7 @@ import java.io.IOException;
* Implementations should have a noarg constructor and be thread safe (a single instance will be
* used for all cache autowarmings).
*
- * @version $Id$
+ *
*/
public interface CacheRegenerator {
/**
diff --git a/solr/src/java/org/apache/solr/search/DisMaxQParser.java b/solr/src/java/org/apache/solr/search/DisMaxQParser.java
index f8398a1a63f..483340509d3 100644
--- a/solr/src/java/org/apache/solr/search/DisMaxQParser.java
+++ b/solr/src/java/org/apache/solr/search/DisMaxQParser.java
@@ -39,7 +39,7 @@ import java.util.Map;
*
* Note: This API is experimental and may change in non backward-compatible ways in the future
*
- * @version $Id$
+ *
*/
public class DisMaxQParser extends QParser {
diff --git a/solr/src/java/org/apache/solr/search/DocIterator.java b/solr/src/java/org/apache/solr/search/DocIterator.java
index 0481562cf7b..299a6261116 100644
--- a/solr/src/java/org/apache/solr/search/DocIterator.java
+++ b/solr/src/java/org/apache/solr/search/DocIterator.java
@@ -27,7 +27,7 @@ import java.util.Iterator;
* DocIterator instance was retrieved.
*
*
- * @version $Id$
+ *
*/
public interface DocIterator extends Iterator {
// already declared in superclass, redeclaring prevents javadoc inheritance
diff --git a/solr/src/java/org/apache/solr/search/DocList.java b/solr/src/java/org/apache/solr/search/DocList.java
index eb70a3f34ad..b344e5f6cd0 100644
--- a/solr/src/java/org/apache/solr/search/DocList.java
+++ b/solr/src/java/org/apache/solr/search/DocList.java
@@ -23,7 +23,7 @@ package org.apache.solr.search;
* This list contains a subset of the complete list of documents actually matched: size()
* document ids starting at offset()
.
*
- * @version $Id$
+ *
* @since solr 0.9
*/
public interface DocList extends DocSet {
diff --git a/solr/src/java/org/apache/solr/search/DocListAndSet.java b/solr/src/java/org/apache/solr/search/DocListAndSet.java
index 7549a325289..c304c7732e6 100644
--- a/solr/src/java/org/apache/solr/search/DocListAndSet.java
+++ b/solr/src/java/org/apache/solr/search/DocListAndSet.java
@@ -28,7 +28,7 @@ package org.apache.solr.search;
* Oh, if only java had "out" parameters or multiple return args...
*
*
- * @version $Id$
+ *
* @since solr 0.9
*/
public final class DocListAndSet {
diff --git a/solr/src/java/org/apache/solr/search/DocSet.java b/solr/src/java/org/apache/solr/search/DocSet.java
index fcf8785cce4..dd69c976e7c 100644
--- a/solr/src/java/org/apache/solr/search/DocSet.java
+++ b/solr/src/java/org/apache/solr/search/DocSet.java
@@ -35,7 +35,7 @@ import java.io.IOException;
* a cache and could be shared.
*
*
- * @version $Id$
+ *
* @since solr 0.9
*/
public interface DocSet /* extends Collection */ {
diff --git a/solr/src/java/org/apache/solr/search/DocSetHitCollector.java b/solr/src/java/org/apache/solr/search/DocSetHitCollector.java
index 3caafa99727..3557eff71d4 100644
--- a/solr/src/java/org/apache/solr/search/DocSetHitCollector.java
+++ b/solr/src/java/org/apache/solr/search/DocSetHitCollector.java
@@ -25,7 +25,7 @@ import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import java.io.IOException;
/**
- * @version $Id$
+ *
*/
class DocSetCollector extends Collector {
diff --git a/solr/src/java/org/apache/solr/search/DocSlice.java b/solr/src/java/org/apache/solr/search/DocSlice.java
index 51fc6f12c3a..148ea6a7b64 100644
--- a/solr/src/java/org/apache/solr/search/DocSlice.java
+++ b/solr/src/java/org/apache/solr/search/DocSlice.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
/**
* DocSlice
implements DocList as an array of docids and optional scores.
*
- * @version $Id$
+ *
* @since solr 0.9
*/
public class DocSlice extends DocSetBase implements DocList {
diff --git a/solr/src/java/org/apache/solr/search/FastLRUCache.java b/solr/src/java/org/apache/solr/search/FastLRUCache.java
index 594f37f2b56..fabf07f7899 100644
--- a/solr/src/java/org/apache/solr/search/FastLRUCache.java
+++ b/solr/src/java/org/apache/solr/search/FastLRUCache.java
@@ -38,7 +38,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
*
* Also see SolrCaching
*
- * @version $Id$
+ *
* @see org.apache.solr.common.util.ConcurrentLRUCache
* @see org.apache.solr.search.SolrCache
* @since solr 1.4
diff --git a/solr/src/java/org/apache/solr/search/HashDocSet.java b/solr/src/java/org/apache/solr/search/HashDocSet.java
index d5dd5023261..691211c0895 100644
--- a/solr/src/java/org/apache/solr/search/HashDocSet.java
+++ b/solr/src/java/org/apache/solr/search/HashDocSet.java
@@ -26,7 +26,7 @@ import org.apache.lucene.util.BitUtil;
* in the set because it takes up less memory and is faster to iterate and take
* set intersections.
*
- * @version $Id$
+ *
* @since solr 0.9
*/
public final class HashDocSet extends DocSetBase {
diff --git a/solr/src/java/org/apache/solr/search/LRUCache.java b/solr/src/java/org/apache/solr/search/LRUCache.java
index 00f8379f7be..ca28444fe5d 100644
--- a/solr/src/java/org/apache/solr/search/LRUCache.java
+++ b/solr/src/java/org/apache/solr/search/LRUCache.java
@@ -29,7 +29,7 @@ import java.net.URL;
/**
- * @version $Id$
+ *
*/
public class LRUCache extends SolrCacheBase implements SolrCache {
diff --git a/solr/src/java/org/apache/solr/search/QParser.java b/solr/src/java/org/apache/solr/search/QParser.java
index 9b845e65d7e..9ae8f4dbd93 100755
--- a/solr/src/java/org/apache/solr/search/QParser.java
+++ b/solr/src/java/org/apache/solr/search/QParser.java
@@ -31,7 +31,7 @@ import java.util.*;
/**
* Note: This API is experimental and may change in non backward-compatible ways in the future
*
- * @version $Id$
+ *
*/
public abstract class QParser {
protected String qstr;
diff --git a/solr/src/java/org/apache/solr/search/QueryParsing.java b/solr/src/java/org/apache/solr/search/QueryParsing.java
index 4ee880c4f5b..66c5da7e278 100644
--- a/solr/src/java/org/apache/solr/search/QueryParsing.java
+++ b/solr/src/java/org/apache/solr/search/QueryParsing.java
@@ -54,7 +54,7 @@ import java.util.Map;
/**
* Collection of static utilities useful for query parsing.
*
- * @version $Id$
+ *
*/
public class QueryParsing {
public static final String OP = "q.op"; // the SolrParam used to override the QueryParser "default operator"
diff --git a/solr/src/java/org/apache/solr/search/QueryResultKey.java b/solr/src/java/org/apache/solr/search/QueryResultKey.java
index 7c1e080d7a4..679d3902d73 100644
--- a/solr/src/java/org/apache/solr/search/QueryResultKey.java
+++ b/solr/src/java/org/apache/solr/search/QueryResultKey.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.util.List;
/** A hash key encapsulating a query, a list of filters, and a sort
- * @version $Id$
+ *
*/
public final class QueryResultKey {
final Query query;
diff --git a/solr/src/java/org/apache/solr/search/QueryUtils.java b/solr/src/java/org/apache/solr/search/QueryUtils.java
index 931776cf491..f8cd6e9e4d6 100755
--- a/solr/src/java/org/apache/solr/search/QueryUtils.java
+++ b/solr/src/java/org/apache/solr/search/QueryUtils.java
@@ -25,7 +25,7 @@ import org.apache.lucene.search.MatchAllDocsQuery;
import java.util.List;
/**
- * @version $Id$
+ *
*/
public class QueryUtils {
diff --git a/solr/src/java/org/apache/solr/search/ReturnFields.java b/solr/src/java/org/apache/solr/search/ReturnFields.java
index 741c8d8b700..3b66b126aa6 100644
--- a/solr/src/java/org/apache/solr/search/ReturnFields.java
+++ b/solr/src/java/org/apache/solr/search/ReturnFields.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
/**
* A class representing the return fields
*
- * @version $Id$
+ *
* @since solr 4.0
*/
public class ReturnFields
diff --git a/solr/src/java/org/apache/solr/search/SolrCache.java b/solr/src/java/org/apache/solr/search/SolrCache.java
index a9154360cc2..2a870436b9c 100644
--- a/solr/src/java/org/apache/solr/search/SolrCache.java
+++ b/solr/src/java/org/apache/solr/search/SolrCache.java
@@ -28,7 +28,7 @@ import java.io.IOException;
/**
* Primary API for dealing with Solr's internal caches.
*
- * @version $Id$
+ *
*/
public interface SolrCache extends SolrInfoMBean {
public final static Logger log = LoggerFactory.getLogger(SolrCache.class);
diff --git a/solr/src/java/org/apache/solr/search/SolrFieldCacheMBean.java b/solr/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
index aa81b7b7205..82ef1f043c3 100644
--- a/solr/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
+++ b/solr/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
@@ -33,7 +33,7 @@ import org.apache.lucene.util.FieldCacheSanityChecker.Insanity;
/**
* A SolrInfoMBean that provides introspection of the Lucene FiledCache, this is NOT a cache that is manged by Solr.
*
- * @version $Id$
+ *
*/
public class SolrFieldCacheMBean implements SolrInfoMBean {
diff --git a/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
index ce9f31abb1c..f9f355b83e4 100644
--- a/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -54,7 +54,7 @@ import java.util.concurrent.atomic.AtomicLong;
* SolrIndexSearcher adds schema awareness and caching functionality
* over the lucene IndexSearcher.
*
- * @version $Id$
+ *
* @since solr 0.9
*/
public class SolrIndexSearcher extends IndexSearcher implements SolrInfoMBean {
diff --git a/solr/src/java/org/apache/solr/search/Sorting.java b/solr/src/java/org/apache/solr/search/Sorting.java
index e116b816778..325871c8d7a 100644
--- a/solr/src/java/org/apache/solr/search/Sorting.java
+++ b/solr/src/java/org/apache/solr/search/Sorting.java
@@ -22,7 +22,7 @@ import org.apache.lucene.search.*;
/**
* Extra lucene sorting utilities & convenience methods
*
- * @version $Id$
+ *
*
*/
diff --git a/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java b/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java
index 08ec2129a35..6362463d796 100644
--- a/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java
+++ b/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java
@@ -28,7 +28,7 @@ import java.util.Map;
* using getInts()
* and makes those values available as other numeric types, casting as needed. *
*
- * @version $Id$
+ *
*/
public class ByteFieldSource extends NumericFieldCacheSource {
diff --git a/solr/src/java/org/apache/solr/search/function/DocValues.java b/solr/src/java/org/apache/solr/search/function/DocValues.java
index fec021934a8..af71b15d3fb 100644
--- a/solr/src/java/org/apache/solr/search/function/DocValues.java
+++ b/solr/src/java/org/apache/solr/search/function/DocValues.java
@@ -27,7 +27,7 @@ import org.apache.solr.search.MutableValueFloat;
* Represents field values as different types.
* Normally created via a {@link ValueSource} for a particular field and reader.
*
- * @version $Id$
+ *
*/
// DocValues is distinct from ValueSource because
diff --git a/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java b/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java
index 789af74c6f4..0d206179ccb 100644
--- a/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java
+++ b/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java
@@ -33,7 +33,7 @@ import java.util.Map;
* using getFloats()
* and makes those values available as other numeric types, casting as needed.
*
- * @version $Id$
+ *
*/
public class DoubleFieldSource extends NumericFieldCacheSource {
diff --git a/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java b/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java
index df80cecae03..2dd1d8703ef 100644
--- a/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java
+++ b/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java
@@ -23,7 +23,7 @@ import org.apache.lucene.search.FieldCache;
* A base class for ValueSource implementations that retrieve values for
* a single field from the {@link org.apache.lucene.search.FieldCache}.
*
- * @version $Id$
+ *
*/
public abstract class FieldCacheSource extends ValueSource {
protected String field;
diff --git a/solr/src/java/org/apache/solr/search/function/FileFloatSource.java b/solr/src/java/org/apache/solr/search/function/FileFloatSource.java
index 3e25cd301c7..0a12d778c84 100755
--- a/solr/src/java/org/apache/solr/search/function/FileFloatSource.java
+++ b/solr/src/java/org/apache/solr/search/function/FileFloatSource.java
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
/**
* Obtains float field values from an external file.
- * @version $Id$
+ *
*/
public class FileFloatSource extends ValueSource {
diff --git a/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java b/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java
index 6158420616a..abcd6342f15 100644
--- a/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java
+++ b/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java
@@ -32,7 +32,7 @@ import org.apache.solr.search.MutableValueFloat;
* using getFloats()
* and makes those values available as other numeric types, casting as needed.
*
- * @version $Id$
+ *
*/
public class FloatFieldSource extends NumericFieldCacheSource {
diff --git a/solr/src/java/org/apache/solr/search/function/FunctionQuery.java b/solr/src/java/org/apache/solr/search/function/FunctionQuery.java
index beb43bc22ac..e7d4be011cb 100644
--- a/solr/src/java/org/apache/solr/search/function/FunctionQuery.java
+++ b/solr/src/java/org/apache/solr/search/function/FunctionQuery.java
@@ -34,7 +34,7 @@ import java.util.Map;
*
* Note: This API is experimental and may change in non backward-compatible ways in the future
*
- * @version $Id$
+ *
*/
public class FunctionQuery extends Query {
ValueSource func;
diff --git a/solr/src/java/org/apache/solr/search/function/IntFieldSource.java b/solr/src/java/org/apache/solr/search/function/IntFieldSource.java
index e2c94f95804..8f7a58039ea 100644
--- a/solr/src/java/org/apache/solr/search/function/IntFieldSource.java
+++ b/solr/src/java/org/apache/solr/search/function/IntFieldSource.java
@@ -32,7 +32,7 @@ import java.util.Map;
* Obtains int field values from the {@link org.apache.lucene.search.FieldCache}
* using getInts()
* and makes those values available as other numeric types, casting as needed. *
- * @version $Id$
+ *
*/
public class IntFieldSource extends NumericFieldCacheSource {
diff --git a/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java b/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java
index 58204c0f7cd..cbfafbd8f6e 100644
--- a/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java
+++ b/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java
@@ -29,7 +29,7 @@ import java.util.Map;
*
* Normally Used as an argument to a {@link FunctionQuery}
*
- * @version $Id$
+ *
*/
public class LinearFloatFunction extends ValueSource {
protected final ValueSource source;
diff --git a/solr/src/java/org/apache/solr/search/function/LongFieldSource.java b/solr/src/java/org/apache/solr/search/function/LongFieldSource.java
index 8e75f924512..03ff11e23b3 100644
--- a/solr/src/java/org/apache/solr/search/function/LongFieldSource.java
+++ b/solr/src/java/org/apache/solr/search/function/LongFieldSource.java
@@ -34,7 +34,7 @@ import java.util.Map;
* using getFloats()
* and makes those values available as other numeric types, casting as needed.
*
- * @version $Id$
+ *
*/
public class LongFieldSource extends NumericFieldCacheSource {
diff --git a/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java b/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java
index 710a00973a5..f7fde5cdd8b 100644
--- a/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java
+++ b/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java
@@ -22,7 +22,7 @@ import org.apache.lucene.search.cache.CachedArrayCreator;
/**
*
- * @version $Id$
+ *
*/
public abstract class NumericFieldCacheSource extends FieldCacheSource {
protected final CachedArrayCreator creator;
diff --git a/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java b/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java
index 8e188983d1d..f4ac6133597 100644
--- a/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java
+++ b/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java
@@ -42,7 +42,7 @@ import java.util.Map;
* WARNING: as of Solr 1.4, ord() and rord() can cause excess memory use since they must use a FieldCache entry
* at the top level reader, while sorting and function queries now use entries at the segment level. Hence sorting
* or using a different function query, in addition to ord()/rord() will double memory use.
- * @version $Id$
+ *
*/
public class OrdFieldSource extends ValueSource {
diff --git a/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java b/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java
index 1703c2f3dac..403f1b3d578 100755
--- a/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java
+++ b/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java
@@ -29,7 +29,7 @@ import java.util.Map;
*
* Normally Used as an argument to a {@link org.apache.solr.search.function.FunctionQuery}
*
- * @version $Id$
+ *
*/
public class RangeMapFloatFunction extends ValueSource {
protected final ValueSource source;
diff --git a/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java b/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java
index 430549c0e1c..b28ed88a7e6 100644
--- a/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java
+++ b/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java
@@ -39,7 +39,7 @@ import java.util.Map;
*
* @see FunctionQuery
*
- * @version $Id$
+ *
*/
public class ReciprocalFloatFunction extends ValueSource {
protected final ValueSource source;
diff --git a/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java b/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
index a7508ce8a35..3eba69a4359 100644
--- a/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
+++ b/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
@@ -43,7 +43,7 @@ import java.util.Map;
* at the top level reader, while sorting and function queries now use entries at the segment level. Hence sorting
* or using a different function query, in addition to ord()/rord() will double memory use.
*
- * @version $Id$
+ *
*/
public class ReverseOrdFieldSource extends ValueSource {
diff --git a/solr/src/java/org/apache/solr/search/function/ValueSource.java b/solr/src/java/org/apache/solr/search/function/ValueSource.java
index 5b4bd29c9d7..52189c05bf1 100644
--- a/solr/src/java/org/apache/solr/search/function/ValueSource.java
+++ b/solr/src/java/org/apache/solr/search/function/ValueSource.java
@@ -39,7 +39,7 @@ import java.util.Map;
*
* Often used when creating a {@link FunctionQuery}.
*
- * @version $Id$
+ *
*/
public abstract class ValueSource implements Serializable {
diff --git a/solr/src/java/org/apache/solr/update/AddUpdateCommand.java b/solr/src/java/org/apache/solr/update/AddUpdateCommand.java
index 6a02010bf43..a8599b47f5f 100644
--- a/solr/src/java/org/apache/solr/update/AddUpdateCommand.java
+++ b/solr/src/java/org/apache/solr/update/AddUpdateCommand.java
@@ -27,7 +27,7 @@ import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
/**
- * @version $Id$
+ *
*/
public class AddUpdateCommand extends UpdateCommand {
// optional id in "internal" indexed form... if it is needed and not supplied,
diff --git a/solr/src/java/org/apache/solr/update/CommitUpdateCommand.java b/solr/src/java/org/apache/solr/update/CommitUpdateCommand.java
index a6bdb39cd67..439bddb4d3a 100644
--- a/solr/src/java/org/apache/solr/update/CommitUpdateCommand.java
+++ b/solr/src/java/org/apache/solr/update/CommitUpdateCommand.java
@@ -20,7 +20,7 @@ package org.apache.solr.update;
import org.apache.solr.request.SolrQueryRequest;
/**
- * @version $Id$
+ *
*/
public class CommitUpdateCommand extends UpdateCommand {
public boolean optimize;
diff --git a/solr/src/java/org/apache/solr/update/DeleteUpdateCommand.java b/solr/src/java/org/apache/solr/update/DeleteUpdateCommand.java
index 79b865a62ea..adfd5ca2578 100644
--- a/solr/src/java/org/apache/solr/update/DeleteUpdateCommand.java
+++ b/solr/src/java/org/apache/solr/update/DeleteUpdateCommand.java
@@ -20,7 +20,7 @@ package org.apache.solr.update;
import org.apache.solr.request.SolrQueryRequest;
/**
- * @version $Id$
+ *
*/
public class DeleteUpdateCommand extends UpdateCommand {
public String id; // external (printable) id, for delete-by-id
diff --git a/solr/src/java/org/apache/solr/update/DocumentBuilder.java b/solr/src/java/org/apache/solr/update/DocumentBuilder.java
index a7b80e0ded8..3194dd7c72e 100644
--- a/solr/src/java/org/apache/solr/update/DocumentBuilder.java
+++ b/solr/src/java/org/apache/solr/update/DocumentBuilder.java
@@ -30,7 +30,7 @@ import org.apache.solr.common.SolrInputField;
import org.apache.solr.schema.*;
/**
- * @version $Id$
+ *
*/
diff --git a/solr/src/java/org/apache/solr/update/MergeIndexesCommand.java b/solr/src/java/org/apache/solr/update/MergeIndexesCommand.java
index 0eba124012f..412d2887083 100644
--- a/solr/src/java/org/apache/solr/update/MergeIndexesCommand.java
+++ b/solr/src/java/org/apache/solr/update/MergeIndexesCommand.java
@@ -24,7 +24,7 @@ import org.apache.solr.request.SolrQueryRequest;
* A merge indexes command encapsulated in an object.
*
* @since solr 1.4
- * @version $Id$
+ *
*/
public class MergeIndexesCommand extends UpdateCommand {
public Directory[] dirs;
diff --git a/solr/src/java/org/apache/solr/update/RollbackUpdateCommand.java b/solr/src/java/org/apache/solr/update/RollbackUpdateCommand.java
index 1dd12ae8bf0..1308c53fc1d 100644
--- a/solr/src/java/org/apache/solr/update/RollbackUpdateCommand.java
+++ b/solr/src/java/org/apache/solr/update/RollbackUpdateCommand.java
@@ -20,7 +20,7 @@ package org.apache.solr.update;
import org.apache.solr.request.SolrQueryRequest;
/**
- * @version $Id$
+ *
* @since Solr 1.4
*/
public class RollbackUpdateCommand extends UpdateCommand {
diff --git a/solr/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/src/java/org/apache/solr/update/SolrIndexConfig.java
index b65c500ac8e..d51e7053b81 100644
--- a/solr/src/java/org/apache/solr/update/SolrIndexConfig.java
+++ b/solr/src/java/org/apache/solr/update/SolrIndexConfig.java
@@ -36,7 +36,7 @@ import java.util.HashMap;
// This config object encapsulates IndexWriter config params.
//
/**
- * @version $Id$
+ *
*/
public class SolrIndexConfig {
public static final Logger log = LoggerFactory.getLogger(SolrIndexConfig.class);
diff --git a/solr/src/java/org/apache/solr/update/SolrIndexWriter.java b/solr/src/java/org/apache/solr/update/SolrIndexWriter.java
index 5ecb4998e2d..64ef16748d9 100644
--- a/solr/src/java/org/apache/solr/update/SolrIndexWriter.java
+++ b/solr/src/java/org/apache/solr/update/SolrIndexWriter.java
@@ -18,10 +18,8 @@
package org.apache.solr.update;
import org.apache.lucene.index.*;
-import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.store.*;
-import org.apache.lucene.util.Version;
import org.apache.solr.common.SolrException;
import org.apache.solr.core.DirectoryFactory;
import org.apache.solr.schema.IndexSchema;
@@ -30,7 +28,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -42,9 +39,8 @@ import java.util.Locale;
/**
* An IndexWriter that is configured via Solr config mechanisms.
*
-* @version $Id$
-* @since solr 0.9
-*/
+ * @since solr 0.9
+ */
public class SolrIndexWriter extends IndexWriter {
private static Logger log = LoggerFactory.getLogger(SolrIndexWriter.class);
diff --git a/solr/src/java/org/apache/solr/update/UpdateCommand.java b/solr/src/java/org/apache/solr/update/UpdateCommand.java
index 0e8f8bc1e07..215f0e2bc69 100644
--- a/solr/src/java/org/apache/solr/update/UpdateCommand.java
+++ b/solr/src/java/org/apache/solr/update/UpdateCommand.java
@@ -22,7 +22,7 @@ import org.apache.solr.request.SolrQueryRequest;
/** An index update command encapsulated in an object (Command pattern)
*
- * @version $Id$
+ *
*/
public class UpdateCommand {
protected final SolrQueryRequest req;
diff --git a/solr/src/java/org/apache/solr/update/UpdateHandler.java b/solr/src/java/org/apache/solr/update/UpdateHandler.java
index b90b80e11bd..a4f7eb071cc 100644
--- a/solr/src/java/org/apache/solr/update/UpdateHandler.java
+++ b/solr/src/java/org/apache/solr/update/UpdateHandler.java
@@ -42,7 +42,7 @@ import org.apache.solr.core.*;
* UpdateHandler
handles requests to change the index
* (adds, deletes, commits, optimizes, etc).
*
- * @version $Id$
+ *
* @since solr 0.9
*/
diff --git a/solr/src/java/org/apache/solr/util/BCDUtils.java b/solr/src/java/org/apache/solr/util/BCDUtils.java
index 2cd20cf2307..66c52d32430 100644
--- a/solr/src/java/org/apache/solr/util/BCDUtils.java
+++ b/solr/src/java/org/apache/solr/util/BCDUtils.java
@@ -19,7 +19,7 @@ package org.apache.solr.util;
/**
- * @version $Id$
+ *
*/
public class BCDUtils {
// idiv is expensive...
diff --git a/solr/src/java/org/apache/solr/util/DateMathParser.java b/solr/src/java/org/apache/solr/util/DateMathParser.java
index bb62e589115..81152139354 100644
--- a/solr/src/java/org/apache/solr/util/DateMathParser.java
+++ b/solr/src/java/org/apache/solr/util/DateMathParser.java
@@ -75,7 +75,7 @@ import java.util.regex.Pattern;
* inspecting the keySet of CALENDAR_UNITS
.
*
*
- * @version $Id$
+ *
*/
public class DateMathParser {
diff --git a/solr/src/java/org/apache/solr/util/NumberUtils.java b/solr/src/java/org/apache/solr/util/NumberUtils.java
index 2954a367eac..79c83b83926 100644
--- a/solr/src/java/org/apache/solr/util/NumberUtils.java
+++ b/solr/src/java/org/apache/solr/util/NumberUtils.java
@@ -20,7 +20,7 @@ package org.apache.solr.util;
import org.apache.lucene.util.BytesRef;
/**
- * @version $Id$
+ *
*/
public class NumberUtils {
diff --git a/solr/src/java/org/apache/solr/util/RefCounted.java b/solr/src/java/org/apache/solr/util/RefCounted.java
index 508fb01df90..6cd5abc610b 100644
--- a/solr/src/java/org/apache/solr/util/RefCounted.java
+++ b/solr/src/java/org/apache/solr/util/RefCounted.java
@@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger;
* is safe since the count can only hit zero if it's unregistered (and
* hence incref() will not be called again on it).
*
- * @version $Id$
+ *
*/
public abstract class RefCounted {
diff --git a/solr/src/java/org/apache/solr/util/SuggestMissingFactories.java b/solr/src/java/org/apache/solr/util/SuggestMissingFactories.java
index b8d06259594..013f6bc483c 100644
--- a/solr/src/java/org/apache/solr/util/SuggestMissingFactories.java
+++ b/solr/src/java/org/apache/solr/util/SuggestMissingFactories.java
@@ -35,7 +35,7 @@ import java.util.jar.*;
/**
* Given a list of Jar files, suggest missing analysis factories.
*
- * @version $Id$
+ *
*/
public class SuggestMissingFactories {
diff --git a/solr/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java b/solr/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
index f3488b448d9..635960cfe2e 100644
--- a/solr/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
+++ b/solr/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
@@ -33,7 +33,7 @@ import org.w3c.dom.NodeList;
/**
* An abstract super class that manages standard solr-style plugin configuration.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public abstract class AbstractPluginLoader
diff --git a/solr/src/java/org/apache/solr/util/plugin/MapInitializedPlugin.java b/solr/src/java/org/apache/solr/util/plugin/MapInitializedPlugin.java
index 933db38682d..c499f7033de 100644
--- a/solr/src/java/org/apache/solr/util/plugin/MapInitializedPlugin.java
+++ b/solr/src/java/org/apache/solr/util/plugin/MapInitializedPlugin.java
@@ -22,7 +22,7 @@ import java.util.Map;
/**
* A plugin that can be initialized with a Map
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public interface MapInitializedPlugin {
diff --git a/solr/src/java/org/apache/solr/util/plugin/MapPluginLoader.java b/solr/src/java/org/apache/solr/util/plugin/MapPluginLoader.java
index 6a7f55bbdea..3f284944ea8 100644
--- a/solr/src/java/org/apache/solr/util/plugin/MapPluginLoader.java
+++ b/solr/src/java/org/apache/solr/util/plugin/MapPluginLoader.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Node;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class MapPluginLoader extends AbstractPluginLoader
diff --git a/solr/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java b/solr/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java
index a3c6d3cdd39..ad8a533fd62 100644
--- a/solr/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java
+++ b/solr/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java
@@ -22,7 +22,7 @@ import org.apache.solr.common.util.NamedList;
/**
* A plugin that can be initialized with a NamedList
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public interface NamedListInitializedPlugin {
diff --git a/solr/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java b/solr/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java
index 2e064ca661f..13ad5fefaab 100644
--- a/solr/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java
+++ b/solr/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java
@@ -23,7 +23,7 @@ import org.apache.solr.common.util.DOMUtil;
import org.w3c.dom.Node;
/**
- * @version $Id$
+ *
* @since solr 1.3
*/
public class NamedListPluginLoader extends AbstractPluginLoader
diff --git a/solr/src/java/org/apache/solr/util/plugin/PluginInfoInitialized.java b/solr/src/java/org/apache/solr/util/plugin/PluginInfoInitialized.java
index 36e6e7568b3..2b2b020bc3f 100644
--- a/solr/src/java/org/apache/solr/util/plugin/PluginInfoInitialized.java
+++ b/solr/src/java/org/apache/solr/util/plugin/PluginInfoInitialized.java
@@ -21,7 +21,7 @@ import org.apache.solr.core.PluginInfo;
/**
* A plugin that can be initialized with a PluginInfo
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public interface PluginInfoInitialized {
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/ResponseParser.java b/solr/src/solrj/org/apache/solr/client/solrj/ResponseParser.java
index 5c028be83b1..90cd47db5dd 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/ResponseParser.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/ResponseParser.java
@@ -23,7 +23,7 @@ import org.apache.solr.common.util.NamedList;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public abstract class ResponseParser
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/SolrQuery.java b/solr/src/solrj/org/apache/solr/client/solrj/SolrQuery.java
index 20739fe4161..a7228f0da9d 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/SolrQuery.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/SolrQuery.java
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
* This is an augmented SolrParams with get/set/add fields for common fields used
* in the Standard and Dismax request handlers
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class SolrQuery extends ModifiableSolrParams
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/SolrRequest.java b/solr/src/solrj/org/apache/solr/client/solrj/SolrRequest.java
index e60df31a48b..8a6942c13f2 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/SolrRequest.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/SolrRequest.java
@@ -26,7 +26,7 @@ import org.apache.solr.common.util.ContentStream;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public abstract class SolrRequest implements Serializable
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/SolrResponse.java b/solr/src/solrj/org/apache/solr/client/solrj/SolrResponse.java
index aa89c741cf5..c6cb357e4f9 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/SolrResponse.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/SolrResponse.java
@@ -24,7 +24,7 @@ import org.apache.solr.common.util.NamedList;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public abstract class SolrResponse implements Serializable
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/SolrServer.java b/solr/src/solrj/org/apache/solr/client/solrj/SolrServer.java
index 72c6160af68..4f5f86fec1a 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/SolrServer.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/SolrServer.java
@@ -37,7 +37,7 @@ import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
/**
- * @version $Id$
+ *
* @since solr 1.3
*/
public abstract class SolrServer implements Serializable
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/SolrServerException.java b/solr/src/solrj/org/apache/solr/client/solrj/SolrServerException.java
index 67c46d92ddf..b8815096a02 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/SolrServerException.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/SolrServerException.java
@@ -19,7 +19,7 @@ package org.apache.solr.client.solrj;
/** Exception to catch all types of communication / parsing issues associated with talking to SOLR
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class SolrServerException extends Exception {
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java b/solr/src/solrj/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
index f01cb9dc17d..10096b52aea 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
@@ -29,7 +29,7 @@ import java.nio.ByteBuffer;
/**
* A class to map objects to and from solr documents.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class DocumentObjectBinder {
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/beans/Field.java b/solr/src/solrj/org/apache/solr/client/solrj/beans/Field.java
index 156fcef8723..b4beb68a896 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/beans/Field.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/beans/Field.java
@@ -24,7 +24,7 @@ import java.lang.annotation.Retention;
/**
- * @version $Id$
+ *
* @since solr 1.3
*/
@Target({FIELD, METHOD})
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java b/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java
index 37bf449a76c..0a5a01255ff 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java
@@ -30,7 +30,7 @@ import java.util.List;
/**
* A RequestWriter which writes requests in the javabin format
*
- * @version $Id$
+ *
* @see org.apache.solr.client.solrj.request.RequestWriter
* @since solr 1.4
*/
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryResponseParser.java b/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryResponseParser.java
index 13794601adb..7ac9294ff7a 100755
--- a/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryResponseParser.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryResponseParser.java
@@ -26,7 +26,7 @@ import java.io.InputStream;
import java.io.Reader;
/**
- * @version $Id$
+ *
* @since solr 1.3
*/
public class BinaryResponseParser extends ResponseParser {
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java b/solr/src/solrj/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java
index e9f795b0f8e..2f1c19a6c5b 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* The {@link CommonsHttpSolrServer} uses the Apache Commons HTTP Client to connect to solr.
* SolrServer server = new CommonsHttpSolrServer( url );
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class CommonsHttpSolrServer extends SolrServer
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/impl/StreamingBinaryResponseParser.java b/solr/src/solrj/org/apache/solr/client/solrj/impl/StreamingBinaryResponseParser.java
index b0b90864296..89708d7a342 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/impl/StreamingBinaryResponseParser.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/impl/StreamingBinaryResponseParser.java
@@ -32,7 +32,7 @@ import java.util.List;
* A BinaryResponseParser that sends callback events rather then build
* a large response
*
- * @version $Id: StreamingBinaryResponseParser.java 990180 2010-08-27 15:40:17Z rmuir $
+ *
* @since solr 4.0
*/
public class StreamingBinaryResponseParser extends BinaryResponseParser {
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java b/solr/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java
index 607480ed69f..206dd501b81 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
* it is only recommended to use the {@link StreamingUpdateSolrServer} with
* /update requests. The query interface is better suited for
*
- * @version $Id: CommonsHttpSolrServer.java 724175 2008-12-07 19:07:11Z ryan $
+ *
* @since solr 1.4
*/
public class StreamingUpdateSolrServer extends CommonsHttpSolrServer
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/impl/XMLResponseParser.java b/solr/src/solrj/org/apache/solr/client/solrj/impl/XMLResponseParser.java
index f75681f0118..d17b3e647fe 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/impl/XMLResponseParser.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/impl/XMLResponseParser.java
@@ -44,7 +44,7 @@ import org.apache.solr.common.util.XMLErrorLogger;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class XMLResponseParser extends ResponseParser
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.java b/solr/src/solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.java
index d1fe433dea3..2e8bfafbdf1 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.java
@@ -34,7 +34,7 @@ import org.apache.solr.common.util.ContentStream;
/**
* This class is experimental and subject to change.
- * @version $Id: CoreAdminRequest.java 606335 2007-12-21 22:23:39Z ryan $
+ *
* @since solr 1.3
*/
public class CoreAdminRequest extends SolrRequest
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/DirectXmlRequest.java b/solr/src/solrj/org/apache/solr/client/solrj/request/DirectXmlRequest.java
index 23964b65d50..8d0fdba49dd 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/request/DirectXmlRequest.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/request/DirectXmlRequest.java
@@ -31,7 +31,7 @@ import org.apache.solr.common.util.ContentStream;
/**
* Send arbitrary XML to a request handler
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class DirectXmlRequest extends SolrRequest
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java b/solr/src/solrj/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java
index 50f937c9191..56ba9466ddb 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java
@@ -36,7 +36,7 @@ import java.util.List;
/**
* A request for the org.apache.solr.handler.DocumentAnalysisRequestHandler.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class DocumentAnalysisRequest extends SolrRequest {
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java b/solr/src/solrj/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java
index edffe7e2d70..f17efa57321 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java
@@ -34,7 +34,7 @@ import java.util.List;
/**
* A request for the org.apache.solr.handler.DocumentAnalysisRequestHandler.
*
- * @version $Id$
+ *
* @since solr.14
*/
public class FieldAnalysisRequest extends SolrRequest {
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java b/solr/src/solrj/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
index 0f5842e632e..cbb8b81c033 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
@@ -33,7 +33,7 @@ import java.util.*;
* Provides methods for marshalling an UpdateRequest to a NamedList which can be serialized in the javabin format and
* vice versa.
*
- * @version $Id$
+ *
* @see org.apache.solr.common.util.JavaBinCodec
* @since solr 1.4
*/
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/LukeRequest.java b/solr/src/solrj/org/apache/solr/client/solrj/request/LukeRequest.java
index 31092039f44..1b575a0cb3c 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/request/LukeRequest.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/request/LukeRequest.java
@@ -33,7 +33,7 @@ import org.apache.solr.common.util.ContentStream;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class LukeRequest extends SolrRequest
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/QueryRequest.java b/solr/src/solrj/org/apache/solr/client/solrj/request/QueryRequest.java
index 48ce71ab8de..ed58c9f9e6e 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/request/QueryRequest.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/request/QueryRequest.java
@@ -29,7 +29,7 @@ import org.apache.solr.common.util.ContentStream;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class QueryRequest extends SolrRequest
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/RequestWriter.java b/solr/src/solrj/org/apache/solr/client/solrj/request/RequestWriter.java
index 63cd0c008ad..70d10d0a40c 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/request/RequestWriter.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/request/RequestWriter.java
@@ -33,7 +33,7 @@ import java.nio.charset.Charset;
*
* A subclass can override the methods in this class to supply a custom format in which a request can be sent.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class RequestWriter {
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/SolrPing.java b/solr/src/solrj/org/apache/solr/client/solrj/request/SolrPing.java
index 16c7e172c48..41062dcf205 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/request/SolrPing.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/request/SolrPing.java
@@ -29,7 +29,7 @@ import org.apache.solr.common.util.ContentStream;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class SolrPing extends SolrRequest
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/UpdateRequest.java b/solr/src/solrj/org/apache/solr/client/solrj/request/UpdateRequest.java
index 8038dcc28a6..8edef78b0df 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/request/UpdateRequest.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/request/UpdateRequest.java
@@ -34,7 +34,7 @@ import org.apache.solr.common.util.XML;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class UpdateRequest extends AbstractUpdateRequest {
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/AnalysisResponseBase.java b/solr/src/solrj/org/apache/solr/client/solrj/response/AnalysisResponseBase.java
index 55d87d4fbe8..097b0debf45 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/response/AnalysisResponseBase.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/response/AnalysisResponseBase.java
@@ -26,7 +26,7 @@ import java.util.Map;
/**
* A base class for all analysis responses.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class AnalysisResponseBase extends SolrResponseBase {
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/CoreAdminResponse.java b/solr/src/solrj/org/apache/solr/client/solrj/response/CoreAdminResponse.java
index 7034402c43d..639aa82918c 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/response/CoreAdminResponse.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/response/CoreAdminResponse.java
@@ -22,7 +22,7 @@ import org.apache.solr.common.util.NamedList;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class CoreAdminResponse extends SolrResponseBase
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java b/solr/src/solrj/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java
index f0d5dff787e..7f4bb4d574c 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java
@@ -28,7 +28,7 @@ import java.util.Map;
* A response that is returned by processing the {@link org.apache.solr.client.solrj.request.DocumentAnalysisRequest}.
* Holds a map of {@link DocumentAnalysis} objects by a document id (unique key).
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class DocumentAnalysisResponse extends AnalysisResponseBase implements Iterable> {
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/FacetField.java b/solr/src/solrj/org/apache/solr/client/solrj/response/FacetField.java
index bbfaa479e2a..6b653487344 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/response/FacetField.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/response/FacetField.java
@@ -28,7 +28,6 @@ import org.apache.solr.client.solrj.util.ClientUtils;
* A utility class to hold the facet response. It could use the NamedList container,
* but for JSTL, it is nice to have something that implements List so it can be iterated
*
- * @version $Id$
* @since solr 1.3
*/
public class FacetField implements Serializable
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java b/solr/src/solrj/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java
index e7343647db8..81259d74153 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java
@@ -27,7 +27,7 @@ import java.util.Map;
* A response that is returned by processing the {@link org.apache.solr.client.solrj.request.FieldAnalysisRequest}.
* Holds a map of {@link Analysis} objects per field name as well as a map of {@link Analysis} objects per field type.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class FieldAnalysisResponse extends AnalysisResponseBase {
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/FieldStatsInfo.java b/solr/src/solrj/org/apache/solr/client/solrj/response/FieldStatsInfo.java
index d0154c29698..c32cd1cdd37 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/response/FieldStatsInfo.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/response/FieldStatsInfo.java
@@ -27,7 +27,7 @@ import java.util.Map;
/**
* Holds stats info
*
- * @version $Id: SpellCheckResponse.java 693622 2008-09-09 21:21:06Z gsingers $
+ *
* @since solr 1.4
*/
public class FieldStatsInfo implements Serializable {
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/LukeResponse.java b/solr/src/solrj/org/apache/solr/client/solrj/response/LukeResponse.java
index 4e4877c0e1d..68f3be69ee5 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/response/LukeResponse.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/response/LukeResponse.java
@@ -27,7 +27,7 @@ import java.util.*;
/**
* This is an incomplete representation of the data returned from Luke
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class LukeResponse extends SolrResponseBase {
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java b/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java
index f1259d1ccbc..78883284ba6 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java
@@ -31,7 +31,7 @@ import org.apache.solr.client.solrj.beans.DocumentObjectBinder;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
@SuppressWarnings("unchecked")
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/SolrPingResponse.java b/solr/src/solrj/org/apache/solr/client/solrj/response/SolrPingResponse.java
index ad58878f835..4cdfc8d1bc2 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/response/SolrPingResponse.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/response/SolrPingResponse.java
@@ -19,7 +19,7 @@ package org.apache.solr.client.solrj.response;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class SolrPingResponse extends SolrResponseBase
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/SolrResponseBase.java b/solr/src/solrj/org/apache/solr/client/solrj/response/SolrResponseBase.java
index ed0908f7ddb..16f2cdc83cf 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/response/SolrResponseBase.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/response/SolrResponseBase.java
@@ -22,7 +22,7 @@ import org.apache.solr.common.util.NamedList;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class SolrResponseBase extends SolrResponse
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/SpellCheckResponse.java b/solr/src/solrj/org/apache/solr/client/solrj/response/SpellCheckResponse.java
index c5bb419ee87..238e3a74a0c 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/response/SpellCheckResponse.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/response/SpellCheckResponse.java
@@ -26,7 +26,7 @@ import java.util.Map;
/**
* Encapsulates responses from SpellCheckComponent
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class SpellCheckResponse {
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/UpdateResponse.java b/solr/src/solrj/org/apache/solr/client/solrj/response/UpdateResponse.java
index 028b313ad01..3f56a7dfbd4 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/response/UpdateResponse.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/response/UpdateResponse.java
@@ -21,7 +21,7 @@ package org.apache.solr.client.solrj.response;
/**
* TODO -- mostly a stub until we have a defined output format
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class UpdateResponse extends SolrResponseBase
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/util/ClientUtils.java b/solr/src/solrj/org/apache/solr/client/solrj/util/ClientUtils.java
index 50225340f4a..038d8a7a1ff 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/util/ClientUtils.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/util/ClientUtils.java
@@ -42,7 +42,7 @@ import org.apache.solr.common.util.*;
/**
* TODO? should this go in common?
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class ClientUtils
diff --git a/solr/src/test-framework/org/apache/solr/util/TestHarness.java b/solr/src/test-framework/org/apache/solr/util/TestHarness.java
index 4eee02b88cc..59f0f40082c 100644
--- a/solr/src/test-framework/org/apache/solr/util/TestHarness.java
+++ b/solr/src/test-framework/org/apache/solr/util/TestHarness.java
@@ -66,7 +66,7 @@ import java.util.Map;
* distribution, in order to encourage plugin writers to create unit
* tests for their plugins.
*
- * @version $Id$
+ *
*/
public class TestHarness {
protected CoreContainer container;
diff --git a/solr/src/test/org/apache/solr/TestDistributedSearch.java b/solr/src/test/org/apache/solr/TestDistributedSearch.java
index 9b31d391232..5ec3f352748 100755
--- a/solr/src/test/org/apache/solr/TestDistributedSearch.java
+++ b/solr/src/test/org/apache/solr/TestDistributedSearch.java
@@ -24,7 +24,7 @@ import org.apache.solr.common.params.CommonParams;
* http://docs.codehaus.org/display/JETTY/ServletTester
* rather then open a real connection?
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestDistributedSearch extends BaseDistributedSearchTestCase {
diff --git a/solr/src/test/org/apache/solr/TestPluginEnable.java b/solr/src/test/org/apache/solr/TestPluginEnable.java
index b390ddf37bb..454302f285e 100644
--- a/solr/src/test/org/apache/solr/TestPluginEnable.java
+++ b/solr/src/test/org/apache/solr/TestPluginEnable.java
@@ -23,7 +23,7 @@ import org.junit.Test;
/**
* Test disabling components
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class TestPluginEnable extends SolrTestCaseJ4 {
diff --git a/solr/src/test/org/apache/solr/TestSolrCoreProperties.java b/solr/src/test/org/apache/solr/TestSolrCoreProperties.java
index 28f6198420d..d85add266aa 100644
--- a/solr/src/test/org/apache/solr/TestSolrCoreProperties.java
+++ b/solr/src/test/org/apache/solr/TestSolrCoreProperties.java
@@ -33,7 +33,7 @@ import java.util.Properties;
/**
* Test for Loading core properties from a properties file
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class TestSolrCoreProperties extends LuceneTestCase {
diff --git a/solr/src/test/org/apache/solr/TestTrie.java b/solr/src/test/org/apache/solr/TestTrie.java
index 861c349b5fa..4637e031be2 100644
--- a/solr/src/test/org/apache/solr/TestTrie.java
+++ b/solr/src/test/org/apache/solr/TestTrie.java
@@ -32,7 +32,7 @@ import java.util.TimeZone;
/**
* Tests for TrieField functionality
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class TestTrie extends SolrTestCaseJ4 {
diff --git a/solr/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java b/solr/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java
index f9f8cca3f2a..409ab0ac8d6 100644
--- a/solr/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java
+++ b/solr/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java
@@ -28,7 +28,7 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer;
/**
- * @version $Id$
+ *
*/
public class TestPhoneticFilterFactory extends BaseTokenTestCase {
diff --git a/solr/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java b/solr/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java
index 955ed59feef..8e4f96f72f1 100644
--- a/solr/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java
+++ b/solr/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java
@@ -27,7 +27,7 @@ import org.apache.solr.common.SolrInputDocument;
import org.junit.Test;
/**
- * @version $Id$
+ *
* @since solr 1.3
*/
public abstract class LargeVolumeTestBase extends SolrJettyTestBase
diff --git a/solr/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java b/solr/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
index 3c6b2d13c45..b3361030009 100644
--- a/solr/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
+++ b/solr/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
@@ -30,7 +30,7 @@ import org.apache.solr.util.ExternalPaths;
* Abstract base class for testing merge indexes command
*
* @since solr 1.4
- * @version $Id$
+ *
*/
public abstract class MergeIndexesExampleTestBase extends SolrExampleTestBase {
// protected static final CoreContainer cores = new CoreContainer();
diff --git a/solr/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java b/solr/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
index 5a435d75acc..a25676a6d47 100644
--- a/solr/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
+++ b/solr/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
@@ -30,7 +30,7 @@ import org.junit.Test;
/**
- * @version $Id$
+ *
* @since solr 1.3
*/
public abstract class MultiCoreExampleTestBase extends SolrExampleTestBase
diff --git a/solr/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java b/solr/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
index 60fc20123e3..bba195fdc5d 100644
--- a/solr/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
+++ b/solr/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
@@ -25,7 +25,7 @@ import org.apache.solr.util.AbstractSolrTestCase;
*
* This lets us try various SolrServer implementations with the same tests.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
abstract public class SolrExampleTestBase extends AbstractSolrTestCase
diff --git a/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java b/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
index fe398730835..fc295b1d95f 100644
--- a/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
+++ b/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
@@ -58,7 +58,7 @@ import org.junit.Test;
*
* This lets us try various SolrServer implementations with the same tests.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
abstract public class SolrExampleTests extends SolrJettyTestBase
diff --git a/solr/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java b/solr/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java
index 25197812150..f7dc9400d77 100644
--- a/solr/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java
@@ -25,7 +25,7 @@ import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class SolrExceptionTest extends LuceneTestCase {
diff --git a/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java b/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java
index 69d7d37bb75..9c24c4d9c0c 100644
--- a/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java
@@ -24,7 +24,7 @@ import junit.framework.Assert;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class SolrQueryTest extends LuceneTestCase {
diff --git a/solr/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java b/solr/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java
index 69fb792a8e5..c4212df9639 100644
--- a/solr/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java
+++ b/solr/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java
@@ -33,7 +33,7 @@ import java.util.Iterator;
* Test for SOLR-1038
*
* @since solr 1.4
- * @version $Id$
+ *
*/
public class TestBatchUpdate extends SolrJettyTestBase {
diff --git a/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java b/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
index 75f4e341860..fed8e9d2d5b 100644
--- a/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
+++ b/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
@@ -41,7 +41,7 @@ import java.util.Set;
/**
* Test for LBHttpSolrServer
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class TestLBHttpSolrServer extends LuceneTestCase {
diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java b/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
index 161da30bd8a..dd8c47304dd 100644
--- a/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
@@ -34,7 +34,7 @@ import org.mortbay.jetty.servlet.HashSessionIdManager;
import org.mortbay.jetty.webapp.WebAppContext;
/**
- * @version $Id$
+ *
* @since solr 1.3
*/
public class JettyWebappTest extends LuceneTestCase
diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java b/solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java
index 59bf574b607..e0732fb0e8c 100644
--- a/solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java
@@ -27,7 +27,7 @@ import org.apache.solr.core.SolrCore;
* Test for merge indexes command
*
* @since solr 1.4
- * @version $Id$
+ *
*/
public class MergeIndexesEmbeddedTest extends MergeIndexesExampleTestBase {
diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java b/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java
index ede29c58afd..5c7952884f2 100644
--- a/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java
@@ -25,7 +25,7 @@ import org.apache.solr.client.solrj.SolrServer;
/**
* This runs SolrServer test using
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class MultiCoreEmbeddedTest extends MultiCoreExampleTestBase {
diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java b/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
index c15226c5f0f..10757670945 100644
--- a/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
* http://docs.codehaus.org/display/JETTY/ServletTester
* rather then open a real connection?
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class MultiCoreExampleJettyTest extends MultiCoreExampleTestBase {
diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java b/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java
index 6a569bc44d6..ab7d798be80 100644
--- a/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java
@@ -24,7 +24,7 @@ import org.junit.BeforeClass;
/**
* This runs SolrServer test using
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class SolrExampleEmbeddedTest extends SolrExampleTests {
diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java b/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
index a7747d09be8..511db090a5d 100644
--- a/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
@@ -27,7 +27,7 @@ import org.junit.BeforeClass;
/**
*
- * @version $Id: SolrExampleJettyTest.java 724175 2008-12-07 19:07:11Z ryan $
+ *
* @since solr 1.3
*/
public class SolrExampleStreamingTest extends SolrExampleTests {
diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java b/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
index 2f08b1de0f7..4df93f2d120 100644
--- a/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
+++ b/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
@@ -49,7 +49,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node;
/**
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestSolrProperties extends LuceneTestCase {
diff --git a/solr/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java b/solr/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
index 8059f5f36de..5c8a2df9947 100644
--- a/solr/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
+++ b/solr/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
@@ -37,7 +37,7 @@ import java.util.ArrayList;
* Test for UpdateRequestCodec
*
* @since solr 1.4
- * @version $Id$
+ *
* @see org.apache.solr.client.solrj.request.UpdateRequest
*/
public class TestUpdateRequestCodec extends LuceneTestCase {
diff --git a/solr/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java b/solr/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java
index e1856505e0c..b42adeee19c 100644
--- a/solr/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java
@@ -27,7 +27,7 @@ import java.util.List;
/**
* A Test case for the {@link AnalysisResponseBase} class.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
@SuppressWarnings("unchecked")
diff --git a/solr/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java b/solr/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java
index 5cbf67f0865..1c5d47e521a 100644
--- a/solr/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java
@@ -27,7 +27,7 @@ import java.util.List;
/**
* A test for the {@link DocumentAnalysisResponse} class.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class DocumentAnalysisResponseTest extends LuceneTestCase {
diff --git a/solr/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java b/solr/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java
index f6f62aaa2f9..12f61002104 100644
--- a/solr/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java
@@ -28,7 +28,7 @@ import java.util.List;
/**
* A test case for the {@link FieldAnalysisResponse} class.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
@SuppressWarnings("unchecked")
diff --git a/solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java b/solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java
index 7b11bf0f4ac..64e35ff2dad 100644
--- a/solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java
+++ b/solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java
@@ -34,7 +34,7 @@ import java.util.List;
/**
* Test for SpellCheckComponent's response in Solrj
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestSpellCheckResponse extends SolrJettyTestBase {
diff --git a/solr/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java b/solr/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java
index 7d2c297c8de..6b9c5e65665 100644
--- a/solr/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java
@@ -21,7 +21,7 @@ import org.apache.lucene.util.LuceneTestCase;
/**
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class ClientUtilsTest extends LuceneTestCase {
diff --git a/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java b/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java
index 68744e85c63..74c43b12ffa 100644
--- a/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java
+++ b/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java
@@ -26,7 +26,7 @@ import java.util.zip.GZIPOutputStream;
/**
* Test for FastInputStream.
*
- * @version $Id$
+ *
* @see org.apache.solr.common.util.FastInputStream
*/
public class TestFastInputStream extends LuceneTestCase {
diff --git a/solr/src/test/org/apache/solr/core/FakeDeletionPolicy.java b/solr/src/test/org/apache/solr/core/FakeDeletionPolicy.java
index 54a76ca854b..721b55f566c 100644
--- a/solr/src/test/org/apache/solr/core/FakeDeletionPolicy.java
+++ b/solr/src/test/org/apache/solr/core/FakeDeletionPolicy.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.util.List;
/**
- * @version $Id$
+ *
*/
public class FakeDeletionPolicy implements IndexDeletionPolicy, NamedListInitializedPlugin {
diff --git a/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java b/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
index fe5557347a7..104c5edeedd 100644
--- a/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
+++ b/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
@@ -39,7 +39,7 @@ import org.junit.Test;
import org.xml.sax.SAXException;
/**
- * @version $Id$
+ *
*/
public class TestArbitraryIndexDir extends AbstractSolrTestCase{
diff --git a/solr/src/test/org/apache/solr/core/TestJmxIntegration.java b/solr/src/test/org/apache/solr/core/TestJmxIntegration.java
index 3977c4a1e94..9e27ddc1370 100644
--- a/solr/src/test/org/apache/solr/core/TestJmxIntegration.java
+++ b/solr/src/test/org/apache/solr/core/TestJmxIntegration.java
@@ -31,7 +31,7 @@ import java.util.Hashtable;
/**
* Test for JMX Integration
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestJmxIntegration extends AbstractSolrTestCase {
diff --git a/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java b/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
index ff91adeb41b..e69e074fbbc 100644
--- a/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
+++ b/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
@@ -38,7 +38,7 @@ import java.util.Set;
/**
* Test for JmxMonitoredMap
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class TestJmxMonitoredMap extends LuceneTestCase {
diff --git a/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java b/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java
index 29f2f5d8cf2..cd02ca298df 100644
--- a/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java
+++ b/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import java.util.Map;
/**
- * @version $Id$
+ *
*/
public class TestSolrDeletionPolicy1 extends SolrTestCaseJ4 {
diff --git a/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java b/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java
index 61ac85ae1be..cadf084773e 100644
--- a/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java
+++ b/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java
@@ -21,7 +21,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
/**
- * @version $Id$
+ *
*/
public class TestSolrDeletionPolicy2 extends SolrTestCaseJ4 {
@BeforeClass
diff --git a/solr/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java b/solr/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java
index c46c2751134..feb827e0a34 100644
--- a/solr/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java
+++ b/solr/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java
@@ -23,7 +23,7 @@ import org.apache.solr.common.util.NamedList;
/**
* A base class for all analysis request handler tests.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public abstract class AnalysisRequestHandlerTestBase extends SolrTestCaseJ4 {
diff --git a/solr/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java b/solr/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java
index 1753d77cb84..cddf4946ec0 100644
--- a/solr/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java
+++ b/solr/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java
@@ -40,7 +40,7 @@ import java.io.Reader;
/**
* A test for {@link DocumentAnalysisRequestHandler}.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class DocumentAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestBase {
diff --git a/solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java b/solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
index 2443a9b1489..da11b5f1d6a 100644
--- a/solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
+++ b/solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
@@ -35,7 +35,7 @@ import java.util.List;
/**
* A test for {@link FieldAnalysisRequestHandler}.
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class FieldAnalysisRequestHandlerTest extends AnalysisRequestHandlerTestBase {
diff --git a/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java
index ca75ff98c9f..c0df70e7659 100644
--- a/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java
+++ b/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java
@@ -50,7 +50,7 @@ import java.util.HashMap;
/**
* Test for ReplicationHandler
*
- * @version $Id$
+ *
* @since 1.4
*/
public class TestReplicationHandler extends SolrTestCaseJ4 {
diff --git a/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java b/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
index ed0edbb97b6..73efb4b908e 100644
--- a/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
+++ b/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
@@ -25,7 +25,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;
* Test for SpellCheckComponent's distributed querying
*
* @since solr 1.5
- * @version $Id$
+ *
* @see org.apache.solr.handler.component.SpellCheckComponent
*/
public class DistributedSpellCheckComponentTest extends BaseDistributedSearchTestCase {
diff --git a/solr/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java b/solr/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java
index bcf91c268d3..89f3b660a0f 100644
--- a/solr/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java
+++ b/solr/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java
@@ -22,7 +22,7 @@ import org.apache.solr.BaseDistributedSearchTestCase;
/**
* Test for TermsComponent distributed querying
*
- * @version $Id$
+ *
* @since solr 1.5
*/
public class DistributedTermsComponentTest extends BaseDistributedSearchTestCase {
diff --git a/solr/src/test/org/apache/solr/request/TestBinaryResponseWriter.java b/solr/src/test/org/apache/solr/request/TestBinaryResponseWriter.java
index 703a7e121b5..2215501a2ca 100644
--- a/solr/src/test/org/apache/solr/request/TestBinaryResponseWriter.java
+++ b/solr/src/test/org/apache/solr/request/TestBinaryResponseWriter.java
@@ -33,7 +33,7 @@ import java.util.UUID;
/**
* Test for BinaryResponseWriter
*
- * @version $Id$
+ *
* @since solr 1.4
*/
public class TestBinaryResponseWriter extends AbstractSolrTestCase {
diff --git a/solr/src/test/org/apache/solr/request/TestFaceting.java b/solr/src/test/org/apache/solr/request/TestFaceting.java
index 140de82e14a..89acdaf18a1 100755
--- a/solr/src/test/org/apache/solr/request/TestFaceting.java
+++ b/solr/src/test/org/apache/solr/request/TestFaceting.java
@@ -30,7 +30,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
/**
- * @version $Id$
+ *
*/
public class TestFaceting extends SolrTestCaseJ4 {
@BeforeClass
diff --git a/solr/src/test/org/apache/solr/search/TestDocSet.java b/solr/src/test/org/apache/solr/search/TestDocSet.java
index 1e8d1377ee8..e643b8b1cf4 100644
--- a/solr/src/test/org/apache/solr/search/TestDocSet.java
+++ b/solr/src/test/org/apache/solr/search/TestDocSet.java
@@ -35,7 +35,7 @@ import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
/**
- * @version $Id$
+ *
*/
public class TestDocSet extends LuceneTestCase {
Random rand = random;
diff --git a/solr/src/test/org/apache/solr/search/TestFastLRUCache.java b/solr/src/test/org/apache/solr/search/TestFastLRUCache.java
index 2d226fbab0f..0637c29c650 100644
--- a/solr/src/test/org/apache/solr/search/TestFastLRUCache.java
+++ b/solr/src/test/org/apache/solr/search/TestFastLRUCache.java
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger;
/**
* Test for FastLRUCache
*
- * @version $Id$
+ *
* @see org.apache.solr.search.FastLRUCache
* @since solr 1.4
*/
diff --git a/solr/src/test/org/apache/solr/search/TestQueryUtils.java b/solr/src/test/org/apache/solr/search/TestQueryUtils.java
index 3143431cc5e..4904d9ba3e7 100755
--- a/solr/src/test/org/apache/solr/search/TestQueryUtils.java
+++ b/solr/src/test/org/apache/solr/search/TestQueryUtils.java
@@ -27,7 +27,7 @@ import org.apache.solr.util.AbstractSolrTestCase;
import java.util.List;
/**
- * @version $Id$
+ *
*/
public class TestQueryUtils extends AbstractSolrTestCase {
diff --git a/solr/src/test/org/apache/solr/search/TestSearchPerf.java b/solr/src/test/org/apache/solr/search/TestSearchPerf.java
index 57e0d86d5f8..36afad063b1 100755
--- a/solr/src/test/org/apache/solr/search/TestSearchPerf.java
+++ b/solr/src/test/org/apache/solr/search/TestSearchPerf.java
@@ -31,7 +31,7 @@ import java.util.*;
import java.io.IOException;
/**
- * @version $Id$
+ *
*/
public class TestSearchPerf extends AbstractSolrTestCase {
diff --git a/solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java b/solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java
index b6efa9fb8e6..4cbebf91b1c 100644
--- a/solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java
+++ b/solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java
@@ -29,7 +29,7 @@ import java.util.Collection;
/**
* Test for SpellingQueryConverter
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class SpellingQueryConverterTest extends LuceneTestCase {
diff --git a/solr/src/test/org/apache/solr/util/BitSetPerf.java b/solr/src/test/org/apache/solr/util/BitSetPerf.java
index 2836ccc0057..f7324f4dbf7 100644
--- a/solr/src/test/org/apache/solr/util/BitSetPerf.java
+++ b/solr/src/test/org/apache/solr/util/BitSetPerf.java
@@ -28,7 +28,7 @@ import org.apache.lucene.util.OpenBitSetIterator;
* is at least 10 seconds for better accuracy. Close browsers on your system (javascript
* or flash may be running and cause more erratic results).
*
- * @version $Id$
+ *
*/
public class BitSetPerf {
static Random rand = new Random(0);
diff --git a/solr/src/test/org/apache/solr/util/TestUtils.java b/solr/src/test/org/apache/solr/util/TestUtils.java
index e1279e572e1..cf33955266f 100755
--- a/solr/src/test/org/apache/solr/util/TestUtils.java
+++ b/solr/src/test/org/apache/solr/util/TestUtils.java
@@ -28,7 +28,7 @@ import org.apache.solr.common.util.StrUtils;
import org.junit.Assert;
/**
- * @version $Id$
+ *
*/
public class TestUtils extends LuceneTestCase {
public void testSplitEscaping() {
diff --git a/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java b/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
index 95ce0fc44d7..dbae78cbdc6 100644
--- a/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
+++ b/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
@@ -56,7 +56,7 @@ import org.apache.solr.servlet.SolrRequestParsers;
* TODO -- this implementation sends the response to XML and then parses it.
* It *should* be able to convert the response directly into a named list.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public class EmbeddedSolrServer extends SolrServer
diff --git a/solr/src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java b/solr/src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java
index 28943a9df97..0ec4a902dda 100644
--- a/solr/src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java
+++ b/solr/src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java
@@ -48,7 +48,7 @@ import org.apache.solr.schema.IndexSchema;
* This class is designed to be as simple as possible and allow for more flexibility
* in how you interface to Solr.
*
- * @version $Id$
+ *
* @since solr 1.2
*/
public class DirectSolrConnection
diff --git a/solr/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java b/solr/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java
index e8996e26346..01e58eb9066 100644
--- a/solr/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java
+++ b/solr/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java
@@ -32,7 +32,7 @@ import java.util.logging.Logger;
/**
* Admin JDK Logger level report and selection servlet.
*
- * @version $Id$
+ *
* @since solr 1.3
*/
public final class LogLevelSelection extends HttpServlet {