From 4a16780852d4b1f1a6155b24ae9c0af530e2d430 Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Wed, 11 Sep 2024 20:54:17 -0600
Subject: [PATCH 1/2] change maven group id

---
 common/pom.xml                | 2 +-
 dev/diffs/3.4.3.diff          | 4 ++--
 dev/diffs/3.5.1.diff          | 4 ++--
 dev/diffs/4.0.0-preview1.diff | 4 ++--
 fuzz-testing/pom.xml          | 2 +-
 pom.xml                       | 8 ++++----
 spark-integration/pom.xml     | 6 +++---
 spark/pom.xml                 | 4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index 808145813..7e65c02e9 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -24,7 +24,7 @@ under the License.
   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>
+    <groupId>org.apache.datafusion.comet</groupId>
     <artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
     <version>0.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
diff --git a/dev/diffs/3.4.3.diff b/dev/diffs/3.4.3.diff
index 5eecc29f6..13f8148a6 100644
--- a/dev/diffs/3.4.3.diff
+++ b/dev/diffs/3.4.3.diff
@@ -16,7 +16,7 @@ index d3544881af1..bf0e2b53c70 100644
          <version>${netlib.ludovic.dev.version}</version>
        </dependency>
 +      <dependency>
-+        <groupId>org.apache.comet</groupId>
++        <groupId>org.apache.datafusion.comet</groupId>
 +        <artifactId>comet-spark-spark${spark.version.short}_${scala.binary.version}</artifactId>
 +        <version>${comet.version}</version>
 +        <exclusions>
@@ -46,7 +46,7 @@ index b386d135da1..854aec17c2d 100644
        <artifactId>spark-tags_${scala.binary.version}</artifactId>
      </dependency>
 +    <dependency>
-+      <groupId>org.apache.comet</groupId>
++      <groupId>org.apache.datafusion.comet</groupId>
 +      <artifactId>comet-spark-spark${spark.version.short}_${scala.binary.version}</artifactId>
 +    </dependency>
  
diff --git a/dev/diffs/3.5.1.diff b/dev/diffs/3.5.1.diff
index d463b5831..34dfe5767 100644
--- a/dev/diffs/3.5.1.diff
+++ b/dev/diffs/3.5.1.diff
@@ -16,7 +16,7 @@ index 0f504dbee85..f6019da888a 100644
          <version>${netlib.ludovic.dev.version}</version>
        </dependency>
 +      <dependency>
-+        <groupId>org.apache.comet</groupId>
++        <groupId>org.apache.datafusion.comet</groupId>
 +        <artifactId>comet-spark-spark${spark.version.short}_${scala.binary.version}</artifactId>
 +        <version>${comet.version}</version>
 +        <exclusions>
@@ -46,7 +46,7 @@ index c46ab7b8fce..d8b99c2c115 100644
        <artifactId>spark-tags_${scala.binary.version}</artifactId>
      </dependency>
 +    <dependency>
-+      <groupId>org.apache.comet</groupId>
++      <groupId>org.apache.datafusion.comet</groupId>
 +      <artifactId>comet-spark-spark${spark.version.short}_${scala.binary.version}</artifactId>
 +    </dependency>
  
diff --git a/dev/diffs/4.0.0-preview1.diff b/dev/diffs/4.0.0-preview1.diff
index b473bbf0e..da34d6853 100644
--- a/dev/diffs/4.0.0-preview1.diff
+++ b/dev/diffs/4.0.0-preview1.diff
@@ -16,7 +16,7 @@ index a4b1b2c3c9f..db50bdb0d3b 100644
          <version>${netlib.ludovic.dev.version}</version>
        </dependency>
 +      <dependency>
-+        <groupId>org.apache.comet</groupId>
++        <groupId>org.apache.datafusion.comet</groupId>
 +        <artifactId>comet-spark-spark${spark.version.short}_${scala.binary.version}</artifactId>
 +        <version>${comet.version}</version>
 +        <exclusions>
@@ -46,7 +46,7 @@ index 19f6303be36..31e1d27700f 100644
        <artifactId>spark-tags_${scala.binary.version}</artifactId>
      </dependency>
 +    <dependency>
-+      <groupId>org.apache.comet</groupId>
++      <groupId>org.apache.datafusion.comet</groupId>
 +      <artifactId>comet-spark-spark${spark.version.short}_${scala.binary.version}</artifactId>
 +    </dependency>
  
diff --git a/fuzz-testing/pom.xml b/fuzz-testing/pom.xml
index 38c83ddc6..a68488a9c 100644
--- a/fuzz-testing/pom.xml
+++ b/fuzz-testing/pom.xml
@@ -23,7 +23,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.comet</groupId>
+        <groupId>org.apache.datafusion.comet</groupId>
         <artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
         <version>0.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/pom.xml b/pom.xml
index 21f32f8cc..a376d9c51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ 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>
-  <groupId>org.apache.comet</groupId>
+  <groupId>org.apache.datafusion.comet</groupId>
   <artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
   <version>0.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -267,7 +267,7 @@ under the License.
         <scope>test</scope>
         <exclusions>
           <exclusion>
-            <groupId>org.apache.comet</groupId>
+            <groupId>org.apache.datafusion.comet</groupId>
             <artifactId>*</artifactId>
           </exclusion>
 
@@ -331,7 +331,7 @@ under the License.
             <artifactId>parquet-column</artifactId>
           </exclusion>
           <exclusion>
-            <groupId>org.apache.comet</groupId>
+            <groupId>org.apache.datafusion.comet</groupId>
             <artifactId>*</artifactId>
           </exclusion>
 
@@ -354,7 +354,7 @@ under the License.
         <scope>test</scope>
         <exclusions>
           <exclusion>
-            <groupId>org.apache.comet</groupId>
+            <groupId>org.apache.datafusion.comet</groupId>
             <artifactId>*</artifactId>
           </exclusion>
           <exclusion>
diff --git a/spark-integration/pom.xml b/spark-integration/pom.xml
index 83d94d877..50d424a3e 100644
--- a/spark-integration/pom.xml
+++ b/spark-integration/pom.xml
@@ -24,7 +24,7 @@ under the License.
          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>
+        <groupId>org.apache.datafusion.comet</groupId>
         <artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
         <version>0.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -41,13 +41,13 @@ under the License.
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.comet</groupId>
+            <groupId>org.apache.datafusion.comet</groupId>
             <artifactId>comet-spark-spark${spark.version.short}_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
             <exclusions>
               <!-- This is shaded into the jar -->
               <exclusion>
-                <groupId>org.apache.comet</groupId>
+                <groupId>org.apache.datafusion.comet</groupId>
                 <artifactId>comet-common-spark${spark.version.short}_${scala.binary.version}</artifactId>
               </exclusion>
             </exclusions>
diff --git a/spark/pom.xml b/spark/pom.xml
index ac84a49df..75568d151 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -24,7 +24,7 @@ under the License.
   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>
+    <groupId>org.apache.datafusion.comet</groupId>
     <artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
     <version>0.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
@@ -40,7 +40,7 @@ under the License.
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.comet</groupId>
+      <groupId>org.apache.datafusion.comet</groupId>
       <artifactId>comet-common-spark${spark.version.short}_${scala.binary.version}</artifactId>
       <version>${project.version}</version>
       <exclusions>

From fd89b3702b2bf2642769e4462982c5c6bd286edb Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Wed, 11 Sep 2024 21:16:11 -0600
Subject: [PATCH 2/2] rename again

---
 common/pom.xml                | 2 +-
 dev/diffs/3.4.3.diff          | 4 ++--
 dev/diffs/3.5.1.diff          | 4 ++--
 dev/diffs/4.0.0-preview1.diff | 4 ++--
 fuzz-testing/pom.xml          | 2 +-
 pom.xml                       | 8 ++++----
 spark-integration/pom.xml     | 6 +++---
 spark/pom.xml                 | 4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index 7e65c02e9..0ac8cece5 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -24,7 +24,7 @@ under the License.
   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.datafusion.comet</groupId>
+    <groupId>org.apache.datafusion</groupId>
     <artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
     <version>0.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
diff --git a/dev/diffs/3.4.3.diff b/dev/diffs/3.4.3.diff
index 13f8148a6..d3d666329 100644
--- a/dev/diffs/3.4.3.diff
+++ b/dev/diffs/3.4.3.diff
@@ -16,7 +16,7 @@ index d3544881af1..bf0e2b53c70 100644
          <version>${netlib.ludovic.dev.version}</version>
        </dependency>
 +      <dependency>
-+        <groupId>org.apache.datafusion.comet</groupId>
++        <groupId>org.apache.datafusion</groupId>
 +        <artifactId>comet-spark-spark${spark.version.short}_${scala.binary.version}</artifactId>
 +        <version>${comet.version}</version>
 +        <exclusions>
@@ -46,7 +46,7 @@ index b386d135da1..854aec17c2d 100644
        <artifactId>spark-tags_${scala.binary.version}</artifactId>
      </dependency>
 +    <dependency>
-+      <groupId>org.apache.datafusion.comet</groupId>
++      <groupId>org.apache.datafusion</groupId>
 +      <artifactId>comet-spark-spark${spark.version.short}_${scala.binary.version}</artifactId>
 +    </dependency>
  
diff --git a/dev/diffs/3.5.1.diff b/dev/diffs/3.5.1.diff
index 34dfe5767..bf191e04e 100644
--- a/dev/diffs/3.5.1.diff
+++ b/dev/diffs/3.5.1.diff
@@ -16,7 +16,7 @@ index 0f504dbee85..f6019da888a 100644
          <version>${netlib.ludovic.dev.version}</version>
        </dependency>
 +      <dependency>
-+        <groupId>org.apache.datafusion.comet</groupId>
++        <groupId>org.apache.datafusion</groupId>
 +        <artifactId>comet-spark-spark${spark.version.short}_${scala.binary.version}</artifactId>
 +        <version>${comet.version}</version>
 +        <exclusions>
@@ -46,7 +46,7 @@ index c46ab7b8fce..d8b99c2c115 100644
        <artifactId>spark-tags_${scala.binary.version}</artifactId>
      </dependency>
 +    <dependency>
-+      <groupId>org.apache.datafusion.comet</groupId>
++      <groupId>org.apache.datafusion</groupId>
 +      <artifactId>comet-spark-spark${spark.version.short}_${scala.binary.version}</artifactId>
 +    </dependency>
  
diff --git a/dev/diffs/4.0.0-preview1.diff b/dev/diffs/4.0.0-preview1.diff
index da34d6853..69a69fb8b 100644
--- a/dev/diffs/4.0.0-preview1.diff
+++ b/dev/diffs/4.0.0-preview1.diff
@@ -16,7 +16,7 @@ index a4b1b2c3c9f..db50bdb0d3b 100644
          <version>${netlib.ludovic.dev.version}</version>
        </dependency>
 +      <dependency>
-+        <groupId>org.apache.datafusion.comet</groupId>
++        <groupId>org.apache.datafusion</groupId>
 +        <artifactId>comet-spark-spark${spark.version.short}_${scala.binary.version}</artifactId>
 +        <version>${comet.version}</version>
 +        <exclusions>
@@ -46,7 +46,7 @@ index 19f6303be36..31e1d27700f 100644
        <artifactId>spark-tags_${scala.binary.version}</artifactId>
      </dependency>
 +    <dependency>
-+      <groupId>org.apache.datafusion.comet</groupId>
++      <groupId>org.apache.datafusion</groupId>
 +      <artifactId>comet-spark-spark${spark.version.short}_${scala.binary.version}</artifactId>
 +    </dependency>
  
diff --git a/fuzz-testing/pom.xml b/fuzz-testing/pom.xml
index a68488a9c..1e6ad326f 100644
--- a/fuzz-testing/pom.xml
+++ b/fuzz-testing/pom.xml
@@ -23,7 +23,7 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.datafusion.comet</groupId>
+        <groupId>org.apache.datafusion</groupId>
         <artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
         <version>0.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/pom.xml b/pom.xml
index a376d9c51..f61265a01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ 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>
-  <groupId>org.apache.datafusion.comet</groupId>
+  <groupId>org.apache.datafusion</groupId>
   <artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
   <version>0.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -267,7 +267,7 @@ under the License.
         <scope>test</scope>
         <exclusions>
           <exclusion>
-            <groupId>org.apache.datafusion.comet</groupId>
+            <groupId>org.apache.datafusion</groupId>
             <artifactId>*</artifactId>
           </exclusion>
 
@@ -331,7 +331,7 @@ under the License.
             <artifactId>parquet-column</artifactId>
           </exclusion>
           <exclusion>
-            <groupId>org.apache.datafusion.comet</groupId>
+            <groupId>org.apache.datafusion</groupId>
             <artifactId>*</artifactId>
           </exclusion>
 
@@ -354,7 +354,7 @@ under the License.
         <scope>test</scope>
         <exclusions>
           <exclusion>
-            <groupId>org.apache.datafusion.comet</groupId>
+            <groupId>org.apache.datafusion</groupId>
             <artifactId>*</artifactId>
           </exclusion>
           <exclusion>
diff --git a/spark-integration/pom.xml b/spark-integration/pom.xml
index 50d424a3e..1175ad006 100644
--- a/spark-integration/pom.xml
+++ b/spark-integration/pom.xml
@@ -24,7 +24,7 @@ under the License.
          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.datafusion.comet</groupId>
+        <groupId>org.apache.datafusion</groupId>
         <artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
         <version>0.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
@@ -41,13 +41,13 @@ under the License.
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.datafusion.comet</groupId>
+            <groupId>org.apache.datafusion</groupId>
             <artifactId>comet-spark-spark${spark.version.short}_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
             <exclusions>
               <!-- This is shaded into the jar -->
               <exclusion>
-                <groupId>org.apache.datafusion.comet</groupId>
+                <groupId>org.apache.datafusion</groupId>
                 <artifactId>comet-common-spark${spark.version.short}_${scala.binary.version}</artifactId>
               </exclusion>
             </exclusions>
diff --git a/spark/pom.xml b/spark/pom.xml
index 75568d151..c19c91710 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -24,7 +24,7 @@ under the License.
   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.datafusion.comet</groupId>
+    <groupId>org.apache.datafusion</groupId>
     <artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
     <version>0.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
@@ -40,7 +40,7 @@ under the License.
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.datafusion.comet</groupId>
+      <groupId>org.apache.datafusion</groupId>
       <artifactId>comet-common-spark${spark.version.short}_${scala.binary.version}</artifactId>
       <version>${project.version}</version>
       <exclusions>