>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19810 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Ext-ref: MB-66739
Change-Id: Ib28607ecd5c973fbd4a62625a4e032e063ac70cf
---
M asterixdb/pom.xml
2 files changed, 22 insertions(+), 60 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/10/19810/1
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 34c1af8..12fa6fb 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -131,64 +131,6 @@
</configuration>
</plugin>
<plugin>
-<<<<<<< HEAD (32a344 merge branch gerrit/neo into gerrit/trinity)
-=======
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <failIfNoTests>false</failIfNoTests>
- <systemPropertyVariables>
- <skipFredSlowTests>true</skipFredSlowTests>
-
<log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile>
- </systemPropertyVariables>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
- <argLine>
- -enableassertions -Xmx${test.heap.size}m
- -Dfile.encoding=UTF-8
- -DrunSlowAQLTests=${runSlowAQLTests}
- -Xdebug
-
-Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=${debug.suspend.flag}
- ${coverageArgLine}
- </argLine>
- <includes>
- <include>${test.includes}</include>
- </includes>
- <excludes>
- <exclude>${test.excludes}</exclude>
- </excludes>
- <skipTests>${skip.surefire.tests}</skipTests>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <runOrder>alphabetical</runOrder>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
- <argLine>${coverageArgLine}</argLine>
- <systemPropertyVariables>
-
<log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile>
- </systemPropertyVariables>
- <includes>
- <include>${itest.includes}</include>
- </includes>
- <excludes>
- <exclude>${itest.excludes}</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
->>>>>>> BRANCH (da15c7 [NO ISSUE][*DB][MISC] Fix some test declarations to
avoid wa)
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<executions>
@@ -706,9 +648,9 @@
${coverageArgLine}
${extraFailsafeArgLine}
</argLine>
- <systemProperties>
+ <systemPropertyVariables>
<log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile>
- </systemProperties>
+ </systemPropertyVariables>
<includes>
<include>${itest.includes}</include>
</includes>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19810
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: Ib28607ecd5c973fbd4a62625a4e032e063ac70cf
Gerrit-Change-Number: 19810
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
