From eac944eab990269c3caf1b3f49df26a432efab74 Mon Sep 17 00:00:00 2001
From: Holden Karau <holden@pigscanfly.ca>
Date: Mon, 26 Feb 2024 15:39:57 -0800
Subject: [PATCH] Fix up parent refs.

---
 settings.xml            |   5 ++
 shims/spark-3.4/pom.xml | 101 ++++++++++++++++++++++++++++++++++++++++
 shims/spark-3.5/pom.xml |   2 +-
 3 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 settings.xml
 create mode 100644 shims/spark-3.4/pom.xml

diff --git a/settings.xml b/settings.xml
new file mode 100644
index 000000000..af394ae40
--- /dev/null
+++ b/settings.xml
@@ -0,0 +1,5 @@
+<settings>
+  <activeProfiles>
+    <activeProfile>spark-3.4</activeProfile>
+  </activeProfiles>
+</settings>
diff --git a/shims/spark-3.4/pom.xml b/shims/spark-3.4/pom.xml
new file mode 100644
index 000000000..d7df10846
--- /dev/null
+++ b/shims/spark-3.4/pom.xml
@@ -0,0 +1,101 @@
+<?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.comet</groupId>
+	<artifactId>comet-spark-shims</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>comet-spark-shims${spark.version.short}_${scala.binary.version}</artifactId>
+    <name>comet-spark-shims${spark.version.short}_${scala.binary.version}</name>
+    <packaging>pom</packaging>
+
+  <properties>
+    <!-- Reverse default (skip installation), and then enable only for child modules -->
+    <maven.deploy.skip>false</maven.deploy.skip>
+  </properties>
+
+    <dependencies>
+        <dependency>
+          <groupId>org.apache.spark</groupId>
+          <artifactId>spark-sql_${scala.binary.version}</artifactId>
+        </dependency>
+        <dependency>
+           <groupId>org.scala-lang</groupId>
+           <artifactId>scala-library</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <!-- create a maven pom property that has all of our dependencies.
+                       below in the integration-test phase we'll pass this list
+                       of paths to our jar checker script.
+                    -->
+                    <execution>
+                        <id>put-client-artifacts-in-a-property</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>build-classpath</goal>
+                        </goals>
+                        <configuration>
+                            <excludeTransitive>true</excludeTransitive>
+                            <pathSeparator>;</pathSeparator>
+                            <outputProperty>comet-artifacts</outputProperty>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>check-jar-contents</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>bash</executable>
+                            <workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
+                            <requiresOnline>false</requiresOnline>
+                            <arguments>
+                                <argument>${project.basedir}/../dev/ensure-jars-have-correct-contents.sh</argument>
+                                <argument>${comet-artifacts}</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/shims/spark-3.5/pom.xml b/shims/spark-3.5/pom.xml
index a3d29d085..d7df10846 100644
--- a/shims/spark-3.5/pom.xml
+++ b/shims/spark-3.5/pom.xml
@@ -25,7 +25,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.comet</groupId>
-	<artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
+	<artifactId>comet-spark-shims</artifactId>
         <version>0.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>