HDFS-13422. Ozone: Fix whitespaces and license issues in HDFS-7240 branch. Contributed by Lokesh Jain.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/94cb164d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/94cb164d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/94cb164d Branch: refs/heads/trunk Commit: 94cb164dece9d63bc2ac0f62c3bd5f3713d65235 Parents: eea3128 Author: Xiaoyu Yao <x...@apache.org> Authored: Tue Apr 17 10:26:08 2018 -0700 Committer: Xiaoyu Yao <x...@apache.org> Committed: Tue Apr 17 10:26:08 2018 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hdds/HddsConfigKeys.java | 17 +++++++++++++++++ hadoop-hdds/framework/README.md | 4 ++-- hadoop-hdds/framework/pom.xml | 19 ------------------- hadoop-hdds/pom.xml | 19 +++++++++++++++++++ hadoop-hdds/tools/pom.xml | 2 +- hadoop-ozone/acceptance-test/README.md | 6 +++--- hadoop-ozone/acceptance-test/pom.xml | 4 ++-- hadoop-ozone/pom.xml | 2 ++ .../genesis/BenchMarkDatanodeDispatcher.java | 17 +++++++++++++++++ .../genesis/BenchMarkMetadataStoreReads.java | 17 +++++++++++++++++ .../genesis/BenchMarkMetadataStoreWrites.java | 17 +++++++++++++++++ .../apache/hadoop/ozone/genesis/GenesisUtil.java | 17 +++++++++++++++++ pom.xml | 3 ++- 13 files changed, 116 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/94cb164d/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java index 040f080..dec2c1c 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.hadoop.hdds; public final class HddsConfigKeys { http://git-wip-us.apache.org/repos/asf/hadoop/blob/94cb164d/hadoop-hdds/framework/README.md ---------------------------------------------------------------------- diff --git a/hadoop-hdds/framework/README.md b/hadoop-hdds/framework/README.md index 59cdac7..0eda3f5 100644 --- a/hadoop-hdds/framework/README.md +++ b/hadoop-hdds/framework/README.md @@ -17,8 +17,8 @@ # Server framework for HDDS/Ozone -This project contains generic utilities and resources for all the HDDS/Ozone +This project contains generic utilities and resources for all the HDDS/Ozone server-side components. -The project is shared between the server/service projects but not with the +The project is shared between the server/service projects but not with the client packages. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/94cb164d/hadoop-hdds/framework/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml index 959bf4d..c8d0797 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -44,25 +44,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <build> <plugins> <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>.gitattributes</exclude> - <exclude>.idea/**</exclude> - <exclude>src/main/conf/*</exclude> - <exclude>src/main/webapps/static/angular-1.6.4.min.js</exclude> - <exclude>src/main/webapps/static/angular-nvd3-1.0.9.min.js</exclude> - <exclude>src/main/webapps/static/angular-route-1.6.4.min.js</exclude> - <exclude>src/main/webapps/static/d3-3.5.17.min.js</exclude> - <exclude>src/main/webapps/static/nvd3-1.8.5.min.css</exclude> - <exclude>src/main/webapps/static/nvd3-1.8.5.min.css.map</exclude> - <exclude>src/main/webapps/static/nvd3-1.8.5.min.js</exclude> - <exclude>src/main/webapps/static/nvd3-1.8.5.min.js.map</exclude> - </excludes> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <executions> http://git-wip-us.apache.org/repos/asf/hadoop/blob/94cb164d/hadoop-hdds/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index f12d3be..c15c541 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/pom.xml @@ -87,6 +87,25 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <build> <plugins> <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/target/**</exclude> + <exclude>.gitattributes</exclude> + <exclude>.idea/**</exclude> + <exclude>src/main/resources/webapps/static/angular-1.6.4.min.js</exclude> + <exclude>src/main/resources/webapps/static/angular-nvd3-1.0.9.min.js</exclude> + <exclude>src/main/resources/webapps/static/angular-route-1.6.4.min.js</exclude> + <exclude>src/main/resources/webapps/static/d3-3.5.17.min.js</exclude> + <exclude>src/main/resources/webapps/static/nvd3-1.8.5.min.css</exclude> + <exclude>src/main/resources/webapps/static/nvd3-1.8.5.min.css.map</exclude> + <exclude>src/main/resources/webapps/static/nvd3-1.8.5.min.js</exclude> + <exclude>src/main/resources/webapps/static/nvd3-1.8.5.min.js.map</exclude> + </excludes> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/hadoop/blob/94cb164d/hadoop-hdds/tools/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml index 28250fa..acc6711 100644 --- a/hadoop-hdds/tools/pom.xml +++ b/hadoop-hdds/tools/pom.xml @@ -30,7 +30,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <packaging>jar</packaging> <properties> - <hadoop.component>hdds</hadoop.component> + <hadoop.component>hdds</hadoop.component> <is.hadoop.component>true</is.hadoop.component> </properties> http://git-wip-us.apache.org/repos/asf/hadoop/blob/94cb164d/hadoop-ozone/acceptance-test/README.md ---------------------------------------------------------------------- diff --git a/hadoop-ozone/acceptance-test/README.md b/hadoop-ozone/acceptance-test/README.md index 8907c84..07d10fb 100644 --- a/hadoop-ozone/acceptance-test/README.md +++ b/hadoop-ozone/acceptance-test/README.md @@ -24,15 +24,15 @@ Typically you need a `mvn install -Phdsl,ozone-acceptance-test,dist -DskipTests` Notes: - 1. You need a hadoop build in hadoop-dist/target directory. + 1. You need a hadoop build in hadoop-dist/target directory. 2. The `ozone-acceptance-test` could be activated with profile even if the unit tests are disabled. - + ## Development You can run manually the robot tests with `robot` cli. (See robotframework docs to install it.) 1. Go to the `src/test/robotframework` 2. Execute `robot -v basedir:${PWD}/../../.. -v VERSION:3.2.0-SNAPSHOT .` - + You can also use select just one test with -t `"*testnamefragment*"` \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/94cb164d/hadoop-ozone/acceptance-test/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-ozone/acceptance-test/pom.xml b/hadoop-ozone/acceptance-test/pom.xml index 6100beb..b4b24d5 100644 --- a/hadoop-ozone/acceptance-test/pom.xml +++ b/hadoop-ozone/acceptance-test/pom.xml @@ -73,8 +73,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <variable>version:${project.version}</variable> <variable>basedir:${project.basedir}</variable> </variables> - <skip>false</skip> - <skipTests>false</skipTests> + <skip>false</skip> + <skipTests>false</skipTests> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/hadoop/blob/94cb164d/hadoop-ozone/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index e92b288..5667444 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -122,6 +122,8 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <artifactId>apache-rat-plugin</artifactId> <configuration> <excludes> + <exclude>**/target/**</exclude> + <exclude>acceptance-test/hadoop-ozone-acceptance-test.iml</exclude> <exclude>.gitattributes</exclude> <exclude>.idea/**</exclude> <exclude>dev-support/checkstyle*</exclude> http://git-wip-us.apache.org/repos/asf/hadoop/blob/94cb164d/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkDatanodeDispatcher.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkDatanodeDispatcher.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkDatanodeDispatcher.java index b78347c..468fee5 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkDatanodeDispatcher.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkDatanodeDispatcher.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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.hadoop.ozone.genesis; import com.google.protobuf.ByteString; http://git-wip-us.apache.org/repos/asf/hadoop/blob/94cb164d/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkMetadataStoreReads.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkMetadataStoreReads.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkMetadataStoreReads.java index a5ab245..fc3dbcb 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkMetadataStoreReads.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkMetadataStoreReads.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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.hadoop.ozone.genesis; import org.apache.commons.lang.RandomStringUtils; http://git-wip-us.apache.org/repos/asf/hadoop/blob/94cb164d/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkMetadataStoreWrites.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkMetadataStoreWrites.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkMetadataStoreWrites.java index 498801b..f496a7d 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkMetadataStoreWrites.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/BenchMarkMetadataStoreWrites.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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.hadoop.ozone.genesis; import org.apache.commons.lang.RandomStringUtils; http://git-wip-us.apache.org/repos/asf/hadoop/blob/94cb164d/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/GenesisUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/GenesisUtil.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/GenesisUtil.java index 8e41ef5..611b62d 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/GenesisUtil.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/genesis/GenesisUtil.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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.hadoop.ozone.genesis; import org.apache.commons.lang.RandomStringUtils; http://git-wip-us.apache.org/repos/asf/hadoop/blob/94cb164d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3e6c3f9..0e7b23a 100644 --- a/pom.xml +++ b/pom.xml @@ -389,7 +389,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <exclude>**/build/**</exclude> <exclude>**/patchprocess/**</exclude> <exclude>**/*.js</exclude> - <exclude>hadoop-hdds/**/nvd3-*</exclude> + <exclude>hadoop-hdds/**/</exclude> + <exclude>hadoop-ozone/**/</exclude> </excludes> </configuration> </plugin> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
