[GLUTEN-7913][CORE] Flip dependency direction for gluten-uniffle (#8242)

Closes #7913
apache · Dec 17, 2024 · 789dd58 · 789dd58
1 parent c1d66c4
commit 789dd58
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 104 deletions.
diff --git a/backends-velox/pom.xml b/backends-velox/pom.xml
@@ -57,6 +57,25 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <id>uniffle</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.gluten</groupId>
+          <artifactId>gluten-uniffle</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.uniffle</groupId>
+          <artifactId>rss-client-spark${spark.major.version}-shaded</artifactId>
+          <version>${uniffle.version}</version>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+    </profile>
     <profile>
       <id>iceberg</id>
       <activation>

diff --git a/...gluten/uniffle/UniffleShuffleManager.java → ...gluten/uniffle/UniffleShuffleManager.java b/...gluten/uniffle/UniffleShuffleManager.java → ...gluten/uniffle/UniffleShuffleManager.java
diff --git a/...er/VeloxUniffleColumnarShuffleWriter.java → ...er/VeloxUniffleColumnarShuffleWriter.java b/...er/VeloxUniffleColumnarShuffleWriter.java → ...er/VeloxUniffleColumnarShuffleWriter.java
diff --git a/...park/shuffle/writer/PartitionPusher.scala → ...park/shuffle/writer/PartitionPusher.scala b/...park/shuffle/writer/PartitionPusher.scala → ...park/shuffle/writer/PartitionPusher.scala
diff --git a/gluten-uniffle/.gitkeep b/gluten-uniffle/.gitkeep
@@ -0,0 +1 @@
+The module is kept for adding common code shared by backends for Uniffle support in Gluten.
diff --git a/gluten-uniffle/package/pom.xml b/gluten-uniffle/package/pom.xml
diff --git a/gluten-uniffle/pom.xml b/gluten-uniffle/pom.xml
@@ -11,7 +11,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>gluten-uniffle</artifactId>
-  <packaging>pom</packaging>
+  <packaging>jar</packaging>
   <name>Gluten Uniffle</name>
 
   <dependencies>
@@ -75,15 +75,4 @@
       </plugin>
     </plugins>
   </build>
-  <profiles>
-    <profile>
-      <id>backends-velox</id>
-      <properties>
-      </properties>
-      <modules>
-        <module>velox</module>
-        <module>package</module>
-      </modules>
-    </profile>
-  </profiles>
 </project>
diff --git a/gluten-uniffle/velox/pom.xml b/gluten-uniffle/velox/pom.xml
diff --git a/package/pom.xml b/package/pom.xml
@@ -78,7 +78,7 @@
       <dependencies>
         <dependency>
           <groupId>org.apache.gluten</groupId>
-          <artifactId>gluten-uniffle-package</artifactId>
+          <artifactId>gluten-uniffle</artifactId>
           <version>${project.version}</version>
         </dependency>
       </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -495,6 +495,70 @@
       <modules>
         <module>gluten-uniffle</module>
       </modules>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>add-uniffle-sources</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>add-source</goal>
+                </goals>
+                <configuration>
+                  <sources>
+                    <source>${project.basedir}/src-uniffle/main/scala</source>
+                    <source>${project.basedir}/src-uniffle/main/java</source>
+                  </sources>
+                </configuration>
+              </execution>
+              <execution>
+                <id>add-uniffle-resources</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>add-resource</goal>
+                </goals>
+                <configuration>
+                  <resources>
+                    <resource>
+                      <directory>${project.basedir}/src-uniffle/main/resources</directory>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+              <execution>
+                <id>add-uniffle-test-sources</id>
+                <phase>generate-test-sources</phase>
+                <goals>
+                  <goal>add-test-source</goal>
+                </goals>
+                <configuration>
+                  <sources>
+                    <source>${project.basedir}/src-uniffle/test/scala</source>
+                    <source>${project.basedir}/src-uniffle/test/java</source>
+                  </sources>
+                </configuration>
+              </execution>
+              <execution>
+                <id>add-uniffle-test-resources</id>
+                <phase>generate-test-resources</phase>
+                <goals>
+                  <goal>add-test-resource</goal>
+                </goals>
+                <configuration>
+                  <resources>
+                    <resource>
+                      <directory>${project.basedir}/src-uniffle/test/resources</directory>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
     <profile>
       <id>delta</id>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		The module is kept for adding common code shared by backends for Uniffle support in Gluten.