Skip to content

Commit

Permalink
Merge pull request #5794 from tgravescs/fix-auto-merge-conflict-5789
Browse files Browse the repository at this point in the history 
Fix auto merge conflict 5789
  • Loading branch information
@tgravescs
tgravescs authored Jun 9, 2022
2 parents 8487b4b + 7e57af0 commit cdb843c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 23 deletions.
27 changes: 4 additions & 23 deletions tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,25 +148,6 @@
</exclusions>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-321cdh-test-src</id>
<goals><goal>add-test-source</goal></goals>
<configuration>
<sources>
<source>${project.basedir}/src/test/320+/scala</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<!--
Expand Down Expand Up @@ -311,7 +292,7 @@
<goals><goal>add-test-source</goal></goals>
<configuration>
<sources>
<source>${project.basedir}/src/test/320+/scala</source>
<source>${project.basedir}/src/test/320+-noncdh-nondb/scala</source>
</sources>
</configuration>
</execution>
Expand Down Expand Up @@ -339,7 +320,7 @@
<goals><goal>add-test-source</goal></goals>
<configuration>
<sources>
<source>${project.basedir}/src/test/320+/scala</source>
<source>${project.basedir}/src/test/320+-noncdh-nondb/scala</source>
</sources>
</configuration>
</execution>
Expand Down Expand Up @@ -368,7 +349,7 @@
<configuration>
<sources>
<source>${project.basedir}/src/test/330+/scala</source>
<source>${project.basedir}/src/test/320+/scala</source>
<source>${project.basedir}/src/test/320+-noncdh-nondb/scala</source>
</sources>
</configuration>
</execution>
Expand Down Expand Up @@ -397,7 +378,7 @@
<configuration>
<sources>
<source>${project.basedir}/src/test/330+/scala</source>
<source>${project.basedir}/src/test/320+/scala</source>
<source>${project.basedir}/src/test/320+-noncdh-nondb/scala</source>
</sources>
</configuration>
</execution>
Expand Down
0 ...dia/spark/rapids/OrcEncryptionSuite.scala → ...dia/spark/rapids/OrcEncryptionSuite.scala
View file
File renamed without changes.

0 comments on commit cdb843c

Please sign in to comment.