You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jc...@apache.org on 2018/03/13 22:11:33 UTC
[1/2] calcite git commit: [CALCITE-2207] Enforce minimum JDK 8 via
maven-enforcer-plugin (Kevin Risden)
Repository: calcite
Updated Branches:
refs/heads/master fb8ebd315 -> 75048ff34
[CALCITE-2207] Enforce minimum JDK 8 via maven-enforcer-plugin (Kevin Risden)
Close apache/calcite#648
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/75048ff3
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/75048ff3
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/75048ff3
Branch: refs/heads/master
Commit: 75048ff346c839f00d6c6a8a4949f38a3e697a83
Parents: d134694
Author: Kevin Risden <kr...@apache.org>
Authored: Mon Mar 12 19:05:10 2018 -0500
Committer: Jesus Camacho Rodriguez <jc...@apache.org>
Committed: Tue Mar 13 15:01:04 2018 -0700
----------------------------------------------------------------------
pom.xml | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/75048ff3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 550f413..0c5936e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,7 @@ limitations under the License.
<junit.version>4.12</junit.version>
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
<maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
+ <maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
<!-- Apache 18 has 3.0.1, but need 3.0.2 for [MSOURCES-94]. -->
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
<!-- Apache 18 has 2.10.3, but need 2.10.4 for [MJAVADOC-442]. -->
@@ -671,6 +672,10 @@ limitations under the License.
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ </plugin>
+ <plugin>
<!-- This is the configuration used by "mvn javadoc:javadoc". It is
configured strict, so that it shows errors such as broken links in
javadoc on private methods. The configuration for "mvn site" is
@@ -785,6 +790,26 @@ limitations under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${maven-enforcer-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>enforce-java</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>[1.8,)</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
[2/2] calcite git commit: [CALCITE-2020] Upgrade org.incava java-diff
Posted by jc...@apache.org.
[CALCITE-2020] Upgrade org.incava java-diff
Upgrade org.incava java-diff from 1.1 to 1.1.1.
The license changed from 2-clause BSD to Apache.
The package changed from org.incava.util.diff to org.incava.diff.
Change-Id: I4d66cef25e5a746bcb1767cd78b9df94ac87e62f
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/d134694a
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/d134694a
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/d134694a
Branch: refs/heads/master
Commit: d134694aedcf19c0620b42045167ee13e15f5e2a
Parents: fb8ebd3
Author: Julian Hyde <jh...@apache.org>
Authored: Mon Oct 23 13:26:04 2017 -0700
Committer: Jesus Camacho Rodriguez <jc...@apache.org>
Committed: Tue Mar 13 15:01:04 2018 -0700
----------------------------------------------------------------------
core/src/test/java/org/apache/calcite/test/DiffTestCase.java | 8 ++++----
pom.xml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/d134694a/core/src/test/java/org/apache/calcite/test/DiffTestCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/DiffTestCase.java b/core/src/test/java/org/apache/calcite/test/DiffTestCase.java
index c8a9a89..c539ab3 100644
--- a/core/src/test/java/org/apache/calcite/test/DiffTestCase.java
+++ b/core/src/test/java/org/apache/calcite/test/DiffTestCase.java
@@ -19,8 +19,8 @@ package org.apache.calcite.test;
import org.apache.calcite.util.ReflectUtil;
import org.apache.calcite.util.Util;
-import org.incava.util.diff.Diff;
-import org.incava.util.diff.Difference;
+import org.incava.diff.Diff;
+import org.incava.diff.Difference;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -385,8 +385,8 @@ public abstract class DiffTestCase {
* Returns a string containing the difference between the two sets of lines.
*/
public static String diffLines(List<String> lines1, List<String> lines2) {
- Diff differencer = new Diff(lines1, lines2);
- List<Difference> differences = differencer.diff();
+ final Diff<String> differencer = new Diff<>(lines1, lines2);
+ final List<Difference> differences = differencer.execute();
StringWriter sw = new StringWriter();
int offset = 0;
for (Difference d : differences) {
http://git-wip-us.apache.org/repos/asf/calcite/blob/d134694a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9919c36..550f413 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@ limitations under the License.
<hydromatic-tpcds.version>0.4</hydromatic-tpcds.version>
<jackson.version>2.9.4</jackson.version>
<janino.version>2.7.6</janino.version>
- <java-diff.version>1.1</java-diff.version>
+ <java-diff.version>1.1.1</java-diff.version>
<javacc-maven-plugin.version>2.4</javacc-maven-plugin.version>
<jcip-annotations.version>1.0-1</jcip-annotations.version>
<jetty.version>9.2.19.v20160908</jetty.version>