You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2017/01/13 19:22:40 UTC
[2/4] calcite git commit: [CALCITE-1574] Memory leak in maven
[CALCITE-1574] Memory leak in maven
Upgrade maven-jar-plugin and maven-source-plugin to versions that
have fixed [MSOURCES-94].
Disable UdfTest.testUserDefinedFunction; logged
[CALCITE-1561] Intermittent test failures
to remind us to re-enable.
Skip javadoc on Travis; with it, builds exceed Travis time limit.
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/28ae333f
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/28ae333f
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/28ae333f
Branch: refs/heads/master
Commit: 28ae333f0c7174b758487dbb5ddef91dacacd213
Parents: 46474d7
Author: Julian Hyde <jh...@apache.org>
Authored: Thu Jan 12 10:36:25 2017 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Fri Jan 13 09:11:39 2017 -0800
----------------------------------------------------------------------
.travis.yml | 4 ++--
.../java/org/apache/calcite/test/UdfTest.java | 2 ++
pom.xml | 19 +++++++++++++++++++
3 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/28ae333f/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index b63f468..c8fdab8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,8 +31,8 @@ install:
- cd avatica && mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V && cd ..
- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
script:
- - cd avatica && mvn -Dsurefire.useFile=false javadoc:javadoc test && cd ..
- - mvn -Dsurefire.useFile=false javadoc:javadoc test
+ - cd avatica && mvn -Dsurefire.useFile=false test && cd ..
+ - mvn -Dsurefire.useFile=false test
git:
depth: 10000
sudo: false
http://git-wip-us.apache.org/repos/asf/calcite/blob/28ae333f/core/src/test/java/org/apache/calcite/test/UdfTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/UdfTest.java b/core/src/test/java/org/apache/calcite/test/UdfTest.java
index 3372102..774edad 100644
--- a/core/src/test/java/org/apache/calcite/test/UdfTest.java
+++ b/core/src/test/java/org/apache/calcite/test/UdfTest.java
@@ -26,6 +26,7 @@ import org.apache.calcite.util.Smalls;
import com.google.common.collect.ImmutableList;
+import org.junit.Ignore;
import org.junit.Test;
import java.sql.Connection;
@@ -149,6 +150,7 @@ public class UdfTest {
/** Tests a user-defined function that is defined in terms of a class with
* non-static methods. */
+ @Ignore("[CALCITE-1561] Intermittent test failures")
@Test public void testUserDefinedFunction() throws Exception {
final String sql = "select \"adhoc\".my_plus(\"deptno\", 100) as p\n"
+ "from \"adhoc\".EMPLOYEES";
http://git-wip-us.apache.org/repos/asf/calcite/blob/28ae333f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f728112..f196350 100644
--- a/pom.xml
+++ b/pom.xml
@@ -676,6 +676,20 @@ limitations under the License.
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
</plugin>
+ <!-- Override base, which uses version 3.0.0. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.0.2</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
@@ -683,6 +697,11 @@ limitations under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<threadCount>1</threadCount>