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 040f08067d..dec2c1c44a 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 + *

+ * 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.hadoop.hdds; public final class HddsConfigKeys { diff --git a/hadoop-hdds/framework/README.md b/hadoop-hdds/framework/README.md index 59cdac71f3..0eda3f5edd 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 diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml index 959bf4dd31..c8d0797475 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -43,25 +43,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - org.apache.rat - apache-rat-plugin - - - .gitattributes - .idea/** - src/main/conf/* - src/main/webapps/static/angular-1.6.4.min.js - src/main/webapps/static/angular-nvd3-1.0.9.min.js - src/main/webapps/static/angular-route-1.6.4.min.js - src/main/webapps/static/d3-3.5.17.min.js - src/main/webapps/static/nvd3-1.8.5.min.css - src/main/webapps/static/nvd3-1.8.5.min.css.map - src/main/webapps/static/nvd3-1.8.5.min.js - src/main/webapps/static/nvd3-1.8.5.min.js.map - - - org.apache.maven.plugins maven-antrun-plugin diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index f12d3be0af..c15c541b4e 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/pom.xml @@ -86,6 +86,25 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + org.apache.rat + apache-rat-plugin + + + **/target/** + .gitattributes + .idea/** + src/main/resources/webapps/static/angular-1.6.4.min.js + src/main/resources/webapps/static/angular-nvd3-1.0.9.min.js + src/main/resources/webapps/static/angular-route-1.6.4.min.js + src/main/resources/webapps/static/d3-3.5.17.min.js + src/main/resources/webapps/static/nvd3-1.8.5.min.css + src/main/resources/webapps/static/nvd3-1.8.5.min.css.map + src/main/resources/webapps/static/nvd3-1.8.5.min.js + src/main/resources/webapps/static/nvd3-1.8.5.min.js.map + + + org.codehaus.mojo findbugs-maven-plugin diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml index 28250fa028..acc6711d6c 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"> jar - hdds + hdds true diff --git a/hadoop-ozone/acceptance-test/README.md b/hadoop-ozone/acceptance-test/README.md index 8907c840e4..07d10fbe9f 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 diff --git a/hadoop-ozone/acceptance-test/pom.xml b/hadoop-ozone/acceptance-test/pom.xml index 6100bebfc0..b4b24d5e39 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"> version:${project.version} basedir:${project.basedir} - false - false + false + false diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index e92b288fcf..566744441f 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"> apache-rat-plugin + **/target/** + acceptance-test/hadoop-ozone-acceptance-test.iml .gitattributes .idea/** dev-support/checkstyle* 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 b78347c392..468fee55ea 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 + *

+ * 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.hadoop.ozone.genesis; import com.google.protobuf.ByteString; 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 a5ab245222..fc3dbcb230 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 + *

+ * 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.hadoop.ozone.genesis; import org.apache.commons.lang.RandomStringUtils; 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 498801b343..f496a7d514 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 + *

+ * 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.hadoop.ozone.genesis; import org.apache.commons.lang.RandomStringUtils; 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 8e41ef54c5..611b62dfb0 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 + *

+ * 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.hadoop.ozone.genesis; import org.apache.commons.lang.RandomStringUtils; diff --git a/pom.xml b/pom.xml index 3e6c3f9377..0e7b23a2e7 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 **/build/** **/patchprocess/** **/*.js - hadoop-hdds/**/nvd3-* + hadoop-hdds/**/ + hadoop-ozone/**/