GORA-346 Create shim layer to support multiple hadoop versions
Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/69caf50f Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/69caf50f Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/69caf50f Branch: refs/heads/master Commit: 69caf50f56d80c1ecec832928eb1d73c515fce72 Parents: b51cdee Author: Lewis John McGibbney <[email protected]> Authored: Mon Sep 8 10:55:35 2014 -0700 Committer: Lewis John McGibbney <[email protected]> Committed: Mon Sep 8 10:55:35 2014 -0700 ---------------------------------------------------------------------- .../gora/mapreduce/GoraMapReduceUtils.java | 2 +- gora-shims-distribution/pom.xml | 30 ++++++++++++-------- gora-shims-hadoop/pom.xml | 30 ++++++++++++-------- gora-shims-hadoop1/pom.xml | 30 ++++++++++++-------- gora-shims-hadoop2/pom.xml | 30 ++++++++++++-------- 5 files changed, 73 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/69caf50f/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapReduceUtils.java ---------------------------------------------------------------------- diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapReduceUtils.java b/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapReduceUtils.java index 69545de..f6e3167 100644 --- a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapReduceUtils.java +++ b/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapReduceUtils.java @@ -38,7 +38,7 @@ import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; */ public class GoraMapReduceUtils { - private static HadoopShim hadoopShim = HadoopShimFactory.INSTANCE().getHadoopShim(); + private static final HadoopShim hadoopShim = HadoopShimFactory.INSTANCE().getHadoopShim(); public static class HelperInputFormat<K,V> extends FileInputFormat<K, V> { @Override http://git-wip-us.apache.org/repos/asf/gora/blob/69caf50f/gora-shims-distribution/pom.xml ---------------------------------------------------------------------- diff --git a/gora-shims-distribution/pom.xml b/gora-shims-distribution/pom.xml index acff69a..2e3f5f0 100644 --- a/gora-shims-distribution/pom.xml +++ b/gora-shims-distribution/pom.xml @@ -1,15 +1,21 @@ - <!-- 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. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <!-- + 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. + --> <modelVersion>4.0.0</modelVersion> <packaging>bundle</packaging> <parent> http://git-wip-us.apache.org/repos/asf/gora/blob/69caf50f/gora-shims-hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/gora-shims-hadoop/pom.xml b/gora-shims-hadoop/pom.xml index a9f10ad..ecefe67 100644 --- a/gora-shims-hadoop/pom.xml +++ b/gora-shims-hadoop/pom.xml @@ -1,15 +1,21 @@ - <!-- 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. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <!-- + 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. + --> <modelVersion>4.0.0</modelVersion> <parent> http://git-wip-us.apache.org/repos/asf/gora/blob/69caf50f/gora-shims-hadoop1/pom.xml ---------------------------------------------------------------------- diff --git a/gora-shims-hadoop1/pom.xml b/gora-shims-hadoop1/pom.xml index c798f18..7b9cd32 100644 --- a/gora-shims-hadoop1/pom.xml +++ b/gora-shims-hadoop1/pom.xml @@ -1,15 +1,21 @@ - <!-- 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. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <!-- + 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. + --> <modelVersion>4.0.0</modelVersion> <parent> http://git-wip-us.apache.org/repos/asf/gora/blob/69caf50f/gora-shims-hadoop2/pom.xml ---------------------------------------------------------------------- diff --git a/gora-shims-hadoop2/pom.xml b/gora-shims-hadoop2/pom.xml index 1ff9776..0b482d1 100644 --- a/gora-shims-hadoop2/pom.xml +++ b/gora-shims-hadoop2/pom.xml @@ -1,15 +1,21 @@ - <!-- 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. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <!-- + 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. + --> <modelVersion>4.0.0</modelVersion> <parent>
