diff --git a/pom.xml b/pom.xml
index e8e9d736da9bd..2d0b294f66a81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2615,7 +2615,7 @@
kubernetes
- resource-managers/kubernetes/core
+ resource-managers/kubernetes
diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml
index f9711d8c81b4b..59a6cdfb5bc1a 100644
--- a/resource-managers/kubernetes/core/pom.xml
+++ b/resource-managers/kubernetes/core/pom.xml
@@ -19,9 +19,9 @@
4.0.0
org.apache.spark
- spark-parent_2.11
+ spark-kubernetes-parent_2.11
2.2.0-k8s-0.5.0
- ../../../pom.xml
+ ../pom.xml
spark-kubernetes_2.11
@@ -39,6 +39,64 @@
${project.version}
+
+
+ org.eclipse.jetty
+ jetty-plus
+ compile
+
+
+ org.eclipse.jetty
+ jetty-security
+ compile
+
+
+ org.eclipse.jetty
+ jetty-util
+ compile
+
+
+ org.eclipse.jetty
+ jetty-server
+ compile
+
+
+ org.eclipse.jetty
+ jetty-http
+ compile
+
+
+ org.eclipse.jetty
+ jetty-continuation
+ compile
+
+
+ org.eclipse.jetty
+ jetty-servlet
+ compile
+
+
+ org.eclipse.jetty
+ jetty-proxy
+ compile
+
+
+ org.eclipse.jetty
+ jetty-client
+ compile
+
+
+ org.eclipse.jetty
+ jetty-servlets
+ compile
+
+
+ javax.servlet
+ javax.servlet-api
+ ${javaxservlet.version}
+
+
org.apache.spark
spark-core_${scala.binary.version}
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 @@
4.0.0
org.apache.spark
- spark-parent_2.11
+ spark-kubernetes-parent_2.11
2.2.0-k8s-0.5.0
- ../../../pom.xml
+ ../pom.xml
spark-docker-minimal-bundle_2.11
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 @@
4.0.0
org.apache.spark
- spark-parent_2.11
+ spark-kubernetes-parent_2.11
2.2.0-k8s-0.5.0
- ../../../pom.xml
+ ../pom.xml
spark-kubernetes-integration-tests-spark-jobs_2.11
diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml
index b91c239b6abe7..3d8cbd47bc808 100644
--- a/resource-managers/kubernetes/integration-tests/pom.xml
+++ b/resource-managers/kubernetes/integration-tests/pom.xml
@@ -19,13 +19,14 @@
4.0.0
org.apache.spark
- spark-parent_2.11
+ spark-kubernetes-parent_2.11
2.2.0-k8s-0.5.0
- ../../../pom.xml
+ ../pom.xml
spark-kubernetes-integration-tests_2.11
+ ${project.basedir}/../../..
kubernetes-integration-tests
jar
@@ -56,6 +57,14 @@
test-jar
test
+
+
+ org.eclipse.jetty
+ jetty-servlet
+ ${jetty.version}
+
org.apache.spark
spark-kubernetes-integration-tests-spark-jobs_${scala.binary.version}
@@ -220,6 +229,51 @@
+
+ copy-integration-bin
+ pre-integration-test
+
+ copy-resources
+
+
+ ${project.build.directory}/docker/bin
+
+
+ ${root.src.folder}/bin
+
+
+
+
+
+ copy-integration-sbin
+ pre-integration-test
+
+ copy-resources
+
+
+ ${project.build.directory}/docker/sbin
+
+
+ ${root.src.folder}/sbin
+
+
+
+
+
+ copy-integration-conf
+ pre-integration-test
+
+ copy-resources
+
+
+ ${project.build.directory}/docker/conf
+
+
+ ${root.src.folder}/conf
+
+
+
+
copy-integration-python
pre-integration-test
@@ -230,10 +284,10 @@
${project.build.directory}/docker/python
- ${project.parent.basedir}/python
+ ${root.src.folder}/python
- ${project.parent.basedir}/python/.egg
- ${project.parent.basedir}/python/dist
+ ${root.src.folder}/python/.egg
+ ${root.src.folder}/python/dist
@@ -249,7 +303,7 @@
${project.build.directory}/docker/R
- ${project.parent.basedir}/R
+ ${root.src.folder}/R
@@ -264,7 +318,7 @@
${project.build.directory}/docker/data
- ${project.parent.basedir}/data
+ ${root.src.folder}/data
true
@@ -280,7 +334,7 @@
${project.build.directory}/docker/licenses
- ${project.parent.basedir}/licenses
+ ${root.src.folder}/licenses
true
@@ -296,7 +350,7 @@
${project.build.directory}/docker/examples/jars
- ${project.parent.basedir}/examples/target/scala-2.11/jars
+ ${root.src.folder}/examples/target/scala-2.11/jars
true
@@ -312,7 +366,7 @@
${project.build.directory}/docker/examples/src/main
- ${project.parent.basedir}/examples/src/main
+ ${root.src.folder}/examples/src/main
true
@@ -337,6 +391,30 @@
+
+ bin-chmod
+ pre-integration-test
+
+
+
+
+
+
+ run
+
+
+
+ sbin-chmod
+ pre-integration-test
+
+
+
+
+
+
+ run
+
+
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 @@
+
+
+
+ 4.0.0
+
+ org.apache.spark
+ spark-parent_2.11
+ 2.2.0-k8s-0.5.0
+ ../../pom.xml
+
+
+ spark-kubernetes-parent_2.11
+ pom
+ Spark Project Kubernetes Parent
+
+
+ core
+ docker-minimal-bundle
+ integration-tests
+ integration-tests-spark-jobs
+ integration-tests-spark-jobs-helpers
+
+
+
+ target/scala-${scala.binary.version}/classes
+ target/scala-${scala.binary.version}/test-classes
+
+
+