Merge pull request NVIDIA#2137 from NVIDIA/branch-0.5

[auto-merge] branch-0.5 to branch-0.6 [skip ci] [bot]
nartal1 · Apr 15, 2021 · e519d82 · e519d82
2 parents 2da188d + 9355012
commit e519d82
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/shims/aggregator/pom.xml b/shims/aggregator/pom.xml
@@ -56,18 +56,23 @@
                 </dependency>
             </dependencies>
         </profile>
+       <profile>
+           <id>spark320</id>
+           <dependencies>
+               <dependency>
+                   <groupId>com.nvidia</groupId>
+                   <artifactId>rapids-4-spark-shims-spark320_${scala.binary.version}</artifactId>
+                   <version>${project.version}</version>
+                   <scope>compile</scope>
+               </dependency>
+           </dependencies>
+       </profile>
         <profile>
             <id>snapshot-shims</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
-                <dependency>
-                    <groupId>com.nvidia</groupId>
-                    <artifactId>rapids-4-spark-shims-spark320_${scala.binary.version}</artifactId>
-                    <version>${project.version}</version>
-                    <scope>compile</scope>
-                </dependency>
                 <dependency>
                     <groupId>com.nvidia</groupId>
                     <artifactId>rapids-4-spark-shims-spark303_${scala.binary.version}</artifactId>

diff --git a/shims/pom.xml b/shims/pom.xml
@@ -39,6 +39,12 @@
                 <module>spark301db</module>
             </modules>
         </profile>
+        <profile>
+            <id>spark320</id>
+            <modules>
+                <module>spark320</module>
+            </modules>
+        </profile>
         <profile>
             <id>snapshot-shims</id>
             <activation>
@@ -47,7 +53,6 @@
             <modules>
                 <module>spark303</module>
                 <module>spark312</module>
-                <module>spark320</module>
             </modules>
         </profile>
     </profiles>