Merge branch 'release/1.2'

# Conflicts:
#	lib/T2011-2013/activation.jar
#	lib/T2011-2013/antlr.jar
#	lib/T2011-2013/aopalliance.jar
#	lib/T2011-2013/apache-mime4j-core-0.7.2.jar
#	lib/T2011-2013/apache-mime4j-dom-0.7.2.jar
#	lib/T2011-2013/asm-3.1.jar
#	lib/T2011-2013/bcmail-jdk15-1.45.jar
#	lib/T2011-2013/bcprov-jdk15-1.45.jar
#	lib/T2011-2013/boilerpipe-1.1.0.jar
#	lib/T2011-2013/commons-beanutils-1.7.0.jar
#	lib/T2011-2013/commons-collections.jar
#	lib/T2011-2013/commons-dbcp.jar
#	lib/T2011-2013/commons-fileupload.jar
#	lib/T2011-2013/commons-io.jar
#	lib/T2011-2013/commons-pool.jar
#	lib/T2011-2013/dom4j-1.6.1.jar
#	lib/T2011-2013/dom4j.jar
#	lib/T2011-2013/easylicense.jar
#	lib/T2011-2013/fontbox-1.8.1.jar
#	lib/T2011-2013/hibernate-commons-annotations.jar
#	lib/T2011-2013/hibernate-core.jar
#	lib/T2011-2013/hibernate-entitymanager.jar
#	lib/T2011-2013/hibernate-jpa-2.0-api.jar
#	lib/T2011-2013/hsqldb.jar
#	lib/T2011-2013/httpclient-4.2.3.jar
#	lib/T2011-2013/httpcore-4.2.2.jar
#	lib/T2011-2013/httpmime-4.2.3.jar
#	lib/T2011-2013/icu4j-49.1.jar
#	lib/T2011-2013/isoparser-1.0-RC-1.jar
#	lib/T2011-2013/jackson-core-asl.jar
#	lib/T2011-2013/javassist.jar
#	lib/T2011-2013/jaxb-api.jar
#	lib/T2011-2013/jaxb-impl.jar
#	lib/T2011-2013/jboss-logging.jar
#	lib/T2011-2013/jboss-transaction-api_1.1_spec.jar
#	lib/T2011-2013/jcl-over-slf4j.jar
#	lib/T2011-2013/jdbcpool.jar
#	lib/T2011-2013/jdom-1.0.jar
#	lib/T2011-2013/jempbox-1.8.1.jar
#	lib/T2011-2013/jersey-core.jar
#	lib/T2011-2013/jersey-json.jar
#	lib/T2011-2013/jersey-server.jar
#	lib/T2011-2013/jettison.jar
#	lib/T2011-2013/jsoup-1.6.2.jar
#	lib/T2011-2013/jsr311-api.jar
#	lib/T2011-2013/jta.jar
#	lib/T2011-2013/jul-to-slf4j-1.6.6.jar
#	lib/T2011-2013/juniversalchardet-1.0.3.jar
#	lib/T2011-2013/logback-classic.jar
#	lib/T2011-2013/logback-core.jar
#	lib/T2011-2013/lucene-analyzers-icu-4.4.0.jar
#	lib/T2011-2013/lucene-analyzers-morfologik-4.4.0.jar
#	lib/T2011-2013/lucene-analyzers-smartcn-4.4.0.jar
#	lib/T2011-2013/lucene-analyzers-stempel-4.4.0.jar
#	lib/T2011-2013/metadata-extractor-2.6.2.jar
#	lib/T2011-2013/netcdf-4.2-min.jar
#	lib/T2011-2013/noggit-0.5.jar
#	lib/T2011-2013/pdfbox-1.8.1.jar
#	lib/T2011-2013/persistence-api.jar
#	lib/T2011-2013/poi-3.9.jar
#	lib/T2011-2013/poi-ooxml-3.9.jar
#	lib/T2011-2013/poi-ooxml-schemas-3.9.jar
#	lib/T2011-2013/poi-scratchpad-3.9.jar
#	lib/T2011-2013/rome-0.9.jar
#	lib/T2011-2013/serializer.jar
#	lib/T2011-2013/si4t-solr.jar
#	lib/T2011-2013/si4t.jar
#	lib/T2011-2013/slf4j-api.jar
#	lib/T2011-2013/solr-analysis-extras-4.4.0.jar
#	lib/T2011-2013/solr-cell-4.4.0.jar
#	lib/T2011-2013/solr-clustering-4.4.0.jar
#	lib/T2011-2013/solr-core-4.4.0.jar
#	lib/T2011-2013/solr-dataimporthandler-4.4.0.jar
#	lib/T2011-2013/solr-dataimporthandler-extras-4.4.0.jar
#	lib/T2011-2013/solr-langid-4.4.0.jar
#	lib/T2011-2013/solr-solrj-4.4.0.jar
#	lib/T2011-2013/solr-test-framework-4.4.0.jar
#	lib/T2011-2013/solr-uima-4.4.0.jar
#	lib/T2011-2013/solr-velocity-4.4.0.jar
#	lib/T2011-2013/spring-aop.jar
#	lib/T2011-2013/spring-asm.jar
#	lib/T2011-2013/spring-beans.jar
#	lib/T2011-2013/spring-context-support.jar
#	lib/T2011-2013/spring-context.jar
#	lib/T2011-2013/spring-core.jar
#	lib/T2011-2013/spring-expression.jar
#	lib/T2011-2013/spring-jdbc.jar
#	lib/T2011-2013/spring-orm.jar
#	lib/T2011-2013/spring-tx.jar
#	lib/T2011-2013/sqljdbc4.jar
#	lib/T2011-2013/stax-api.jar
#	lib/T2011-2013/tagsoup-1.2.1.jar
#	lib/T2011-2013/tika-core-1.4.jar
#	lib/T2011-2013/tika-parsers-1.4.jar
#	lib/T2011-2013/tridion-storage-search-extension-1.1.jar
#	lib/T2011-2013/velocity-1.7.jar
#	lib/T2011-2013/velocity-tools-2.0.jar
#	lib/T2011-2013/vorbis-java-core-0.1.jar
#	lib/T2011-2013/vorbis-java-tika-0.1.jar
#	lib/T2011-2013/wstx-asl-3.2.7.jar
#	lib/T2011-2013/xalan.jar
#	lib/T2011-2013/xercesImpl-2.9.1.jar
#	lib/T2011-2013/xmlbeans-2.3.0.jar
#	lib/T2011-2013/xz-1.0.jar
#	lib/T2011-2013/zookeeper-3.4.5.jar

Author: RaimondKempees

README.md

@@ -6,22 +6,39 @@
 
     <groupId>org.si4t</groupId>
     <artifactId>si4t-solr</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.2</version>
+    <properties>
+        <solrj.version>4.10.2</solrj.version>
+        <si4t.version>1.2</si4t.version>
+        <tridion.version>8.1.0</tridion.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.5.1</version>
+                <inherited>true</inherited>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>org.si4t</groupId>
-            <artifactId>si4t</artifactId>
-            <version>1.0</version>
+            <artifactId>si4t-se</artifactId>
+            <version>${si4t.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-solrj</artifactId>
-            <version>4.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.solr</groupId>
-            <artifactId>solr-core</artifactId>
-            <version>4.4.0</version>
+            <version>${solrj.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -36,12 +53,25 @@
         <dependency>
             <groupId>com.tridion</groupId>
             <artifactId>cd_model</artifactId>
-            <version>7.1.0</version>
+            <version>${tridion.version}</version>
         </dependency>
         <dependency>
             <groupId>com.tridion</groupId>
             <artifactId>cd_core</artifactId>
-            <version>7.1.0</version>
+            <version>${tridion.version}</version>
+        </dependency>
+        <!-- Web 8 new -->
+
+        <dependency>
+            <groupId>com.tridion</groupId>
+            <artifactId>cd_common_util</artifactId>
+            <version>${tridion.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.tridion</groupId>
+            <artifactId>cd_common_config_legacy</artifactId>
+            <version>${tridion.version}</version>
         </dependency>
     </dependencies>
     <packaging>jar</packaging>

dist/si4t-solr-1.2.jar

@@ -20,8 +20,6 @@
  * DispatcherAction.
  * 
  * @author R.S. Kempees
- * @version 1.20
- * @since 1.00
  */
 public enum DispatcherAction
 {

lib/T2011-2013/activation.jar

@@ -16,16 +16,14 @@
 
 package org.si4t.solr;
 
-import java.util.ArrayList;
-
 import org.apache.solr.common.SolrInputDocument;
 
+import java.util.ArrayList;
+
 /**
  * DispatcherPackage.
  * 
  * @author R.S. Kempees
- * @version 1.20
- * @since 1.00
  */
 public class DispatcherPackage
 {

lib/T2011-2013/antlr.jar

@@ -20,15 +20,14 @@
  * SolrClientRequest.
  * 
  * @author R.S. Kempees
- * @version 1.20
- * @since 1.00
  */
 public class SolrClientRequest
 {
 	private String searcherId;
 	private String solrHome;
 	private String solrCore;
 	private String solrUrl;
+	@Deprecated
 	private ServerMode serverMode;
 
 	public SolrClientRequest(String searcherId, String solrHome, String solrCore, String solrUrl, ServerMode serverMode)
@@ -85,12 +84,14 @@ public ServerMode getServerMode()
 		return serverMode;
 	}
 
+	@Deprecated
 	public void setServerMode(ServerMode serverMode)
 	{
 		this.serverMode = serverMode;
 	}
 
-	public static enum ServerMode
+	@Deprecated
+	public enum ServerMode
 	{
 		EMBEDDED,
 		HTTP;