You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by an...@apache.org on 2017/11/23 11:49:56 UTC
[1/2] phoenix git commit: PHOENIX-4400 Update pom curator and
disruptor version to be compatible with HBase-2.0(Sergey Soldatov)
Repository: phoenix
Updated Branches:
refs/heads/5.x-HBase-2.0 2a9a9f090 -> 1beac2746
PHOENIX-4400 Update pom curator and disruptor version to be compatible with HBase-2.0(Sergey Soldatov)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7da25610
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7da25610
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7da25610
Branch: refs/heads/5.x-HBase-2.0
Commit: 7da25610a478dd7bcedb041341bdfb45e3077086
Parents: 2a9a9f0
Author: Ankit Singhal <an...@gmail.com>
Authored: Thu Nov 23 17:15:20 2017 +0530
Committer: Ankit Singhal <an...@gmail.com>
Committed: Thu Nov 23 17:15:20 2017 +0530
----------------------------------------------------------------------
phoenix-core/pom.xml | 2 +-
phoenix-queryserver/pom.xml | 6 ++++++
pom.xml | 17 ++++++++++++++++-
3 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7da25610/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 3119140..3124d9b 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -347,7 +347,7 @@
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
- <version>3.2.0</version>
+ <version>3.3.6</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7da25610/phoenix-queryserver/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index b5a0358..ae61200 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -182,6 +182,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-http</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minikdc</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7da25610/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8c7f12b..edba3cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
<!-- Set default encoding so multi-byte tests work correctly on the Mac -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <curator.version>2.12.0</curator.version>
+ <curator.version>4.0.0</curator.version>
</properties>
@@ -609,6 +609,13 @@
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-http</artifactId>
+ <version>${hbase.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
<version>${hbase.version}</version>
<type>test-jar</type>
@@ -973,6 +980,14 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
[2/2] phoenix git commit: PHOENIX-4338 Move to Java 8
Posted by an...@apache.org.
PHOENIX-4338 Move to Java 8
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1beac274
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1beac274
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1beac274
Branch: refs/heads/5.x-HBase-2.0
Commit: 1beac2746da9b00147aaacd16a2d9cf65c8b2e20
Parents: 7da2561
Author: Ankit Singhal <an...@gmail.com>
Authored: Thu Nov 23 17:19:48 2017 +0530
Committer: Ankit Singhal <an...@gmail.com>
Committed: Thu Nov 23 17:19:48 2017 +0530
----------------------------------------------------------------------
pom.xml | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1beac274/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index edba3cb..47220db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,8 +140,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
@@ -980,14 +980,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>