Merge branch 'release-1.1.2-rc'

Conflicts:
	docs/pom.xml
	perf/pom.xml
	pom.xml
	sensei-core/pom.xml
	sensei-gateways/pom.xml
	sensei-hadoop-indexing/pom.xml
	sensei-parent/pom.xml
	sensei-war/pom.xml

Author: alperez

pom.xml

@@ -30,6 +30,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-deploy-plugin</artifactId>
+                <version>2.7</version>
 				<configuration>
 					<skip>true</skip> <!-- No need to deploy the reactor -->
 				</configuration>

sensei-core/pom.xml

@@ -41,6 +41,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
+                <version>2.1.2</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -53,6 +54,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8.1</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -64,6 +66,7 @@
 			</plugin>
 			<plugin>
 		      <artifactId>maven-dependency-plugin</artifactId>
+              <version>2.4</version>
 		      <executions>
 		         <execution>
 		         <phase>package</phase>
@@ -115,6 +118,7 @@
             <plugin>
               <groupId>org.codehaus.mojo</groupId>
               <artifactId>build-helper-maven-plugin</artifactId>
+              <version>1.7</version>
               <executions>
                 <execution>
                   <id>add-source</id>
@@ -177,12 +181,6 @@
         </exclusions> 
 		</dependency>
 
-		<dependency>
-			<groupId>com.linkedin.zoie</groupId>
-			<artifactId>zoie-core</artifactId>
-			<version>3.1.2-SNAPSHOT</version>
-		</dependency>
-		
 		<dependency>
 			<groupId>com.linkedin.zoie</groupId>
 			<artifactId>zoie-jms</artifactId>
@@ -238,7 +236,6 @@
 			<groupId>com.browseengine.bobo</groupId>
 			<artifactId>bobo-browse</artifactId>
 			<version>3.0.5-SNAPSHOT</version>
-			<type>jar</type>
 		</dependency>
 
 		<dependency>

sensei-core/src/main/java/com/senseidb/conf/SenseiFacetHandlerBuilder.java

@@ -293,6 +293,11 @@ public String getName()
 	    {
 	      return name;
 	    }
+
+        @Override
+        public boolean isLoadLazily() {
+            return false;
+        }
 	  };
 	}
 
@@ -456,6 +461,11 @@ public String getName() {
         return name;
       }
 
+      @Override
+      public boolean isLoadLazily() {
+          return false;
+      }
+
       @Override
       public  RuntimeFacetHandler<?> get(FacetHandlerInitializerParam params) {
         long overrideNow = -1;

sensei-core/src/test/java/com/senseidb/test/plugin/MockRuntimeFacetHandlerFactory.java

@@ -17,4 +17,9 @@ public RuntimeFacetHandler<?> get(FacetHandlerInitializerParam params) {
     return null;
   }
 
+  @Override
+  public boolean isLoadLazily() {
+      return false;
+  }
+
 }

sensei-gateways/pom.xml

@@ -38,6 +38,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
+                <version>2.1.2</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -50,6 +51,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8.1</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -61,6 +63,7 @@
 			</plugin>
 			<plugin>
 		      <artifactId>maven-dependency-plugin</artifactId>
+              <version>2.4</version>
 		      <executions>
 		         <execution>
 		         <phase>package</phase>
@@ -120,13 +123,13 @@
 			<groupId>org.apache.kafka</groupId>
 			<artifactId>kafka</artifactId>
 			<version>0.7.6</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../lib/kafka-0.7.6.jar</systemPath>
-      <exclusions>
+			<!-- scope>system</scope -->
+			<!-- systemPath>${basedir}/../lib/kafka-0.7.6.jar</systemPath -->
+      <!-- exclusions>
         <exclusion> 
           <groupId>zkclient</groupId>
         </exclusion>
-      </exclusions>
+      </exclusions -->
 		</dependency>
 
 		<dependency>

sensei-parent/pom.xml

@@ -9,11 +9,11 @@
 	<description>sensei search</description>
 	<url>http://www.senseidb.com/</url>
 
-	<parent>
+	<!-- parent>
 		<groupId>org.sonatype.oss</groupId>
 		<artifactId>oss-parent</artifactId>
 		<version>6</version>
-	</parent>
+	</parent -->
 
 	<inceptionYear>2010</inceptionYear>