Resolving conflicts with mainline

Signed-off-by: Dhiresh Jain <dhireshj@amazon.com>

src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java

@@ -62,8 +62,8 @@
 import org.opensearch.security.ssl.rest.SecuritySSLCertsInfoAction;
 import org.opensearch.security.ssl.transport.DefaultPrincipalExtractor;
 import org.opensearch.security.transport.SecurityInterceptor;
-import com.amazon.opendistroforelasticsearch.security.setting.OpensearchDynamicSetting;
-import com.amazon.opendistroforelasticsearch.security.setting.TransportPassiveAuthSetting;
+import org.opensearch.security.setting.OpensearchDynamicSetting;
+import org.opensearch.security.setting.TransportPassiveAuthSetting;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/org/opensearch/security/configuration/CompatConfig.java

@@ -30,7 +30,7 @@
 
 package org.opensearch.security.configuration;
 
-import com.amazon.opendistroforelasticsearch.security.setting.OpensearchDynamicSetting;
+import org.opensearch.security.setting.OpensearchDynamicSetting;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.common.settings.Settings;

src/main/java/com/amazon/opendistroforelasticsearch/security/setting/OpensearchDynamicSetting.java → src/main/java/org/opensearch/security/setting/OpensearchDynamicSetting.java

@@ -1,4 +1,19 @@
-package com.amazon.opendistroforelasticsearch.security.setting;
+/*
+ * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License").
+ *  You may not use this file except in compliance with the License.
+ *  A copy of the License is located at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  or in the "license" file accompanying this file. This file 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.opensearch.security.setting;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/com/amazon/opendistroforelasticsearch/security/setting/TransportPassiveAuthSetting.java → src/main/java/org/opensearch/security/setting/TransportPassiveAuthSetting.java

@@ -1,4 +1,19 @@
-package com.amazon.opendistroforelasticsearch.security.setting;
+/*
+ * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License").
+ *  You may not use this file except in compliance with the License.
+ *  A copy of the License is located at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  or in the "license" file accompanying this file. This file 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.opensearch.security.setting;
 
 import org.opensearch.security.support.ConfigConstants;
 import org.opensearch.common.settings.Setting;

src/test/java/com/amazon/opendistroforelasticsearch/security/AdvancedSecurityMigrationTests.java

@@ -26,7 +26,6 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.opensearch.security.support.ConfigConstants;
 
 import java.io.File;
 import java.util.Arrays;