Browse Source

[livy] Move the relocations into the assembly to fix tests

Erick Tryzelaar 10 years ago
parent
commit
962948c639

+ 14 - 0
apps/spark/java/livy-assembly/pom.xml

@@ -84,6 +84,20 @@
                           </excludes>
                           </excludes>
                       </filter>
                       </filter>
                   </filters>
                   </filters>
+
+                  <relocations>
+                      <relocation>
+                          <pattern>org.eclipse.jetty</pattern>
+                          <shadedPattern>com.cloudera.hue.jetty</shadedPattern>
+                          <excludes>
+                              <exclude>com/google/common/base/Absent*</exclude>
+                              <exclude>com/google/common/base/Function*</exclude>
+                              <exclude>com/google/common/base/Optional*</exclude>
+                              <exclude>com/google/common/base/Present*</exclude>
+                              <exclude>com/google/common/base/Supplier</exclude>
+                          </excludes>
+                      </relocation>
+                  </relocations>
               </configuration>
               </configuration>
 
 
               <executions>
               <executions>

+ 1 - 0
apps/spark/java/livy-server/pom.xml

@@ -167,6 +167,7 @@
                         <spark.driver.allowMultipleContexts>true</spark.driver.allowMultipleContexts>
                         <spark.driver.allowMultipleContexts>true</spark.driver.allowMultipleContexts>
                         <spark.ui.enabled>false</spark.ui.enabled>
                         <spark.ui.enabled>false</spark.ui.enabled>
                         <settings.usejavacp.value>true</settings.usejavacp.value>
                         <settings.usejavacp.value>true</settings.usejavacp.value>
+                        <livy.assembly.jar>../livy-repl/target/livy-repl_${scala.binary.version}-${project.version}.jar</livy.assembly.jar>
                     </systemProperties>
                     </systemProperties>
                 </configuration>
                 </configuration>
             </plugin>
             </plugin>

+ 0 - 13
apps/spark/java/pom.xml

@@ -428,19 +428,6 @@
                             <include>com.google.guava:guava</include>
                             <include>com.google.guava:guava</include>
                         </includes>
                         </includes>
                     </artifactSet>
                     </artifactSet>
-                    <relocations>
-                        <relocation>
-                            <pattern>org.eclipse.jetty</pattern>
-                            <shadedPattern>com.cloudera.hue.jetty</shadedPattern>
-                            <excludes>
-                                <exclude>com/google/common/base/Absent*</exclude>
-                                <exclude>com/google/common/base/Function*</exclude>
-                                <exclude>com/google/common/base/Optional*</exclude>
-                                <exclude>com/google/common/base/Present*</exclude>
-                                <exclude>com/google/common/base/Supplier</exclude>
-                            </excludes>
-                        </relocation>
-                    </relocations>
                 </configuration>
                 </configuration>
                 <executions>
                 <executions>
                     <execution>
                     <execution>