You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gora.apache.org by le...@apache.org on 2015/03/02 19:49:15 UTC
[1/3] gora git commit: GORA-415 hadoop-client dependency should be
optional in gora-core
Repository: gora
Updated Branches:
refs/heads/master 1a8a14ba1 -> 35a88e8a6
GORA-415 hadoop-client dependency should be optional in gora-core
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/e7d6b6ed
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/e7d6b6ed
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/e7d6b6ed
Branch: refs/heads/master
Commit: e7d6b6edc3d2392272263a0fb381fb9a2de166ff
Parents: 65d6c7a
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Fri Feb 27 13:27:47 2015 -0800
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Fri Feb 27 13:27:47 2015 -0800
----------------------------------------------------------------------
gora-core/pom.xml | 1 +
gora-hbase/pom.xml | 7 +++++
.../apache/gora/hbase/store/HBaseMapping.java | 2 +-
gora-mongodb/pom.xml | 7 +++++
.../gora/shims/hadoop1/TestHadoopShim1.java | 27 ++++++++++++++++----
.../gora/shims/hadoop2/TestHadoopShim2.java | 27 ++++++++++++++++----
pom.xml | 1 -
7 files changed, 60 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/gora/blob/e7d6b6ed/gora-core/pom.xml
----------------------------------------------------------------------
diff --git a/gora-core/pom.xml b/gora-core/pom.xml
index c34df17..b6e8152 100644
--- a/gora-core/pom.xml
+++ b/gora-core/pom.xml
@@ -113,6 +113,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/gora/blob/e7d6b6ed/gora-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/gora-hbase/pom.xml b/gora-hbase/pom.xml
index a8a2795..9e276ec 100644
--- a/gora-hbase/pom.xml
+++ b/gora-hbase/pom.xml
@@ -109,6 +109,13 @@
<!-- END of Gora Internal Dependencies -->
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<scope>compile</scope>
http://git-wip-us.apache.org/repos/asf/gora/blob/e7d6b6ed/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseMapping.java
----------------------------------------------------------------------
diff --git a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseMapping.java b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseMapping.java
index dbf02c4..d32bbd0 100644
--- a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseMapping.java
+++ b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseMapping.java
@@ -61,7 +61,7 @@ public class HBaseMapping {
/**
* A builder for creating the mapper. This will allow building a thread safe
- * {@link HBaseMapping} using simple immutabilty.
+ * {@link HBaseMapping} using simple immutability.
*
*/
public static class HBaseMappingBuilder {
http://git-wip-us.apache.org/repos/asf/gora/blob/e7d6b6ed/gora-mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/gora-mongodb/pom.xml b/gora-mongodb/pom.xml
index f69957b..84fceac 100644
--- a/gora-mongodb/pom.xml
+++ b/gora-mongodb/pom.xml
@@ -125,6 +125,13 @@
</dependency>
<!-- Misc Dependencies -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
http://git-wip-us.apache.org/repos/asf/gora/blob/e7d6b6ed/gora-shims-hadoop1/src/test/java/org/apache/gora/shims/hadoop1/TestHadoopShim1.java
----------------------------------------------------------------------
diff --git a/gora-shims-hadoop1/src/test/java/org/apache/gora/shims/hadoop1/TestHadoopShim1.java b/gora-shims-hadoop1/src/test/java/org/apache/gora/shims/hadoop1/TestHadoopShim1.java
index f0f1533..d227ce8 100644
--- a/gora-shims-hadoop1/src/test/java/org/apache/gora/shims/hadoop1/TestHadoopShim1.java
+++ b/gora-shims-hadoop1/src/test/java/org/apache/gora/shims/hadoop1/TestHadoopShim1.java
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.gora.shims.hadoop1;
import org.apache.gora.shims.hadoop.HadoopShim;
@@ -8,11 +25,11 @@ import static org.junit.Assert.*;
public class TestHadoopShim1 {
- @Test
- public void testCorrectVersion() {
- HadoopShim shim = HadoopShimFactory.INSTANCE().getHadoopShim();
+ @Test
+ public void testCorrectVersion() {
+ HadoopShim shim = HadoopShimFactory.INSTANCE().getHadoopShim();
- assertSame(shim.getClass(), HadoopShim1.class);
- }
+ assertSame(shim.getClass(), HadoopShim1.class);
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/e7d6b6ed/gora-shims-hadoop2/src/test/java/org/apache/gora/shims/hadoop2/TestHadoopShim2.java
----------------------------------------------------------------------
diff --git a/gora-shims-hadoop2/src/test/java/org/apache/gora/shims/hadoop2/TestHadoopShim2.java b/gora-shims-hadoop2/src/test/java/org/apache/gora/shims/hadoop2/TestHadoopShim2.java
index e97004d..643cae4 100644
--- a/gora-shims-hadoop2/src/test/java/org/apache/gora/shims/hadoop2/TestHadoopShim2.java
+++ b/gora-shims-hadoop2/src/test/java/org/apache/gora/shims/hadoop2/TestHadoopShim2.java
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.gora.shims.hadoop2;
import org.apache.gora.shims.hadoop.HadoopShim;
@@ -8,11 +25,11 @@ import static org.junit.Assert.*;
public class TestHadoopShim2 {
- @Test
- public void testCorrectVersion() {
- HadoopShim shim = HadoopShimFactory.INSTANCE().getHadoopShim();
+ @Test
+ public void testCorrectVersion() {
+ HadoopShim shim = HadoopShimFactory.INSTANCE().getHadoopShim();
- assertSame(shim.getClass(), HadoopShim2.class);
- }
+ assertSame(shim.getClass(), HadoopShim2.class);
+ }
}
http://git-wip-us.apache.org/repos/asf/gora/blob/e7d6b6ed/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b7bd55b..f5130d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -602,7 +602,6 @@
<module>gora-accumulo</module>
<module>gora-cassandra</module>
<module>gora-goraci</module>
-
<module>gora-hbase</module>
<!-- module>gora-lucene</module -->
<!--module>gora-dynamodb</module -->
[3/3] gora git commit: GORA-415 hadoop-client dependency should be
optional in gora-core
Posted by le...@apache.org.
GORA-415 hadoop-client dependency should be optional in gora-core
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/35a88e8a
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/35a88e8a
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/35a88e8a
Branch: refs/heads/master
Commit: 35a88e8a6f85e81462f6e1a66a56d9566f87939c
Parents: 0e66a0b
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Mon Mar 2 10:49:34 2015 -0800
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Mon Mar 2 10:49:34 2015 -0800
----------------------------------------------------------------------
CHANGES.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/gora/blob/35a88e8a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d148e31..e9a4ec7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,7 +2,9 @@
==CHANGES.txt
=======================================================================
-Apache Gora 0.7 Release
+Apache Gora 0.6.1 Release
+
+* GORA-415 hadoop-client dependency should be optional in gora-core (hsaputra via lewismc)
* GORA-410 Change logging behavior to pass exception object to LOG methods (Gerhard Gossen via lewismc)
[2/3] gora git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/gora into GORA-415
Posted by le...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/gora into GORA-415
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/0e66a0b0
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/0e66a0b0
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/0e66a0b0
Branch: refs/heads/master
Commit: 0e66a0b0a858bca51c6b0cf7e62f7ecaf4b5c841
Parents: e7d6b6e 1a8a14b
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Fri Feb 27 13:27:59 2015 -0800
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Fri Feb 27 13:27:59 2015 -0800
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------