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 2017/11/06 21:33:18 UTC

[1/2] phoenix git commit: PHOENIX-4351 Add i18n-util to bin LICENSE file and to dependencyManagement

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 7e795ac67 -> 8b7e12414
  refs/heads/master a09cea6bf -> 4a1f0df61


PHOENIX-4351 Add i18n-util to bin LICENSE file and to dependencyManagement


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

Branch: refs/heads/master
Commit: 4a1f0df6143ba705a48b5051aee52dab158afe8d
Parents: a09cea6
Author: Josh Elser <el...@apache.org>
Authored: Mon Nov 6 15:21:35 2017 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Nov 6 16:17:04 2017 -0500

----------------------------------------------------------------------
 dev/release_files/LICENSE | 2 ++
 phoenix-core/pom.xml      | 3 +--
 pom.xml                   | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4a1f0df6/dev/release_files/LICENSE
----------------------------------------------------------------------
diff --git a/dev/release_files/LICENSE b/dev/release_files/LICENSE
index a72ce86..0fd0255 100644
--- a/dev/release_files/LICENSE
+++ b/dev/release_files/LICENSE
@@ -254,6 +254,8 @@ Janino Compiler (https://github.com/janino-compiler/janino)
 
 Hamcrest-core 1.3 (http://www.hamcrest.org) Copyright (c) 2000-2006, www.hamcrest.org
 
+i18n-util 1.0.1 (https://github.com/salesforce/i18n-util) Copyright (c) 2017, Salesforce.com, Inc. All rights reserved.
+
 ---
 
 This product bundles the following products which are licensed with

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4a1f0df6/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 14b36a4..936aca3 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -471,10 +471,9 @@
       <artifactId>stream</artifactId>
       <version>${stream.version}</version>
     </dependency>
-     <dependency>
+    <dependency>
       <groupId>com.salesforce.i18n</groupId>
       <artifactId>i18n-util</artifactId>
-      <version>1.0.1</version>
     </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4a1f0df6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1f4f3e6..e393993 100644
--- a/pom.xml
+++ b/pom.xml
@@ -927,6 +927,11 @@
         <artifactId>stream</artifactId>
         <version>${stream.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.salesforce.i18n</groupId>
+        <artifactId>i18n-util</artifactId>
+        <version>1.0.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 


[2/2] phoenix git commit: PHOENIX-4351 Add i18n-util to bin LICENSE file and to dependencyManagement

Posted by el...@apache.org.
PHOENIX-4351 Add i18n-util to bin LICENSE file and to dependencyManagement


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 8b7e12414400c997d5993fb55586bfcc2f56d217
Parents: 7e795ac
Author: Josh Elser <el...@apache.org>
Authored: Mon Nov 6 15:21:35 2017 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Nov 6 16:28:10 2017 -0500

----------------------------------------------------------------------
 dev/release_files/LICENSE | 2 ++
 phoenix-core/pom.xml      | 3 +--
 pom.xml                   | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/8b7e1241/dev/release_files/LICENSE
----------------------------------------------------------------------
diff --git a/dev/release_files/LICENSE b/dev/release_files/LICENSE
index a72ce86..0fd0255 100644
--- a/dev/release_files/LICENSE
+++ b/dev/release_files/LICENSE
@@ -254,6 +254,8 @@ Janino Compiler (https://github.com/janino-compiler/janino)
 
 Hamcrest-core 1.3 (http://www.hamcrest.org) Copyright (c) 2000-2006, www.hamcrest.org
 
+i18n-util 1.0.1 (https://github.com/salesforce/i18n-util) Copyright (c) 2017, Salesforce.com, Inc. All rights reserved.
+
 ---
 
 This product bundles the following products which are licensed with

http://git-wip-us.apache.org/repos/asf/phoenix/blob/8b7e1241/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 8b03a91..e3e6263 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -470,10 +470,9 @@
       <artifactId>stream</artifactId>
       <version>${stream.version}</version>
     </dependency>
-     <dependency>
+    <dependency>
       <groupId>com.salesforce.i18n</groupId>
       <artifactId>i18n-util</artifactId>
-      <version>1.0.1</version>
     </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/phoenix/blob/8b7e1241/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fa47c41..e3fb11b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -907,6 +907,11 @@
         <artifactId>stream</artifactId>
         <version>${stream.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.salesforce.i18n</groupId>
+        <artifactId>i18n-util</artifactId>
+        <version>1.0.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>