You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by el...@apache.org on 2018/11/28 16:35:37 UTC

[1/8] phoenix git commit: PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 93e284647 -> 56d1031f8
  refs/heads/4.x-HBase-1.3 1813af615 -> 1f022cbfc
  refs/heads/4.x-HBase-1.4 d0a115ce0 -> 644ab0e6e
  refs/heads/master 70d5cd9e3 -> 7217568ea


PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf

Signed-off-by: Josh Elser <el...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/8cf6fd2a
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8cf6fd2a
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8cf6fd2a

Branch: refs/heads/master
Commit: 8cf6fd2a0499b135d42b2bf39926ca1141699508
Parents: 70d5cd9
Author: Artem Ervits <ar...@gmail.com>
Authored: Wed Nov 28 11:00:20 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Nov 28 11:01:28 2018 -0500

----------------------------------------------------------------------
 phoenix-pherf/pom.xml | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/8cf6fd2a/phoenix-pherf/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index b5880f1..6456ace 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -111,11 +111,6 @@
 			<scope>test</scope>
 		</dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <scope>test</scope>

[6/8] phoenix git commit: PHOENIX-5038 Use a single version of Scala in phoenix-spark

Posted by el...@apache.org.
PHOENIX-5038 Use a single version of Scala in phoenix-spark

Signed-off-by: Josh Elser <el...@apache.org>
Signed-off-by: Thomas D'Silva <td...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1f022cbf
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1f022cbf
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1f022cbf

Branch: refs/heads/4.x-HBase-1.3
Commit: 1f022cbfcc3edad22c4b10f6f0cefe02d27fc936
Parents: 9dc4015
Author: Artem Ervits <ar...@gmail.com>
Authored: Wed Nov 28 11:11:18 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Nov 28 11:26:39 2018 -0500

----------------------------------------------------------------------
 phoenix-spark/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1f022cbf/phoenix-spark/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index d3979f4..6e2d815 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -503,13 +503,14 @@
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.4.4</version>
         <configuration>
           <charset>${project.build.sourceEncoding}</charset>
           <jvmArgs>
             <jvmArg>-Xmx1024m</jvmArg>
           </jvmArgs>
           <scalaVersion>${scala.version}</scalaVersion>
+          <scalaCompatVersion>${scala.binary.version}</scalaCompatVersion>
         </configuration>
         <executions>
           <execution>

[5/8] phoenix git commit: PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf

Posted by el...@apache.org.
PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf

Signed-off-by: Josh Elser <el...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9dc40151
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9dc40151
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9dc40151

Branch: refs/heads/4.x-HBase-1.3
Commit: 9dc40151cb941038c53fedd6f828fa279c03c31f
Parents: 1813af6
Author: Artem Ervits <ar...@gmail.com>
Authored: Wed Nov 28 11:00:20 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Nov 28 11:26:36 2018 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------

[3/8] phoenix git commit: PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf

Posted by el...@apache.org.
PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf

Signed-off-by: Josh Elser <el...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2eff637e
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2eff637e
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2eff637e

Branch: refs/heads/4.x-HBase-1.4
Commit: 2eff637e0aef843a5258b753c5985c2ee12b359e
Parents: d0a115c
Author: Artem Ervits <ar...@gmail.com>
Authored: Wed Nov 28 11:00:20 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Nov 28 11:19:56 2018 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------

[7/8] phoenix git commit: PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf

Posted by el...@apache.org.
PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf

Signed-off-by: Josh Elser <el...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ab51173d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ab51173d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ab51173d

Branch: refs/heads/4.x-HBase-1.2
Commit: ab51173dc9de1057c7c72f10acc12f87e28a150c
Parents: 93e2846
Author: Artem Ervits <ar...@gmail.com>
Authored: Wed Nov 28 11:00:20 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Nov 28 11:30:38 2018 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------

[8/8] phoenix git commit: PHOENIX-5038 Use a single version of Scala in phoenix-spark

Posted by el...@apache.org.
PHOENIX-5038 Use a single version of Scala in phoenix-spark

Signed-off-by: Josh Elser <el...@apache.org>
Signed-off-by: Thomas D'Silva <td...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/56d1031f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/56d1031f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/56d1031f

Branch: refs/heads/4.x-HBase-1.2
Commit: 56d1031f8f3490e83e320aeb3679e36f9ecf61f2
Parents: ab51173
Author: Artem Ervits <ar...@gmail.com>
Authored: Wed Nov 28 11:11:18 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Nov 28 11:30:41 2018 -0500

----------------------------------------------------------------------
 phoenix-spark/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/56d1031f/phoenix-spark/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index cbf3808..3081dc3 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -503,13 +503,14 @@
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.4.4</version>
         <configuration>
           <charset>${project.build.sourceEncoding}</charset>
           <jvmArgs>
             <jvmArg>-Xmx1024m</jvmArg>
           </jvmArgs>
           <scalaVersion>${scala.version}</scalaVersion>
+          <scalaCompatVersion>${scala.binary.version}</scalaCompatVersion>
         </configuration>
         <executions>
           <execution>

[2/8] phoenix git commit: PHOENIX-5038 Use a single version of Scala in phoenix-spark

Posted by el...@apache.org.
PHOENIX-5038 Use a single version of Scala in phoenix-spark

Signed-off-by: Josh Elser <el...@apache.org>
Signed-off-by: Thomas D'Silva <td...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7217568e
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7217568e
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7217568e

Branch: refs/heads/master
Commit: 7217568ead0e08fba07e65d2f4bf2f68f043ea44
Parents: 8cf6fd2
Author: Artem Ervits <ar...@gmail.com>
Authored: Wed Nov 28 11:11:18 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Nov 28 11:18:48 2018 -0500

----------------------------------------------------------------------
 phoenix-spark/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7217568e/phoenix-spark/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index ea2ceae..db511b5 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -512,13 +512,14 @@
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.4.4</version>
         <configuration>
           <charset>${project.build.sourceEncoding}</charset>
           <jvmArgs>
             <jvmArg>-Xmx1024m</jvmArg>
           </jvmArgs>
           <scalaVersion>${scala.version}</scalaVersion>
+          <scalaCompatVersion>${scala.binary.version}</scalaCompatVersion>
         </configuration>
         <executions>
           <execution>

[4/8] phoenix git commit: PHOENIX-5038 Use a single version of Scala in phoenix-spark

Posted by el...@apache.org.
PHOENIX-5038 Use a single version of Scala in phoenix-spark

Signed-off-by: Josh Elser <el...@apache.org>
Signed-off-by: Thomas D'Silva <td...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/644ab0e6
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/644ab0e6
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/644ab0e6

Branch: refs/heads/4.x-HBase-1.4
Commit: 644ab0e6ecb9dea0adfa351f342c5b70759adc9f
Parents: 2eff637
Author: Artem Ervits <ar...@gmail.com>
Authored: Wed Nov 28 11:11:18 2018 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Nov 28 11:20:03 2018 -0500

----------------------------------------------------------------------
 phoenix-spark/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/644ab0e6/phoenix-spark/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index 8c8f50b..46231ee 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -503,13 +503,14 @@
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.4.4</version>
         <configuration>
           <charset>${project.build.sourceEncoding}</charset>
           <jvmArgs>
             <jvmArg>-Xmx1024m</jvmArg>
           </jvmArgs>
           <scalaVersion>${scala.version}</scalaVersion>
+          <scalaCompatVersion>${scala.binary.version}</scalaCompatVersion>
         </configuration>
         <executions>
           <execution>