From 41450edb5ad5005c065e23d220088d5584ba3515 Mon Sep 17 00:00:00 2001
From: Eric Charles <eric@datalayer.io>
Date: Tue, 5 Dec 2017 10:56:12 +0100
Subject: [PATCH 1/6] add jetty dep

---
 resource-managers/kubernetes/core/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml
index f9711d8c81b4b..b7d27f5e5043c 100644
--- a/resource-managers/kubernetes/core/pom.xml
+++ b/resource-managers/kubernetes/core/pom.xml
@@ -39,6 +39,15 @@
       <version>${project.version}</version>
     </dependency>
 
+    <!--
+      jetty scope is defined as `provided` in parent pom.
+    -->
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_${scala.binary.version}</artifactId>

From 360cbbc8e9a9fdb72211824bfd2b92d2055c513f Mon Sep 17 00:00:00 2001
From: Eric Charles <eric@datalayer.io>
Date: Fri, 8 Dec 2017 09:54:04 +0100
Subject: [PATCH 2/6] Add kubernete-parent pom hierarchy

---
 resource-managers/kubernetes/core/pom.xml     | 13 +-----
 .../kubernetes/docker-minimal-bundle/pom.xml  |  4 +-
 .../integration-tests-spark-jobs/pom.xml      |  4 +-
 .../kubernetes/integration-tests/pom.xml      | 12 ++++-
 resource-managers/kubernetes/pom.xml          | 44 +++++++++++++++++++
 5 files changed, 60 insertions(+), 17 deletions(-)
 create mode 100644 resource-managers/kubernetes/pom.xml

diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml
index b7d27f5e5043c..7528c2ca14492 100644
--- a/resource-managers/kubernetes/core/pom.xml
+++ b/resource-managers/kubernetes/core/pom.xml
@@ -19,9 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.spark</groupId>
-    <artifactId>spark-parent_2.11</artifactId>
+    <artifactId>spark-kubernetes-parent_2.11</artifactId>
     <version>2.2.0-k8s-0.5.0</version>
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>spark-kubernetes_2.11</artifactId>
@@ -39,15 +39,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <!--
-      jetty scope is defined as `provided` in parent pom.
-    -->
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_${scala.binary.version}</artifactId>
diff --git a/resource-managers/kubernetes/docker-minimal-bundle/pom.xml b/resource-managers/kubernetes/docker-minimal-bundle/pom.xml
index 202fe7c0dc3db..605c7e96b8d0c 100644
--- a/resource-managers/kubernetes/docker-minimal-bundle/pom.xml
+++ b/resource-managers/kubernetes/docker-minimal-bundle/pom.xml
@@ -20,9 +20,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.spark</groupId>
-    <artifactId>spark-parent_2.11</artifactId>
+    <artifactId>spark-kubernetes-parent_2.11</artifactId>
     <version>2.2.0-k8s-0.5.0</version>
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>spark-docker-minimal-bundle_2.11</artifactId>
diff --git a/resource-managers/kubernetes/integration-tests-spark-jobs/pom.xml b/resource-managers/kubernetes/integration-tests-spark-jobs/pom.xml
index d71d8c0a65fe8..5e395f573907c 100644
--- a/resource-managers/kubernetes/integration-tests-spark-jobs/pom.xml
+++ b/resource-managers/kubernetes/integration-tests-spark-jobs/pom.xml
@@ -19,9 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.spark</groupId>
-    <artifactId>spark-parent_2.11</artifactId>
+    <artifactId>spark-kubernetes-parent_2.11</artifactId>
     <version>2.2.0-k8s-0.5.0</version>
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>spark-kubernetes-integration-tests-spark-jobs_2.11</artifactId>
diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml
index b91c239b6abe7..14a820d4a1e26 100644
--- a/resource-managers/kubernetes/integration-tests/pom.xml
+++ b/resource-managers/kubernetes/integration-tests/pom.xml
@@ -19,9 +19,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.spark</groupId>
-    <artifactId>spark-parent_2.11</artifactId>
+    <artifactId>spark-kubernetes-parent_2.11</artifactId>
     <version>2.2.0-k8s-0.5.0</version>
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>spark-kubernetes-integration-tests_2.11</artifactId>
@@ -56,6 +56,14 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <!--
+      jetty scope is defined as `provided` in parent pom.
+    -->
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-kubernetes-integration-tests-spark-jobs_${scala.binary.version}</artifactId>
diff --git a/resource-managers/kubernetes/pom.xml b/resource-managers/kubernetes/pom.xml
new file mode 100644
index 0000000000000..76ae33b5ae0f0
--- /dev/null
+++ b/resource-managers/kubernetes/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.spark</groupId>
+    <artifactId>spark-parent_2.11</artifactId>
+    <version>2.2.0-k8s-0.5.0</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>spark-kubernetes-parent_2.11</artifactId>
+  <packaging>pom</packaging>
+  <name>Spark Project Kubernetes Parent</name>
+
+  <modules>
+    <module>core</module>
+    <module>docker-minimal-bundle</module>
+    <module>integration-tests</module>
+    <module>integration-tests-spark-jobs</module>
+    <module>integration-tests-spark-jobs-helpers</module>
+  </modules>
+
+  <build>
+    <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
+    <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
+  </build>
+
+</project>

From a10beed8a1260cc393150e41aa60d52c384403d7 Mon Sep 17 00:00:00 2001
From: Eric Charles <eric@datalayer.io>
Date: Sat, 9 Dec 2017 14:18:56 +0100
Subject: [PATCH 3/6] kubernets parent pom

---
 .../kubernetes/integration-tests/pom.xml      | 62 ++++++++++++++++---
 1 file changed, 54 insertions(+), 8 deletions(-)

diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml
index 14a820d4a1e26..f279066cc0054 100644
--- a/resource-managers/kubernetes/integration-tests/pom.xml
+++ b/resource-managers/kubernetes/integration-tests/pom.xml
@@ -26,6 +26,7 @@
 
   <artifactId>spark-kubernetes-integration-tests_2.11</artifactId>
   <properties>
+    <root.src.folder>${project.basedir}/../../..</root.src.folder>
     <sbt.project.name>kubernetes-integration-tests</sbt.project.name>
   </properties>
   <packaging>jar</packaging>
@@ -228,6 +229,51 @@
               </resources>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-integration-bin</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/docker/bin</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${root.src.folder}/bin</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-integration-sbin</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/docker/sbin</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${root.src.folder}/sbin</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-integration-conf</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/docker/conf</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${root.src.folder}/conf</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
           <execution>
               <id>copy-integration-python</id>
               <phase>pre-integration-test</phase>
@@ -238,10 +284,10 @@
                   <outputDirectory>${project.build.directory}/docker/python</outputDirectory>
                   <resources>
                       <resource>
-                          <directory>${project.parent.basedir}/python</directory>
+                          <directory>${root.src.folder}/python</directory>
                           <excludes>
-                            <exclude>${project.parent.basedir}/python/.egg</exclude>
-                            <exclude>${project.parent.basedir}/python/dist</exclude>
+                            <exclude>${root.src.folder}/python/.egg</exclude>
+                            <exclude>${root.src.folder}/python/dist</exclude>
                           </excludes>
                       </resource>
                   </resources>
@@ -257,7 +303,7 @@
               <outputDirectory>${project.build.directory}/docker/R</outputDirectory>
               <resources>
                 <resource>
-                  <directory>${project.parent.basedir}/R</directory>
+                  <directory>${root.src.folder}/R</directory>
                 </resource>
               </resources>
             </configuration>
@@ -272,7 +318,7 @@
               <outputDirectory>${project.build.directory}/docker/data</outputDirectory>
               <resources>
                 <resource>
-                  <directory>${project.parent.basedir}/data</directory>
+                  <directory>${root.src.folder}/data</directory>
                   <filtering>true</filtering>
                 </resource>
               </resources>
@@ -288,7 +334,7 @@
               <outputDirectory>${project.build.directory}/docker/licenses</outputDirectory>
               <resources>
                 <resource>
-                  <directory>${project.parent.basedir}/licenses</directory>
+                  <directory>${root.src.folder}/licenses</directory>
                   <filtering>true</filtering>
                 </resource>
               </resources>
@@ -304,7 +350,7 @@
               <outputDirectory>${project.build.directory}/docker/examples/jars</outputDirectory>
               <resources>
                 <resource>
-                  <directory>${project.parent.basedir}/examples/target/scala-2.11/jars</directory>
+                  <directory>${root.src.folder}/examples/target/scala-2.11/jars</directory>
                   <filtering>true</filtering>
                 </resource>
               </resources>
@@ -320,7 +366,7 @@
               <outputDirectory>${project.build.directory}/docker/examples/src/main</outputDirectory>
               <resources>
                 <resource>
-                  <directory>${project.parent.basedir}/examples/src/main</directory>
+                  <directory>${root.src.folder}/examples/src/main</directory>
                   <filtering>true</filtering>
                 </resource>
               </resources>

From fb5dafdd4b22ef1244462ac6b716232507bcd932 Mon Sep 17 00:00:00 2001
From: Eric Charles <eric@datalayer.io>
Date: Sun, 10 Dec 2017 07:05:32 +0100
Subject: [PATCH 4/6] add jetty deps to k8s core module

---
 resource-managers/kubernetes/core/pom.xml | 58 +++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml
index 7528c2ca14492..59a6cdfb5bc1a 100644
--- a/resource-managers/kubernetes/core/pom.xml
+++ b/resource-managers/kubernetes/core/pom.xml
@@ -39,6 +39,64 @@
       <version>${project.version}</version>
     </dependency>
 
+    <!-- Jetty dependencies promoted to compile here so they are shaded
+     and inlined into spark-core jar -->
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-plus</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-continuation</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-proxy</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-client</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlets</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>${javaxservlet.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_${scala.binary.version}</artifactId>

From 3beb42edd71e232c2e64f633fc11579e0938c850 Mon Sep 17 00:00:00 2001
From: Eric Charles <eric@datalayer.io>
Date: Sun, 10 Dec 2017 07:06:35 +0100
Subject: [PATCH 5/6] make the bins and sbin executables, mvn copy does not
 keep the file attributes

---
 .../kubernetes/integration-tests/pom.xml      | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml
index f279066cc0054..3d8cbd47bc808 100644
--- a/resource-managers/kubernetes/integration-tests/pom.xml
+++ b/resource-managers/kubernetes/integration-tests/pom.xml
@@ -391,6 +391,30 @@
               </target>
             </configuration>
           </execution>
+          <execution>
+            <id>bin-chmod</id>
+            <phase>pre-integration-test</phase>
+            <configuration>
+              <target>
+                <chmod file="${project.build.directory}/docker/bin/*" perm="755"/>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>sbin-chmod</id>
+            <phase>pre-integration-test</phase>
+            <configuration>
+              <target>
+                <chmod file="${project.build.directory}/docker/sbin/*" perm="755"/>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
       <plugin>

From 3f4875bc98860c50df4b54d5ab1c000902e8611d Mon Sep 17 00:00:00 2001
From: Eric Charles <eric@datalayer.io>
Date: Mon, 15 Oct 2018 17:31:05 +0200
Subject: [PATCH 6/6] build kubernes parent

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e8e9d736da9bd..2d0b294f66a81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2615,7 +2615,7 @@
     <profile>
       <id>kubernetes</id>
       <modules>
-        <module>resource-managers/kubernetes/core</module>
+        <module>resource-managers/kubernetes</module>
       </modules>
     </profile>