From 9d5181cdc1b3d7034791e4efac6da755a7466a58 Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Thu, 5 May 2022 16:06:17 -0700 Subject: [PATCH 1/3] HADOOP-18224. Upgrade maven compiler plugin to 3.10.1 --- hadoop-client-modules/hadoop-client-minicluster/pom.xml | 7 +++++++ hadoop-project/pom.xml | 2 -- .../apache/hadoop/yarn/service/api/records/Component.java | 1 - pom.xml | 8 +++++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index 06e36837a2098..8ecf2fb1760d9 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -873,6 +873,13 @@ jetty-dir.css + + *:* + + **/hdfs/protocolPB/package-info.class + **/yarn/server/metrics/package-info.class + + diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 76ba2eeaa021e..7a0f26c44f39e 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -172,7 +172,6 @@ ${maven-surefire-plugin.version} 3.1.0 - 3.1 2.5.1 2.6 3.2.1 @@ -1856,7 +1855,6 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} ${javac.version} ${javac.version} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java index 8a5b7d402f773..06e318310c3fd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java @@ -117,7 +117,6 @@ public class Component implements Serializable { * 0); * NEVER (Do not restart in any cases) * - * @return restartPolicy **/ @XmlType(name = "restart_policy") @XmlEnum diff --git a/pom.xml b/pom.xml index 1f6aa885666c4..2af523b63bea4 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x 3.0.2 3.0.0 2.0.0 - 3.0.1 + 3.4.0 1.5 1.5 3.0.1 @@ -117,6 +117,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x 4.2.2 4.2.0 1.1.1 + 3.10.1 bash @@ -478,6 +479,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x jsonschema2pojo-maven-plugin ${jsonschema2pojo-maven-plugin.version} + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + From 6e51f1612d8959b44e8812c2f6eead4efe5ec777 Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Mon, 16 May 2022 10:53:24 -0700 Subject: [PATCH 2/3] revert javadoc plugin upgrade --- .../org/apache/hadoop/yarn/service/api/records/Component.java | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java index 06e318310c3fd..8a5b7d402f773 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java @@ -117,6 +117,7 @@ public class Component implements Serializable { * 0); * NEVER (Do not restart in any cases) * + * @return restartPolicy **/ @XmlType(name = "restart_policy") @XmlEnum diff --git a/pom.xml b/pom.xml index 2af523b63bea4..a51c5e29aa650 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x 3.0.2 3.0.0 2.0.0 - 3.4.0 + 3.0.1 1.5 1.5 3.0.1 From bae7de5ec5a9c965f4271eccd0f5e1a34d9d3030 Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Tue, 17 May 2022 11:06:56 -0700 Subject: [PATCH 3/3] keeping only one package-info.java for each package --- .../hadoop-client-minicluster/pom.xml | 7 ------- .../hadoop/hdfs/protocolPB/package-info.java | 18 ------------------ .../hadoop/hdfs/protocolPB/package-info.java | 18 ------------------ .../yarn/server/metrics/package-info.java | 18 ------------------ 4 files changed, 61 deletions(-) delete mode 100644 hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/package-info.java delete mode 100644 hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/protocolPB/package-info.java delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/package-info.java diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index 8ecf2fb1760d9..06e36837a2098 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -873,13 +873,6 @@ jetty-dir.css - - *:* - - **/hdfs/protocolPB/package-info.class - **/yarn/server/metrics/package-info.class - - diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/package-info.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/package-info.java deleted file mode 100644 index 6233024467df7..0000000000000 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/package-info.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - * 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.hdfs.protocolPB; \ No newline at end of file diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/protocolPB/package-info.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/protocolPB/package-info.java deleted file mode 100644 index 6233024467df7..0000000000000 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/protocolPB/package-info.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - * 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.hdfs.protocolPB; \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/package-info.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/package-info.java deleted file mode 100644 index a67cf9304c162..0000000000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/metrics/package-info.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - * 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.yarn.server.metrics; \ No newline at end of file