Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.

Commit 360cbbc

Browse files
echarlesecharles
committed
Add kubernete-parent pom hierarchy
1 parent 41450ed commit 360cbbc

File tree

5 files changed

+60
-17
lines changed

5 files changed

+60
-17
lines changed

‎resource-managers/kubernetes/core/pom.xml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<modelVersion>4.0.0</modelVersion>
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
22-
<artifactId>spark-parent_2.11</artifactId>
22+
<artifactId>spark-kubernetes-parent_2.11</artifactId>
2323
<version>2.2.0-k8s-0.5.0</version>
24-
<relativePath>../../../pom.xml</relativePath>
24+
<relativePath>../pom.xml</relativePath>
2525
</parent>
2626

2727
<artifactId>spark-kubernetes_2.11</artifactId>
@@ -39,15 +39,6 @@
3939
<version>${project.version}</version>
4040
</dependency>
4141

42-
<!--
43-
jetty scope is defined as `provided` in parent pom.
44-
-->
45-
<dependency>
46-
<groupId>org.eclipse.jetty</groupId>
47-
<artifactId>jetty-servlet</artifactId>
48-
<version>${jetty.version}</version>
49-
</dependency>
50-
5142
<dependency>
5243
<groupId>org.apache.spark</groupId>
5344
<artifactId>spark-core_${scala.binary.version}</artifactId>

‎resource-managers/kubernetes/docker-minimal-bundle/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
<modelVersion>4.0.0</modelVersion>
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
23-
<artifactId>spark-parent_2.11</artifactId>
23+
<artifactId>spark-kubernetes-parent_2.11</artifactId>
2424
<version>2.2.0-k8s-0.5.0</version>
25-
<relativePath>../../../pom.xml</relativePath>
25+
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

2828
<artifactId>spark-docker-minimal-bundle_2.11</artifactId>

‎resource-managers/kubernetes/integration-tests-spark-jobs/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<modelVersion>4.0.0</modelVersion>
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
22-
<artifactId>spark-parent_2.11</artifactId>
22+
<artifactId>spark-kubernetes-parent_2.11</artifactId>
2323
<version>2.2.0-k8s-0.5.0</version>
24-
<relativePath>../../../pom.xml</relativePath>
24+
<relativePath>../pom.xml</relativePath>
2525
</parent>
2626

2727
<artifactId>spark-kubernetes-integration-tests-spark-jobs_2.11</artifactId>

‎resource-managers/kubernetes/integration-tests/pom.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<modelVersion>4.0.0</modelVersion>
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
22-
<artifactId>spark-parent_2.11</artifactId>
22+
<artifactId>spark-kubernetes-parent_2.11</artifactId>
2323
<version>2.2.0-k8s-0.5.0</version>
24-
<relativePath>../../../pom.xml</relativePath>
24+
<relativePath>../pom.xml</relativePath>
2525
</parent>
2626

2727
<artifactId>spark-kubernetes-integration-tests_2.11</artifactId>
@@ -56,6 +56,14 @@
5656
<type>test-jar</type>
5757
<scope>test</scope>
5858
</dependency>
59+
<!--
60+
jetty scope is defined as `provided` in parent pom.
61+
-->
62+
<dependency>
63+
<groupId>org.eclipse.jetty</groupId>
64+
<artifactId>jetty-servlet</artifactId>
65+
<version>${jetty.version}</version>
66+
</dependency>
5967
<dependency>
6068
<groupId>org.apache.spark</groupId>
6169
<artifactId>spark-kubernetes-integration-tests-spark-jobs_${scala.binary.version}</artifactId>

‎resource-managers/kubernetes/pom.xml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
<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">
19+
<modelVersion>4.0.0</modelVersion>
20+
<parent>
21+
<groupId>org.apache.spark</groupId>
22+
<artifactId>spark-parent_2.11</artifactId>
23+
<version>2.2.0-k8s-0.5.0</version>
24+
<relativePath>../../pom.xml</relativePath>
25+
</parent>
26+
27+
<artifactId>spark-kubernetes-parent_2.11</artifactId>
28+
<packaging>pom</packaging>
29+
<name>Spark Project Kubernetes Parent</name>
30+
31+
<modules>
32+
<module>core</module>
33+
<module>docker-minimal-bundle</module>
34+
<module>integration-tests</module>
35+
<module>integration-tests-spark-jobs</module>
36+
<module>integration-tests-spark-jobs-helpers</module>
37+
</modules>
38+
39+
<build>
40+
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
41+
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
42+
</build>
43+
44+
</project>

0 commit comments

Comments
 (0)