This is an automated email from the ASF dual-hosted git repository. vladimirsitnikov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/calcite.git
commit 1ef6a0614cbb048d0c98e46b24662c56688f137f Author: Vladimir Sitnikov <[email protected]> AuthorDate: Sat Nov 16 20:34:42 2019 +0300 [CALCITE-2905] Fix Maven build --- core/pom.xml | 18 ++++++++++++++++++ druid/pom.xml | 26 +++++++++++++++++++++----- ubenchmark/pom.xml | 18 ++++++++++++++++++ 3 files changed, 57 insertions(+), 5 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 0797642..9429990 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -211,6 +211,24 @@ limitations under the License. <build> <plugins> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>src/main/version</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.drill.tools</groupId> <artifactId>drill-fmpp-maven-plugin</artifactId> <executions> diff --git a/druid/pom.xml b/druid/pom.xml index 5d12687..f27a23e 100644 --- a/druid/pom.xml +++ b/druid/pom.xml @@ -31,6 +31,7 @@ limitations under the License. <properties> <top.dir>${project.basedir}/..</top.dir> + <junit.jupiter.version>5.5.1</junit.jupiter.version> </properties> <dependencies> @@ -82,11 +83,6 @@ limitations under the License. <artifactId>joda-time</artifactId> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest-core</artifactId> <scope>test</scope> @@ -105,6 +101,24 @@ limitations under the License. <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>runtime</scope> + </dependency> </dependencies> <build> @@ -127,6 +141,8 @@ limitations under the License. <ignoredUnusedDeclaredDependency>org.apache.calcite.avatica:avatica</ignoredUnusedDeclaredDependency> <ignoredUnusedDeclaredDependency>org.slf4j:slf4j-api</ignoredUnusedDeclaredDependency> <ignoredUnusedDeclaredDependency>org.slf4j:slf4j-log4j12</ignoredUnusedDeclaredDependency> + <ignoredUnusedDeclaredDependency>org.junit.jupiter:junit-jupiter-engine</ignoredUnusedDeclaredDependency> + <ignoredUnusedDeclaredDependency>org.junit.vintage:junit-vintage-engine</ignoredUnusedDeclaredDependency> </ignoredUnusedDeclaredDependencies> </configuration> </execution> diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml index 9ba5b5e..9c7d425 100644 --- a/ubenchmark/pom.xml +++ b/ubenchmark/pom.xml @@ -84,6 +84,24 @@ limitations under the License. </executions> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>src/main/jmh</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <executions>
