diff --git a/addons/falcon-bridge-shim/pom.xml b/addons/falcon-bridge-shim/pom.xml index 480d325de2d..419400aa160 100755 --- a/addons/falcon-bridge-shim/pom.xml +++ b/addons/falcon-bridge-shim/pom.xml @@ -48,6 +48,10 @@ ${falcon.version} provided + + commons-configuration + commons-configuration + javax.servlet servlet-api diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml index 7dfe6c55afc..79903c065f5 100644 --- a/addons/falcon-bridge/pom.xml +++ b/addons/falcon-bridge/pom.xml @@ -75,6 +75,10 @@ ${falcon.version} provided + + commons-configuration + commons-configuration + javax.servlet servlet-api diff --git a/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java b/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java index f1b4cb41b94..906686051d9 100644 --- a/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java +++ b/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java @@ -32,7 +32,7 @@ import org.apache.atlas.utils.AuthenticationUtil; import org.apache.atlas.utils.ParamChecker; import org.apache.atlas.v1.typesystem.types.utils.TypesUtil; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.RandomStringUtils; import org.apache.falcon.entity.FeedHelper; import org.apache.falcon.entity.FileSystemStorage; diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml index 5cb14f650f9..1fc4119453a 100644 --- a/addons/hbase-bridge/pom.xml +++ b/addons/hbase-bridge/pom.xml @@ -577,9 +577,9 @@ ${jackson.version} - commons-configuration - commons-configuration - ${commons-conf.version} + org.apache.commons + commons-configuration2 + ${commons-conf2.version} com.sun.jersey diff --git a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseBridge.java b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseBridge.java index 81aa91b926b..137d8378f74 100644 --- a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseBridge.java +++ b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseBridge.java @@ -36,7 +36,7 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.hbase.HBaseConfiguration; diff --git a/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java b/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java index 00d140e0e55..40cd28139a4 100644 --- a/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java +++ b/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java @@ -159,7 +159,7 @@ public void testCreateTable() throws Exception { // Methods for creating HBase private void createAtlasClient() { try { - org.apache.commons.configuration.Configuration configuration = ApplicationProperties.get(); + org.apache.commons.configuration2.Configuration configuration = ApplicationProperties.get(); String[] atlasEndPoint = configuration.getStringArray(HBaseAtlasHook.ATTR_ATLAS_ENDPOINT); configuration.setProperty("atlas.cluster.name", CLUSTER_NAME); diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml index d5f3588ba0c..7c0729571b0 100755 --- a/addons/hive-bridge/pom.xml +++ b/addons/hive-bridge/pom.xml @@ -511,9 +511,9 @@ ${jackson.version} - commons-configuration - commons-configuration - ${commons-conf.version} + org.apache.commons + commons-configuration2 + ${commons-conf2.version} com.sun.jersey diff --git a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java index e4f20554f93..083a66488a4 100755 --- a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java +++ b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java @@ -51,7 +51,7 @@ import org.apache.commons.cli.MissingArgumentException; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; diff --git a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeV2.java b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeV2.java index 30720548d1c..fbb741b2d1f 100644 --- a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeV2.java +++ b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeV2.java @@ -45,7 +45,7 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.collections.MapUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.RandomStringUtils; diff --git a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/utils/ActiveEntityFilter.java b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/utils/ActiveEntityFilter.java index 0b0d4d6b265..8b07ac5ccbe 100644 --- a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/utils/ActiveEntityFilter.java +++ b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/utils/ActiveEntityFilter.java @@ -20,7 +20,7 @@ import com.google.common.annotations.VisibleForTesting; import org.apache.atlas.hive.hook.HiveHook; import org.apache.atlas.model.notification.HookNotification; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java index f0494dbfef0..b5ea108548c 100644 --- a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java +++ b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java @@ -33,7 +33,7 @@ import org.apache.atlas.model.notification.HookNotification; import org.apache.atlas.utils.AuthenticationUtil; import org.apache.atlas.utils.ParamChecker; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.fs.Path; diff --git a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java index f88928d28e0..50a2f0a2e4e 100755 --- a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java +++ b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java @@ -37,7 +37,7 @@ import org.apache.atlas.model.typedef.AtlasTypesDef; import org.apache.atlas.type.AtlasTypeUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.conf.HiveConf; diff --git a/addons/impala-bridge/pom.xml b/addons/impala-bridge/pom.xml index 0d2ffcb8d4b..e2dc0c5262c 100644 --- a/addons/impala-bridge/pom.xml +++ b/addons/impala-bridge/pom.xml @@ -501,9 +501,9 @@ ${jackson.version} - commons-configuration - commons-configuration - ${commons-conf.version} + org.apache.commons + commons-configuration2 + ${commons-conf2.version} com.sun.jersey diff --git a/addons/impala-bridge/src/test/java/org/apache/atlas/impala/ImpalaLineageITBase.java b/addons/impala-bridge/src/test/java/org/apache/atlas/impala/ImpalaLineageITBase.java index 7c59f917d70..fa4291450fb 100644 --- a/addons/impala-bridge/src/test/java/org/apache/atlas/impala/ImpalaLineageITBase.java +++ b/addons/impala-bridge/src/test/java/org/apache/atlas/impala/ImpalaLineageITBase.java @@ -28,7 +28,7 @@ import org.apache.atlas.model.instance.AtlasObjectId; import org.apache.atlas.utils.AuthenticationUtil; import org.apache.atlas.utils.ParamChecker; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.hive.conf.HiveConf; diff --git a/addons/kafka-bridge/pom.xml b/addons/kafka-bridge/pom.xml index 3ba4978350c..d6145a7082c 100644 --- a/addons/kafka-bridge/pom.xml +++ b/addons/kafka-bridge/pom.xml @@ -489,9 +489,9 @@ ${httpcomponents-httpcore.version} - commons-configuration - commons-configuration - ${commons-conf.version} + org.apache.commons + commons-configuration2 + ${commons-conf2.version} com.googlecode.json-simple diff --git a/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java b/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java index 2c39a58aa63..dc14ead0cf3 100644 --- a/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java +++ b/addons/kafka-bridge/src/main/java/org/apache/atlas/kafka/bridge/KafkaBridge.java @@ -36,7 +36,7 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.security.UserGroupInformation; import org.apache.http.impl.client.CloseableHttpClient; diff --git a/addons/kafka-bridge/src/test/java/org/apache/atlas/kafka/bridge/KafkaBridgeTest.java b/addons/kafka-bridge/src/test/java/org/apache/atlas/kafka/bridge/KafkaBridgeTest.java index aeb15be7e97..0d64d443fc5 100644 --- a/addons/kafka-bridge/src/test/java/org/apache/atlas/kafka/bridge/KafkaBridgeTest.java +++ b/addons/kafka-bridge/src/test/java/org/apache/atlas/kafka/bridge/KafkaBridgeTest.java @@ -26,7 +26,7 @@ import org.apache.atlas.model.instance.EntityMutationResponse; import org.apache.atlas.utils.KafkaUtils; import org.apache.avro.Schema; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.http.HttpEntity; import org.apache.http.HttpStatus; import org.apache.http.StatusLine; diff --git a/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java b/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java index 63ea2a52407..88cf44b1d22 100644 --- a/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java +++ b/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java @@ -32,7 +32,7 @@ import org.apache.atlas.sqoop.model.SqoopDataTypes; import org.apache.atlas.type.AtlasTypeUtil; import org.apache.atlas.utils.AtlasConfigurationUtil; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.sqoop.SqoopJobDataPublisher; import org.apache.sqoop.util.ImportException; diff --git a/addons/sqoop-bridge/src/test/java/org/apache/atlas/sqoop/hook/SqoopHookIT.java b/addons/sqoop-bridge/src/test/java/org/apache/atlas/sqoop/hook/SqoopHookIT.java index f73990b23bb..3d7228c5702 100644 --- a/addons/sqoop-bridge/src/test/java/org/apache/atlas/sqoop/hook/SqoopHookIT.java +++ b/addons/sqoop-bridge/src/test/java/org/apache/atlas/sqoop/hook/SqoopHookIT.java @@ -26,7 +26,7 @@ import org.apache.atlas.utils.AuthenticationUtil; import org.apache.atlas.utils.ParamChecker; import org.apache.atlas.v1.model.instance.Referenceable; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.sqoop.SqoopJobDataPublisher; import org.slf4j.Logger; import org.testng.annotations.BeforeClass; diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml index f1d13054ecd..2c324d865d5 100644 --- a/addons/storm-bridge/pom.xml +++ b/addons/storm-bridge/pom.xml @@ -461,9 +461,9 @@ ${aopalliance.version} - commons-configuration - commons-configuration - ${commons-conf.version} + org.apache.commons + commons-configuration2 + ${commons-conf2.version} org.apache.commons diff --git a/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java b/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java index 36c19c7a739..4879ffe1dff 100644 --- a/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java +++ b/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java @@ -25,7 +25,7 @@ import org.apache.atlas.storm.model.StormDataTypes; import org.apache.atlas.utils.AuthenticationUtil; import org.apache.atlas.v1.model.instance.Referenceable; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.storm.ILocalCluster; import org.apache.storm.generated.StormTopology; import org.slf4j.Logger; diff --git a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/cli/ExtractorContext.java b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/cli/ExtractorContext.java index 2857a6ff40e..049e93e0e96 100644 --- a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/cli/ExtractorContext.java +++ b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/cli/ExtractorContext.java @@ -22,7 +22,7 @@ import org.apache.atlas.trino.client.AtlasClientHelper; import org.apache.atlas.trino.client.TrinoClientHelper; import org.apache.commons.cli.CommandLine; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import java.io.IOException; diff --git a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/client/AtlasClientHelper.java b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/client/AtlasClientHelper.java index a446fc980f3..e71cc0776e2 100644 --- a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/client/AtlasClientHelper.java +++ b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/client/AtlasClientHelper.java @@ -31,7 +31,7 @@ import org.apache.atlas.utils.AuthenticationUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.ArrayUtils; import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.Logger; diff --git a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/client/TrinoClientHelper.java b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/client/TrinoClientHelper.java index 28a7df650bf..33a75cd2176 100644 --- a/addons/trino-extractor/src/main/java/org/apache/atlas/trino/client/TrinoClientHelper.java +++ b/addons/trino-extractor/src/main/java/org/apache/atlas/trino/client/TrinoClientHelper.java @@ -17,7 +17,7 @@ */ package org.apache.atlas.trino.client; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import java.sql.Connection; diff --git a/authorization/src/main/java/org/apache/atlas/authorize/AtlasAuthorizerFactory.java b/authorization/src/main/java/org/apache/atlas/authorize/AtlasAuthorizerFactory.java index 0b24ef68d41..dab3ea0a10c 100644 --- a/authorization/src/main/java/org/apache/atlas/authorize/AtlasAuthorizerFactory.java +++ b/authorization/src/main/java/org/apache/atlas/authorize/AtlasAuthorizerFactory.java @@ -21,7 +21,7 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasException; import org.apache.atlas.authorize.simple.AtlasSimpleAuthorizer; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/client/client-v1/pom.xml b/client/client-v1/pom.xml index cd12d33690c..1a0a7f348ea 100644 --- a/client/client-v1/pom.xml +++ b/client/client-v1/pom.xml @@ -42,12 +42,6 @@ org.apache.atlas atlas-common ${project.version} - - - org.apache.commons - commons-text - - diff --git a/client/client-v1/src/main/java/org/apache/atlas/AtlasAdminClient.java b/client/client-v1/src/main/java/org/apache/atlas/AtlasAdminClient.java index 323aabddd09..d1932f0a896 100644 --- a/client/client-v1/src/main/java/org/apache/atlas/AtlasAdminClient.java +++ b/client/client-v1/src/main/java/org/apache/atlas/AtlasAdminClient.java @@ -28,7 +28,7 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import java.util.Arrays; diff --git a/client/client-v1/src/main/java/org/apache/atlas/AtlasClient.java b/client/client-v1/src/main/java/org/apache/atlas/AtlasClient.java index ab678929518..8dfb6d2c9d0 100644 --- a/client/client-v1/src/main/java/org/apache/atlas/AtlasClient.java +++ b/client/client-v1/src/main/java/org/apache/atlas/AtlasClient.java @@ -33,7 +33,7 @@ import org.apache.atlas.v1.model.typedef.TraitTypeDefinition; import org.apache.atlas.v1.model.typedef.TypesDef; import org.apache.atlas.v1.typesystem.types.utils.TypesUtil; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.Logger; diff --git a/client/client-v1/src/test/java/org/apache/atlas/AtlasAdminClientTest.java b/client/client-v1/src/test/java/org/apache/atlas/AtlasAdminClientTest.java index 0c3773b59c5..cb1395b0d98 100644 --- a/client/client-v1/src/test/java/org/apache/atlas/AtlasAdminClientTest.java +++ b/client/client-v1/src/test/java/org/apache/atlas/AtlasAdminClientTest.java @@ -21,7 +21,7 @@ import org.apache.atlas.utils.AuthenticationUtil; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Options; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.MockitoAnnotations; diff --git a/client/client-v1/src/test/java/org/apache/atlas/AtlasClientTest.java b/client/client-v1/src/test/java/org/apache/atlas/AtlasClientTest.java index afa7b9a85a2..a86d8e3af5a 100644 --- a/client/client-v1/src/test/java/org/apache/atlas/AtlasClientTest.java +++ b/client/client-v1/src/test/java/org/apache/atlas/AtlasClientTest.java @@ -24,7 +24,7 @@ import org.apache.atlas.model.legacy.EntityResult; import org.apache.atlas.type.AtlasType; import org.apache.atlas.v1.model.instance.Referenceable; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.hadoop.security.UserGroupInformation; import org.mockito.Matchers; import org.mockito.Mock; diff --git a/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java b/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java index 31687acda8a..dc71236b17a 100644 --- a/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java +++ b/client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java @@ -74,7 +74,7 @@ import org.apache.atlas.model.typedef.AtlasTypesDef; import org.apache.atlas.type.AtlasType; import org.apache.commons.collections.MapUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.security.UserGroupInformation; diff --git a/client/client-v2/src/test/java/org/apache/atlas/AtlasClientV2Test.java b/client/client-v2/src/test/java/org/apache/atlas/AtlasClientV2Test.java index be180b56ab0..465028d6edb 100644 --- a/client/client-v2/src/test/java/org/apache/atlas/AtlasClientV2Test.java +++ b/client/client-v2/src/test/java/org/apache/atlas/AtlasClientV2Test.java @@ -52,7 +52,7 @@ import org.apache.atlas.model.typedef.AtlasRelationshipDef; import org.apache.atlas.model.typedef.AtlasStructDef; import org.apache.atlas.model.typedef.AtlasTypesDef; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.hadoop.security.UserGroupInformation; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java b/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java index 3e4ecad7880..2faa7c5e11b 100644 --- a/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java +++ b/client/common/src/main/java/org/apache/atlas/AtlasBaseClient.java @@ -46,7 +46,7 @@ import org.apache.atlas.type.AtlasType; import org.apache.atlas.utils.AtlasJson; import org.apache.atlas.utils.AuthenticationUtil; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.security.UserGroupInformation; diff --git a/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java b/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java index 477ce56dc38..e6fb86e5358 100644 --- a/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java +++ b/client/common/src/main/java/org/apache/atlas/security/SecureClientUtils.java @@ -66,7 +66,7 @@ public class SecureClientUtils { private SSLFactory factory; - public static void persistSSLClientConfiguration(org.apache.commons.configuration.Configuration clientConfig, String confLocation) throws AtlasException, IOException { + public static void persistSSLClientConfiguration(org.apache.commons.configuration2.Configuration clientConfig, String confLocation) throws AtlasException, IOException { //trust settings Configuration configuration = new Configuration(false); File sslClientFile = getSSLClientFile(confLocation); @@ -94,7 +94,7 @@ public static void persistSSLClientConfiguration(org.apache.commons.configuratio } } - public URLConnectionClientHandler getClientConnectionHandler(DefaultClientConfig config, org.apache.commons.configuration.Configuration clientConfig, String doAsUser, final UserGroupInformation ugi) { + public URLConnectionClientHandler getClientConnectionHandler(DefaultClientConfig config, org.apache.commons.configuration2.Configuration clientConfig, String doAsUser, final UserGroupInformation ugi) { config.getProperties().put(URLConnectionClientHandler.PROPERTY_HTTP_URL_CONNECTION_SET_METHOD_WORKAROUND, true); Configuration conf = new Configuration(); diff --git a/common/pom.xml b/common/pom.xml index d722f559111..3644861aad0 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -42,12 +42,6 @@ commons-collections commons-collections - - - commons-configuration - commons-configuration - - javax.annotation javax.annotation-api @@ -68,12 +62,6 @@ org.apache.commons commons-configuration2 ${commons-conf2.version} - - - org.apache.commons - commons-text - - diff --git a/common/src/main/java/org/apache/atlas/CommonConfiguration.java b/common/src/main/java/org/apache/atlas/CommonConfiguration.java index edea42ba8b9..09bb4ec9a6c 100644 --- a/common/src/main/java/org/apache/atlas/CommonConfiguration.java +++ b/common/src/main/java/org/apache/atlas/CommonConfiguration.java @@ -29,7 +29,7 @@ public class CommonConfiguration { private static final Logger LOGGER = LoggerFactory.getLogger(CommonConfiguration.class); @Bean - public org.apache.commons.configuration.Configuration getAtlasConfig() throws AtlasException { + public org.apache.commons.configuration2.Configuration getAtlasConfig() throws AtlasException { try { return ApplicationProperties.get(); } catch (AtlasException e) { diff --git a/common/src/main/java/org/apache/atlas/ha/HAConfiguration.java b/common/src/main/java/org/apache/atlas/ha/HAConfiguration.java index 4382d429ebc..ca0fae0bd95 100644 --- a/common/src/main/java/org/apache/atlas/ha/HAConfiguration.java +++ b/common/src/main/java/org/apache/atlas/ha/HAConfiguration.java @@ -19,7 +19,7 @@ package org.apache.atlas.ha; import org.apache.atlas.security.SecurityProperties; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; diff --git a/common/src/main/java/org/apache/atlas/repository/Constants.java b/common/src/main/java/org/apache/atlas/repository/Constants.java index dcc3f123e97..13f36c4b479 100644 --- a/common/src/main/java/org/apache/atlas/repository/Constants.java +++ b/common/src/main/java/org/apache/atlas/repository/Constants.java @@ -20,7 +20,7 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasException; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import static org.apache.atlas.type.AtlasStructType.AtlasAttribute.encodePropertyKey; diff --git a/common/src/main/java/org/apache/atlas/service/Services.java b/common/src/main/java/org/apache/atlas/service/Services.java index 7287268d236..c815d99e5a2 100644 --- a/common/src/main/java/org/apache/atlas/service/Services.java +++ b/common/src/main/java/org/apache/atlas/service/Services.java @@ -18,7 +18,7 @@ package org.apache.atlas.service; import org.apache.atlas.annotation.AtlasService; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java b/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java index 83b165c0014..7ee13b7dfa0 100644 --- a/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java +++ b/common/src/main/java/org/apache/atlas/utils/KafkaUtils.java @@ -20,7 +20,7 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.security.SecurityUtil; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.security.UserGroupInformation; import org.apache.kafka.clients.admin.AdminClient; diff --git a/common/src/main/java/org/apache/atlas/utils/OnAtlasPropertyCondition.java b/common/src/main/java/org/apache/atlas/utils/OnAtlasPropertyCondition.java index 03e5493f683..92ff402282a 100644 --- a/common/src/main/java/org/apache/atlas/utils/OnAtlasPropertyCondition.java +++ b/common/src/main/java/org/apache/atlas/utils/OnAtlasPropertyCondition.java @@ -20,7 +20,7 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasException; import org.apache.atlas.annotation.ConditionalOnAtlasProperty; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/test/java/org/apache/atlas/ha/HAConfigurationTest.java b/common/src/test/java/org/apache/atlas/ha/HAConfigurationTest.java index 66bd2bb3424..944dac086c6 100644 --- a/common/src/test/java/org/apache/atlas/ha/HAConfigurationTest.java +++ b/common/src/test/java/org/apache/atlas/ha/HAConfigurationTest.java @@ -20,7 +20,7 @@ import org.apache.atlas.AtlasConstants; import org.apache.atlas.security.SecurityProperties; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.testng.annotations.BeforeMethod; diff --git a/common/src/test/java/org/apache/atlas/utils/KafkaUtilsTest.java b/common/src/test/java/org/apache/atlas/utils/KafkaUtilsTest.java index dc6dc482550..3ed53d456e8 100644 --- a/common/src/test/java/org/apache/atlas/utils/KafkaUtilsTest.java +++ b/common/src/test/java/org/apache/atlas/utils/KafkaUtilsTest.java @@ -18,8 +18,8 @@ package org.apache.atlas.utils; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.security.alias.CredentialProvider; import org.apache.hadoop.security.alias.CredentialProviderFactory; diff --git a/graphdb/common/src/test/java/org/apache/atlas/graph/GraphSandboxUtil.java b/graphdb/common/src/test/java/org/apache/atlas/graph/GraphSandboxUtil.java index 2d0e9f4a3aa..17d0e2f61b7 100644 --- a/graphdb/common/src/test/java/org/apache/atlas/graph/GraphSandboxUtil.java +++ b/graphdb/common/src/test/java/org/apache/atlas/graph/GraphSandboxUtil.java @@ -19,7 +19,7 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasException; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.SkipException; diff --git a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraph.java b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraph.java index e0d4857a1ca..2286231fab0 100644 --- a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraph.java +++ b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraph.java @@ -45,7 +45,7 @@ import org.apache.atlas.repository.graphdb.janus.query.AtlasJanusGraphQuery; import org.apache.atlas.repository.graphdb.utils.IteratorToIterableAdapter; import org.apache.atlas.type.AtlasType; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.hadoop.util.StringUtils; import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine; import org.apache.tinkerpop.gremlin.jsr223.DefaultImportCustomizer; diff --git a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java index 8648fb6c137..186b817d4fa 100644 --- a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java +++ b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java @@ -29,8 +29,8 @@ import org.apache.atlas.repository.graphdb.janus.serializer.BigIntegerSerializer; import org.apache.atlas.repository.graphdb.janus.serializer.TypeCategorySerializer; import org.apache.atlas.typesystem.types.DataTypes.TypeCategory; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationConverter; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationConverter; import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper; import org.janusgraph.core.JanusGraph; import org.janusgraph.core.JanusGraphException; diff --git a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphIndexClient.java b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphIndexClient.java index 0c73fa5b2af..8b81d54ef5b 100644 --- a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphIndexClient.java +++ b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphIndexClient.java @@ -27,7 +27,7 @@ import org.apache.atlas.type.AtlasStructType.AtlasAttribute; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrQuery; diff --git a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusDatabaseTest.java b/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusDatabaseTest.java index 5ee4203f95e..c1d20567bef 100644 --- a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusDatabaseTest.java +++ b/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusDatabaseTest.java @@ -32,7 +32,7 @@ import org.apache.atlas.repository.graphdb.AtlasVertex; import org.apache.atlas.runner.LocalSolrRunner; import org.apache.atlas.typesystem.types.DataTypes.TypeCategory; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; diff --git a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphIndexClientTest.java b/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphIndexClientTest.java index 8f126f03971..6a3662fd5a4 100644 --- a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphIndexClientTest.java +++ b/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphIndexClientTest.java @@ -22,7 +22,7 @@ import org.apache.atlas.repository.Constants; import org.apache.atlas.repository.graphdb.AggregationContext; import org.apache.atlas.type.AtlasStructType.AtlasAttribute; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrResponse; diff --git a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphTest.java b/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphTest.java index 7e0cdef4114..6d41759a278 100644 --- a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphTest.java +++ b/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphTest.java @@ -30,7 +30,7 @@ import org.apache.atlas.repository.graphdb.GremlinVersion; import org.apache.atlas.runner.LocalSolrRunner; import org.apache.atlas.type.AtlasType; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; diff --git a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/JanusGraphProviderTest.java b/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/JanusGraphProviderTest.java index 4d2deda52ba..877d8481a4c 100644 --- a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/JanusGraphProviderTest.java +++ b/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/JanusGraphProviderTest.java @@ -22,7 +22,7 @@ import org.apache.atlas.graph.GraphSandboxUtil; import org.apache.atlas.repository.graphdb.AtlasGraph; import org.apache.atlas.runner.LocalSolrRunner; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; diff --git a/graphdb/janusgraph-rdbms/pom.xml b/graphdb/janusgraph-rdbms/pom.xml index 663f09cd0c1..c88515da4a5 100644 --- a/graphdb/janusgraph-rdbms/pom.xml +++ b/graphdb/janusgraph-rdbms/pom.xml @@ -59,6 +59,10 @@ com.rabbitmq amqp-client + + commons-configuration + commons-configuration + org.noggit noggit diff --git a/intg/pom.xml b/intg/pom.xml index 68ce290b35e..ab99e9d067f 100644 --- a/intg/pom.xml +++ b/intg/pom.xml @@ -60,12 +60,6 @@ commons-collections - - commons-configuration - commons-configuration - ${commons-conf.version} - - commons-validator commons-validator diff --git a/intg/src/main/java/org/apache/atlas/ApplicationProperties.java b/intg/src/main/java/org/apache/atlas/ApplicationProperties.java index 986213b6a29..d3d8138f615 100644 --- a/intg/src/main/java/org/apache/atlas/ApplicationProperties.java +++ b/intg/src/main/java/org/apache/atlas/ApplicationProperties.java @@ -18,10 +18,12 @@ package org.apache.atlas; import org.apache.atlas.security.SecurityUtil; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationConverter; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationConverter; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -84,7 +86,10 @@ public final class ApplicationProperties extends PropertiesConfiguration { private static volatile Configuration instance; private ApplicationProperties(URL url) throws ConfigurationException { - super(url); + super(); + setListDelimiterHandler(new DefaultListDelimiterHandler(',')); + FileHandler fileHandler = new FileHandler(this); + fileHandler.load(url); } public static void forceReload() { diff --git a/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java b/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java index 51b8963c366..994945a6743 100644 --- a/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java +++ b/intg/src/main/java/org/apache/atlas/AtlasConfiguration.java @@ -18,7 +18,7 @@ package org.apache.atlas; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; /** diff --git a/intg/src/main/java/org/apache/atlas/security/InMemoryJAASConfiguration.java b/intg/src/main/java/org/apache/atlas/security/InMemoryJAASConfiguration.java index 196e0970f5d..bd9735fa7ba 100644 --- a/intg/src/main/java/org/apache/atlas/security/InMemoryJAASConfiguration.java +++ b/intg/src/main/java/org/apache/atlas/security/InMemoryJAASConfiguration.java @@ -20,7 +20,7 @@ import org.apache.atlas.AtlasException; import org.apache.commons.collections.MapUtils; -import org.apache.commons.configuration.ConfigurationConverter; +import org.apache.commons.configuration2.ConfigurationConverter; import org.apache.commons.lang3.ArrayUtils; import org.apache.hadoop.security.SecurityUtil; import org.slf4j.Logger; @@ -180,7 +180,7 @@ public static void init(String propFile) throws AtlasException { LOG.debug("<== InMemoryJAASConfiguration.init({})", propFile); } - public static void init(org.apache.commons.configuration.Configuration atlasConfiguration) throws AtlasException { + public static void init(org.apache.commons.configuration2.Configuration atlasConfiguration) throws AtlasException { LOG.debug("==> InMemoryJAASConfiguration.init()"); if (atlasConfiguration != null && !atlasConfiguration.isEmpty()) { diff --git a/intg/src/main/java/org/apache/atlas/security/SecurityUtil.java b/intg/src/main/java/org/apache/atlas/security/SecurityUtil.java index 730595e7961..7db2ab703ce 100644 --- a/intg/src/main/java/org/apache/atlas/security/SecurityUtil.java +++ b/intg/src/main/java/org/apache/atlas/security/SecurityUtil.java @@ -42,7 +42,7 @@ private SecurityUtil() { * @return the password. * @throws IOException */ - public static String getPassword(org.apache.commons.configuration.Configuration config, String key) throws IOException { + public static String getPassword(org.apache.commons.configuration2.Configuration config, String key) throws IOException { return getPassword(config, key, CERT_STORES_CREDENTIAL_PROVIDER_PATH); } @@ -56,7 +56,7 @@ public static String getPassword(org.apache.commons.configuration.Configuration * @return the password. * @throws IOException */ - public static String getPassword(org.apache.commons.configuration.Configuration config, String key, String pathPropertyName) throws IOException { + public static String getPassword(org.apache.commons.configuration2.Configuration config, String key, String pathPropertyName) throws IOException { String password; String provider = config.getString(pathPropertyName); diff --git a/intg/src/main/java/org/apache/atlas/type/AtlasStructType.java b/intg/src/main/java/org/apache/atlas/type/AtlasStructType.java index 6197df3724f..b8a5ffe356e 100644 --- a/intg/src/main/java/org/apache/atlas/type/AtlasStructType.java +++ b/intg/src/main/java/org/apache/atlas/type/AtlasStructType.java @@ -29,7 +29,7 @@ import org.apache.atlas.model.typedef.AtlasStructDef.AtlasConstraintDef; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/intg/src/main/java/org/apache/atlas/utils/AtlasConfigurationUtil.java b/intg/src/main/java/org/apache/atlas/utils/AtlasConfigurationUtil.java index 3b69b755dd6..681284224dc 100644 --- a/intg/src/main/java/org/apache/atlas/utils/AtlasConfigurationUtil.java +++ b/intg/src/main/java/org/apache/atlas/utils/AtlasConfigurationUtil.java @@ -17,7 +17,7 @@ */ package org.apache.atlas.utils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; public class AtlasConfigurationUtil { private AtlasConfigurationUtil() { diff --git a/intg/src/main/java/org/apache/atlas/utils/AuthenticationUtil.java b/intg/src/main/java/org/apache/atlas/utils/AuthenticationUtil.java index 932de5a1ea9..d98de2812f9 100644 --- a/intg/src/main/java/org/apache/atlas/utils/AuthenticationUtil.java +++ b/intg/src/main/java/org/apache/atlas/utils/AuthenticationUtil.java @@ -19,7 +19,7 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasException; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/intg/src/main/java/org/apache/atlas/utils/SSLUtil.java b/intg/src/main/java/org/apache/atlas/utils/SSLUtil.java index 33a38508964..5168ec72b77 100644 --- a/intg/src/main/java/org/apache/atlas/utils/SSLUtil.java +++ b/intg/src/main/java/org/apache/atlas/utils/SSLUtil.java @@ -21,7 +21,7 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasException; import org.apache.atlas.security.SecurityProperties; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/intg/src/test/java/org/apache/atlas/ApplicationPropertiesTest.java b/intg/src/test/java/org/apache/atlas/ApplicationPropertiesTest.java index 38b66f3be4d..8060f5e00b2 100644 --- a/intg/src/test/java/org/apache/atlas/ApplicationPropertiesTest.java +++ b/intg/src/test/java/org/apache/atlas/ApplicationPropertiesTest.java @@ -18,8 +18,8 @@ package org.apache.atlas; import org.apache.atlas.utils.AtlasConfigurationUtil; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.PropertiesConfiguration; import org.testng.annotations.Test; import java.io.InputStream; diff --git a/intg/src/test/java/org/apache/atlas/utils/AtlasConfigurationUtilTest.java b/intg/src/test/java/org/apache/atlas/utils/AtlasConfigurationUtilTest.java index a8cd153c091..58c585b864d 100644 --- a/intg/src/test/java/org/apache/atlas/utils/AtlasConfigurationUtilTest.java +++ b/intg/src/test/java/org/apache/atlas/utils/AtlasConfigurationUtilTest.java @@ -17,8 +17,8 @@ */ package org.apache.atlas.utils; -import org.apache.commons.configuration.BaseConfiguration; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.BaseConfiguration; +import org.apache.commons.configuration2.Configuration; import org.testng.annotations.Test; import java.lang.reflect.Constructor; diff --git a/intg/src/test/java/org/apache/atlas/utils/AuthenticationUtilTest.java b/intg/src/test/java/org/apache/atlas/utils/AuthenticationUtilTest.java index b70db4d060b..a0e7457dac4 100644 --- a/intg/src/test/java/org/apache/atlas/utils/AuthenticationUtilTest.java +++ b/intg/src/test/java/org/apache/atlas/utils/AuthenticationUtilTest.java @@ -17,8 +17,8 @@ */ package org.apache.atlas.utils; -import org.apache.commons.configuration.BaseConfiguration; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.BaseConfiguration; +import org.apache.commons.configuration2.Configuration; import org.apache.hadoop.security.UserGroupInformation; import org.testng.annotations.Test; diff --git a/intg/src/test/java/org/apache/atlas/utils/SSLUtilTest.java b/intg/src/test/java/org/apache/atlas/utils/SSLUtilTest.java index 4770f8908eb..22cae97c4e0 100644 --- a/intg/src/test/java/org/apache/atlas/utils/SSLUtilTest.java +++ b/intg/src/test/java/org/apache/atlas/utils/SSLUtilTest.java @@ -18,8 +18,8 @@ package org.apache.atlas.utils; import org.apache.atlas.security.SecurityProperties; -import org.apache.commons.configuration.BaseConfiguration; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.BaseConfiguration; +import org.apache.commons.configuration2.Configuration; import org.testng.annotations.Test; import java.io.IOException; diff --git a/intg/src/test/java/org/apache/atlas/utils/TestAtlasAsyncImportTestUtil.java b/intg/src/test/java/org/apache/atlas/utils/TestAtlasAsyncImportTestUtil.java index 21904be789f..c453a832891 100644 --- a/intg/src/test/java/org/apache/atlas/utils/TestAtlasAsyncImportTestUtil.java +++ b/intg/src/test/java/org/apache/atlas/utils/TestAtlasAsyncImportTestUtil.java @@ -22,7 +22,7 @@ import org.apache.atlas.model.impexp.AtlasAsyncImportRequest; import org.apache.atlas.model.impexp.AtlasImportRequest; import org.apache.atlas.model.impexp.AtlasImportResult; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/notification/pom.xml b/notification/pom.xml index 97bbe839a31..df065222799 100644 --- a/notification/pom.xml +++ b/notification/pom.xml @@ -129,9 +129,9 @@ ${commons-logging.version} - commons-configuration - commons-configuration - ${commons-conf.version} + org.apache.commons + commons-configuration2 + ${commons-conf2.version} commons-collections diff --git a/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java b/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java index 74e536b2a85..ed4ad538706 100644 --- a/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java +++ b/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java @@ -32,7 +32,7 @@ import org.apache.atlas.notification.NotificationInterface; import org.apache.atlas.utils.AtlasConfigurationUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.ShutdownHookManager; diff --git a/notification/src/main/java/org/apache/atlas/hook/AtlasTopicCreator.java b/notification/src/main/java/org/apache/atlas/hook/AtlasTopicCreator.java index 33da4f8048a..6ae5b27e34d 100644 --- a/notification/src/main/java/org/apache/atlas/hook/AtlasTopicCreator.java +++ b/notification/src/main/java/org/apache/atlas/hook/AtlasTopicCreator.java @@ -23,7 +23,7 @@ import org.apache.atlas.AtlasException; import org.apache.atlas.utils.AuthenticationUtil; import org.apache.atlas.utils.KafkaUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.UserGroupInformation; diff --git a/notification/src/main/java/org/apache/atlas/kafka/EmbeddedKafkaServer.java b/notification/src/main/java/org/apache/atlas/kafka/EmbeddedKafkaServer.java index ee87763528b..23158f521b7 100644 --- a/notification/src/main/java/org/apache/atlas/kafka/EmbeddedKafkaServer.java +++ b/notification/src/main/java/org/apache/atlas/kafka/EmbeddedKafkaServer.java @@ -24,8 +24,8 @@ import org.apache.atlas.AtlasException; import org.apache.atlas.service.Service; import org.apache.atlas.util.CommandHandlerUtility; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationConverter; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationConverter; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.utils.Time; diff --git a/notification/src/main/java/org/apache/atlas/kafka/KafkaNotification.java b/notification/src/main/java/org/apache/atlas/kafka/KafkaNotification.java index 630fe6250c4..a72645f8c5f 100644 --- a/notification/src/main/java/org/apache/atlas/kafka/KafkaNotification.java +++ b/notification/src/main/java/org/apache/atlas/kafka/KafkaNotification.java @@ -28,8 +28,8 @@ import org.apache.atlas.notification.NotificationException; import org.apache.atlas.service.Service; import org.apache.atlas.utils.KafkaUtils; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationConverter; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationConverter; import org.apache.commons.lang3.StringUtils; import org.apache.kafka.clients.admin.AdminClient; import org.apache.kafka.clients.consumer.ConsumerConfig; diff --git a/notification/src/main/java/org/apache/atlas/kafka/NotificationProvider.java b/notification/src/main/java/org/apache/atlas/kafka/NotificationProvider.java index b356977dc7d..eed7532a15b 100644 --- a/notification/src/main/java/org/apache/atlas/kafka/NotificationProvider.java +++ b/notification/src/main/java/org/apache/atlas/kafka/NotificationProvider.java @@ -25,7 +25,7 @@ import org.apache.atlas.notification.NotificationInterface; import org.apache.atlas.notification.rest.RestNotification; import org.apache.atlas.notification.spool.AtlasFileSpool; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/notification/src/main/java/org/apache/atlas/notification/AbstractNotification.java b/notification/src/main/java/org/apache/atlas/notification/AbstractNotification.java index 8a6b3a3f331..8e9eca9d6e6 100644 --- a/notification/src/main/java/org/apache/atlas/notification/AbstractNotification.java +++ b/notification/src/main/java/org/apache/atlas/notification/AbstractNotification.java @@ -26,7 +26,7 @@ import org.apache.atlas.model.notification.MessageSource; import org.apache.atlas.model.notification.MessageVersion; import org.apache.atlas.type.AtlasType; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/notification/src/main/java/org/apache/atlas/notification/rest/RestNotification.java b/notification/src/main/java/org/apache/atlas/notification/rest/RestNotification.java index cfbae5f26b2..e5bab47f8f7 100644 --- a/notification/src/main/java/org/apache/atlas/notification/rest/RestNotification.java +++ b/notification/src/main/java/org/apache/atlas/notification/rest/RestNotification.java @@ -28,7 +28,7 @@ import org.apache.atlas.notification.NotificationConsumer; import org.apache.atlas.notification.NotificationException; import org.apache.atlas.utils.AuthenticationUtil; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.NotImplementedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/notification/src/main/java/org/apache/atlas/notification/spool/AtlasFileSpool.java b/notification/src/main/java/org/apache/atlas/notification/spool/AtlasFileSpool.java index 8f102e180a7..ff622cd4684 100644 --- a/notification/src/main/java/org/apache/atlas/notification/spool/AtlasFileSpool.java +++ b/notification/src/main/java/org/apache/atlas/notification/spool/AtlasFileSpool.java @@ -24,7 +24,7 @@ import org.apache.atlas.notification.NotificationConsumer; import org.apache.atlas.notification.NotificationException; import org.apache.atlas.notification.NotificationInterface; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/notification/src/main/java/org/apache/atlas/notification/spool/SpoolConfiguration.java b/notification/src/main/java/org/apache/atlas/notification/spool/SpoolConfiguration.java index b1bd4e68928..af1fc746f78 100644 --- a/notification/src/main/java/org/apache/atlas/notification/spool/SpoolConfiguration.java +++ b/notification/src/main/java/org/apache/atlas/notification/spool/SpoolConfiguration.java @@ -17,7 +17,7 @@ */ package org.apache.atlas.notification.spool; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import java.io.File; diff --git a/notification/src/test/java/org/apache/atlas/hook/AtlasTopicCreatorTest.java b/notification/src/test/java/org/apache/atlas/hook/AtlasTopicCreatorTest.java index b6acf9b3829..233bf9be851 100644 --- a/notification/src/test/java/org/apache/atlas/hook/AtlasTopicCreatorTest.java +++ b/notification/src/test/java/org/apache/atlas/hook/AtlasTopicCreatorTest.java @@ -20,7 +20,7 @@ import org.apache.atlas.AtlasConfiguration; import org.apache.atlas.utils.KafkaUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.Mockito; import org.testng.annotations.Test; diff --git a/notification/src/test/java/org/apache/atlas/kafka/KafkaNotificationTest.java b/notification/src/test/java/org/apache/atlas/kafka/KafkaNotificationTest.java index 34c6733c0d6..2442b7c83b1 100644 --- a/notification/src/test/java/org/apache/atlas/kafka/KafkaNotificationTest.java +++ b/notification/src/test/java/org/apache/atlas/kafka/KafkaNotificationTest.java @@ -24,7 +24,7 @@ import org.apache.atlas.notification.NotificationInterface; import org.apache.atlas.v1.model.instance.Referenceable; import org.apache.atlas.v1.model.notification.HookNotificationV1.EntityCreateRequest; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.RandomStringUtils; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/notification/src/test/java/org/apache/atlas/notification/AbstractNotificationTest.java b/notification/src/test/java/org/apache/atlas/notification/AbstractNotificationTest.java index 93e86256d9f..f284110ad77 100644 --- a/notification/src/test/java/org/apache/atlas/notification/AbstractNotificationTest.java +++ b/notification/src/test/java/org/apache/atlas/notification/AbstractNotificationTest.java @@ -24,7 +24,7 @@ import org.apache.atlas.model.notification.MessageSource; import org.apache.atlas.notification.NotificationInterface.NotificationType; import org.apache.atlas.type.AtlasType; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import java.util.ArrayList; import java.util.Arrays; diff --git a/notification/src/test/java/org/apache/atlas/notification/RestNotificationTest.java b/notification/src/test/java/org/apache/atlas/notification/RestNotificationTest.java index 43d32a9f161..e35e23c7890 100644 --- a/notification/src/test/java/org/apache/atlas/notification/RestNotificationTest.java +++ b/notification/src/test/java/org/apache/atlas/notification/RestNotificationTest.java @@ -27,7 +27,7 @@ import org.apache.atlas.AtlasErrorCode; import org.apache.atlas.kafka.NotificationProvider; import org.apache.atlas.notification.rest.RestNotification; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/notification/src/test/java/org/apache/atlas/notification/spool/BaseTest.java b/notification/src/test/java/org/apache/atlas/notification/spool/BaseTest.java index 2dff8ccf18c..7c64dcb6717 100644 --- a/notification/src/test/java/org/apache/atlas/notification/spool/BaseTest.java +++ b/notification/src/test/java/org/apache/atlas/notification/spool/BaseTest.java @@ -17,8 +17,8 @@ */ package org.apache.atlas.notification.spool; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/pom.xml b/pom.xml index 8d27e11ed6a..a1ed4bb6d73 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,6 @@ 1.14 3.2.2 4.4 - 1.10 2.10.1 1.0 2.17.0 @@ -348,13 +347,6 @@ ${commons-collections.version} - - - commons-configuration - commons-configuration - ${commons-conf.version} - - commons-el commons-el diff --git a/repository/src/main/java/org/apache/atlas/repository/audit/AbstractStorageBasedAuditRepository.java b/repository/src/main/java/org/apache/atlas/repository/audit/AbstractStorageBasedAuditRepository.java index 06bc461e5e3..b7f7cd29f8e 100644 --- a/repository/src/main/java/org/apache/atlas/repository/audit/AbstractStorageBasedAuditRepository.java +++ b/repository/src/main/java/org/apache/atlas/repository/audit/AbstractStorageBasedAuditRepository.java @@ -26,8 +26,8 @@ import org.apache.atlas.model.audit.EntityAuditEventV2; import org.apache.atlas.service.Service; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.hbase.util.Bytes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/repository/src/main/java/org/apache/atlas/repository/audit/AtlasAuditReductionService.java b/repository/src/main/java/org/apache/atlas/repository/audit/AtlasAuditReductionService.java index 3781c8cd84b..45e0a5d97be 100644 --- a/repository/src/main/java/org/apache/atlas/repository/audit/AtlasAuditReductionService.java +++ b/repository/src/main/java/org/apache/atlas/repository/audit/AtlasAuditReductionService.java @@ -28,7 +28,7 @@ import org.apache.atlas.repository.graphdb.AtlasGraph; import org.apache.atlas.type.AtlasTypeRegistry; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; diff --git a/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java b/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java index 544bb5ce15d..c9a2a1ca314 100644 --- a/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java +++ b/repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java @@ -32,7 +32,7 @@ import org.apache.atlas.repository.Constants.AtlasAuditAgingType; import org.apache.atlas.utils.AtlasPerfMetrics; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HColumnDescriptor; diff --git a/repository/src/main/java/org/apache/atlas/repository/audit/rdbms/RdbmsBasedAuditRepository.java b/repository/src/main/java/org/apache/atlas/repository/audit/rdbms/RdbmsBasedAuditRepository.java index 523da3d618d..206e22be9ef 100644 --- a/repository/src/main/java/org/apache/atlas/repository/audit/rdbms/RdbmsBasedAuditRepository.java +++ b/repository/src/main/java/org/apache/atlas/repository/audit/rdbms/RdbmsBasedAuditRepository.java @@ -31,8 +31,8 @@ import org.apache.atlas.repository.audit.rdbms.entity.DbEntityAudit; import org.apache.atlas.utils.AtlasPerfMetrics; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; diff --git a/repository/src/main/java/org/apache/atlas/repository/graph/AtlasGraphProvider.java b/repository/src/main/java/org/apache/atlas/repository/graph/AtlasGraphProvider.java index 2df405b9f72..51ae8b3c8a3 100755 --- a/repository/src/main/java/org/apache/atlas/repository/graph/AtlasGraphProvider.java +++ b/repository/src/main/java/org/apache/atlas/repository/graph/AtlasGraphProvider.java @@ -44,7 +44,7 @@ public class AtlasGraphProvider implements IAtlasGraphProvider { private static final Long RETRY_SLEEP_TIME_MS = getRetrySleepTime(); private static volatile GraphDatabase graphDb; - private static org.apache.commons.configuration.Configuration applicationProperties; + private static org.apache.commons.configuration2.Configuration applicationProperties; public static AtlasGraph getGraphInstance() { GraphDatabase db = getGraphDatabase(); diff --git a/repository/src/main/java/org/apache/atlas/repository/graph/FullTextMapperV2.java b/repository/src/main/java/org/apache/atlas/repository/graph/FullTextMapperV2.java index 6d2d25c3889..7b03a5270a4 100644 --- a/repository/src/main/java/org/apache/atlas/repository/graph/FullTextMapperV2.java +++ b/repository/src/main/java/org/apache/atlas/repository/graph/FullTextMapperV2.java @@ -37,7 +37,7 @@ import org.apache.atlas.type.AtlasTypeRegistry; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.ArrayUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedSearchIndexer.java b/repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedSearchIndexer.java index 721548d8d98..addeb3d0c8d 100755 --- a/repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedSearchIndexer.java +++ b/repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedSearchIndexer.java @@ -58,7 +58,7 @@ import org.apache.atlas.type.AtlasTypeRegistry; import org.apache.atlas.type.AtlasTypeUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/repository/src/main/java/org/apache/atlas/repository/graph/IndexRecoveryService.java b/repository/src/main/java/org/apache/atlas/repository/graph/IndexRecoveryService.java index 654af40dfdd..68e8101b3b6 100644 --- a/repository/src/main/java/org/apache/atlas/repository/graph/IndexRecoveryService.java +++ b/repository/src/main/java/org/apache/atlas/repository/graph/IndexRecoveryService.java @@ -28,7 +28,7 @@ import org.apache.atlas.repository.graphdb.AtlasGraphQuery; import org.apache.atlas.repository.graphdb.AtlasVertex; import org.apache.atlas.service.Service; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.slf4j.Logger; diff --git a/repository/src/main/java/org/apache/atlas/repository/impexp/MigrationProgressService.java b/repository/src/main/java/org/apache/atlas/repository/impexp/MigrationProgressService.java index 41fbf910f69..2e79c69f170 100644 --- a/repository/src/main/java/org/apache/atlas/repository/impexp/MigrationProgressService.java +++ b/repository/src/main/java/org/apache/atlas/repository/impexp/MigrationProgressService.java @@ -26,7 +26,7 @@ import org.apache.atlas.repository.graph.AtlasGraphProvider; import org.apache.atlas.repository.graphdb.GraphDBMigrator; import org.apache.atlas.repository.migration.DataMigrationStatusService; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/repository/src/main/java/org/apache/atlas/repository/migration/DataMigrationService.java b/repository/src/main/java/org/apache/atlas/repository/migration/DataMigrationService.java index 69218275d92..3b81390ff67 100644 --- a/repository/src/main/java/org/apache/atlas/repository/migration/DataMigrationService.java +++ b/repository/src/main/java/org/apache/atlas/repository/migration/DataMigrationService.java @@ -30,7 +30,7 @@ import org.apache.atlas.service.Service; import org.apache.atlas.store.AtlasTypeDefStore; import org.apache.atlas.type.AtlasTypeRegistry; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchService.java b/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchService.java index 5be9166940d..7888e0e47c1 100644 --- a/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchService.java +++ b/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchService.java @@ -22,7 +22,7 @@ import org.apache.atlas.ha.HAConfiguration; import org.apache.atlas.listener.ActiveStateChangeHandler; import org.apache.atlas.service.Service; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; diff --git a/repository/src/main/java/org/apache/atlas/repository/patches/ConcurrentPatchProcessor.java b/repository/src/main/java/org/apache/atlas/repository/patches/ConcurrentPatchProcessor.java index 2a85e5898fa..efa1f937d18 100644 --- a/repository/src/main/java/org/apache/atlas/repository/patches/ConcurrentPatchProcessor.java +++ b/repository/src/main/java/org/apache/atlas/repository/patches/ConcurrentPatchProcessor.java @@ -29,7 +29,7 @@ import org.apache.atlas.repository.store.graph.v2.EntityGraphMapper; import org.apache.atlas.type.AtlasEntityType; import org.apache.atlas.type.AtlasTypeRegistry; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/repository/src/main/java/org/apache/atlas/repository/patches/EdgePatchProcessor.java b/repository/src/main/java/org/apache/atlas/repository/patches/EdgePatchProcessor.java index b09917a5f11..514189c77f4 100644 --- a/repository/src/main/java/org/apache/atlas/repository/patches/EdgePatchProcessor.java +++ b/repository/src/main/java/org/apache/atlas/repository/patches/EdgePatchProcessor.java @@ -27,7 +27,7 @@ import org.apache.atlas.repository.graphdb.AtlasGraph; import org.apache.atlas.type.AtlasRelationshipType; import org.apache.atlas.type.AtlasTypeRegistry; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java b/repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java index 8ce7ca70601..cf200277b57 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java @@ -56,7 +56,7 @@ import org.apache.atlas.type.AtlasTypeUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasGraphUtilsV2.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasGraphUtilsV2.java index 36881cecfc7..fe953486bef 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasGraphUtilsV2.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasGraphUtilsV2.java @@ -48,7 +48,7 @@ import org.apache.atlas.utils.AtlasPerfMetrics.MetricRecorder; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/tasks/AuditReductionTaskFactory.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/tasks/AuditReductionTaskFactory.java index b70e4eedfb8..c1c99b06195 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/tasks/AuditReductionTaskFactory.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/tasks/AuditReductionTaskFactory.java @@ -26,7 +26,7 @@ import org.apache.atlas.tasks.AbstractTask; import org.apache.atlas.tasks.TaskFactory; import org.apache.atlas.type.AtlasTypeRegistry; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/tasks/searchdownload/SearchResultDownloadTask.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/tasks/searchdownload/SearchResultDownloadTask.java index 0d60f36a5e5..63bbf895d25 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/tasks/searchdownload/SearchResultDownloadTask.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/tasks/searchdownload/SearchResultDownloadTask.java @@ -34,7 +34,7 @@ import org.apache.atlas.utils.AtlasJson; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/tasks/searchdownload/SearchResultDownloadTaskFactory.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/tasks/searchdownload/SearchResultDownloadTaskFactory.java index 358b7e41c61..fdf47ee1e22 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/tasks/searchdownload/SearchResultDownloadTaskFactory.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/tasks/searchdownload/SearchResultDownloadTaskFactory.java @@ -23,7 +23,7 @@ import org.apache.atlas.tasks.AbstractTask; import org.apache.atlas.tasks.TaskFactory; import org.apache.atlas.type.AtlasTypeRegistry; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.ArrayUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/repository/src/main/java/org/apache/atlas/services/PurgeService.java b/repository/src/main/java/org/apache/atlas/services/PurgeService.java index 8f5de1f7252..bc89aad8bfd 100644 --- a/repository/src/main/java/org/apache/atlas/services/PurgeService.java +++ b/repository/src/main/java/org/apache/atlas/services/PurgeService.java @@ -40,7 +40,7 @@ import org.apache.atlas.type.AtlasTypeRegistry; import org.apache.atlas.utils.AtlasPerfTracer; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; diff --git a/repository/src/main/java/org/apache/atlas/tasks/TaskManagement.java b/repository/src/main/java/org/apache/atlas/tasks/TaskManagement.java index 113f2b1b234..47bf49541a8 100644 --- a/repository/src/main/java/org/apache/atlas/tasks/TaskManagement.java +++ b/repository/src/main/java/org/apache/atlas/tasks/TaskManagement.java @@ -25,7 +25,7 @@ import org.apache.atlas.listener.ActiveStateChangeHandler; import org.apache.atlas.model.tasks.AtlasTask; import org.apache.atlas.service.Service; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; diff --git a/repository/src/main/java/org/apache/atlas/util/AtlasRepositoryConfiguration.java b/repository/src/main/java/org/apache/atlas/util/AtlasRepositoryConfiguration.java index 0f940620032..cf8fef41be3 100644 --- a/repository/src/main/java/org/apache/atlas/util/AtlasRepositoryConfiguration.java +++ b/repository/src/main/java/org/apache/atlas/util/AtlasRepositoryConfiguration.java @@ -24,7 +24,7 @@ import org.apache.atlas.repository.graphdb.GraphDatabase; import org.apache.atlas.repository.store.graph.v1.DeleteHandlerV1; import org.apache.atlas.repository.store.graph.v1.SoftDeleteHandlerV1; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/repository/src/test/java/org/apache/atlas/TestModules.java b/repository/src/test/java/org/apache/atlas/TestModules.java index 60273bc33e1..ee3e8d68d99 100644 --- a/repository/src/test/java/org/apache/atlas/TestModules.java +++ b/repository/src/test/java/org/apache/atlas/TestModules.java @@ -76,7 +76,7 @@ import org.apache.atlas.type.AtlasTypeRegistry; import org.apache.atlas.util.AtlasRepositoryConfiguration; import org.apache.atlas.util.SearchTracker; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.Mockito; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/repository/src/test/java/org/apache/atlas/repository/audit/AtlasAuditReductionServiceTest.java b/repository/src/test/java/org/apache/atlas/repository/audit/AtlasAuditReductionServiceTest.java index a4f061dd070..db16c41678d 100644 --- a/repository/src/test/java/org/apache/atlas/repository/audit/AtlasAuditReductionServiceTest.java +++ b/repository/src/test/java/org/apache/atlas/repository/audit/AtlasAuditReductionServiceTest.java @@ -24,7 +24,7 @@ import org.apache.atlas.repository.Constants.AtlasAuditAgingType; import org.apache.atlas.repository.graphdb.AtlasGraph; import org.apache.atlas.type.AtlasTypeRegistry; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/repository/src/test/java/org/apache/atlas/repository/audit/CassandraAuditRepositoryTest.java b/repository/src/test/java/org/apache/atlas/repository/audit/CassandraAuditRepositoryTest.java index 75fc9254138..ea55779600f 100644 --- a/repository/src/test/java/org/apache/atlas/repository/audit/CassandraAuditRepositoryTest.java +++ b/repository/src/test/java/org/apache/atlas/repository/audit/CassandraAuditRepositoryTest.java @@ -20,8 +20,8 @@ import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Session; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.MapConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.MapConfiguration; import org.cassandraunit.utils.EmbeddedCassandraServerHelper; import org.testng.SkipException; import org.testng.annotations.BeforeClass; diff --git a/repository/src/test/java/org/apache/atlas/repository/migration/DataMigrationServiceTest.java b/repository/src/test/java/org/apache/atlas/repository/migration/DataMigrationServiceTest.java index f23a96527ec..0c276ebf942 100644 --- a/repository/src/test/java/org/apache/atlas/repository/migration/DataMigrationServiceTest.java +++ b/repository/src/test/java/org/apache/atlas/repository/migration/DataMigrationServiceTest.java @@ -27,7 +27,7 @@ import org.apache.atlas.repository.store.bootstrap.AtlasTypeDefStoreInitializer; import org.apache.atlas.store.AtlasTypeDefStore; import org.apache.atlas.type.AtlasTypeRegistry; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.mockito.ArgumentMatchers; import org.mockito.Mock; diff --git a/repository/src/test/java/org/apache/atlas/repository/migration/MigrationProgressServiceTest.java b/repository/src/test/java/org/apache/atlas/repository/migration/MigrationProgressServiceTest.java index 5263e8db504..4cea5180c28 100644 --- a/repository/src/test/java/org/apache/atlas/repository/migration/MigrationProgressServiceTest.java +++ b/repository/src/test/java/org/apache/atlas/repository/migration/MigrationProgressServiceTest.java @@ -21,7 +21,7 @@ import org.apache.atlas.repository.graphdb.GraphDBMigrator; import org.apache.atlas.repository.graphdb.janus.migration.ReaderStatusManager; import org.apache.atlas.repository.impexp.MigrationProgressService; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph; import org.testng.annotations.Test; diff --git a/repository/src/test/java/org/apache/atlas/repository/patches/AtlasPatchServiceTest.java b/repository/src/test/java/org/apache/atlas/repository/patches/AtlasPatchServiceTest.java index 215fbc968fa..e916ebba00f 100644 --- a/repository/src/test/java/org/apache/atlas/repository/patches/AtlasPatchServiceTest.java +++ b/repository/src/test/java/org/apache/atlas/repository/patches/AtlasPatchServiceTest.java @@ -21,7 +21,7 @@ import org.apache.atlas.AtlasException; import org.apache.atlas.ha.HAConfiguration; import org.apache.atlas.listener.ActiveStateChangeHandler; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.MockitoAnnotations; diff --git a/repository/src/test/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializerTest.java b/repository/src/test/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializerTest.java index 626025d8f0a..6ef2cadfa7b 100644 --- a/repository/src/test/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializerTest.java +++ b/repository/src/test/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializerTest.java @@ -47,7 +47,7 @@ import org.apache.atlas.type.AtlasStructType.AtlasAttribute; import org.apache.atlas.type.AtlasType; import org.apache.atlas.type.AtlasTypeRegistry; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.MockitoAnnotations; diff --git a/server-api/src/main/java/org/apache/atlas/ha/AtlasServerIdSelector.java b/server-api/src/main/java/org/apache/atlas/ha/AtlasServerIdSelector.java index a30228e939c..2a664156732 100644 --- a/server-api/src/main/java/org/apache/atlas/ha/AtlasServerIdSelector.java +++ b/server-api/src/main/java/org/apache/atlas/ha/AtlasServerIdSelector.java @@ -20,7 +20,7 @@ import org.apache.atlas.AtlasConstants; import org.apache.atlas.AtlasException; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.net.NetUtils; import org.slf4j.Logger; diff --git a/server-api/src/test/java/org/apache/atlas/ha/AtlasServerIdSelectorTest.java b/server-api/src/test/java/org/apache/atlas/ha/AtlasServerIdSelectorTest.java index c99e0eeb361..0ccbdad98d6 100644 --- a/server-api/src/test/java/org/apache/atlas/ha/AtlasServerIdSelectorTest.java +++ b/server-api/src/test/java/org/apache/atlas/ha/AtlasServerIdSelectorTest.java @@ -20,7 +20,7 @@ import org.apache.atlas.AtlasConstants; import org.apache.atlas.AtlasException; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.testng.annotations.BeforeMethod; diff --git a/test-tools/pom.xml b/test-tools/pom.xml index efbbbb28ac6..16638568917 100644 --- a/test-tools/pom.xml +++ b/test-tools/pom.xml @@ -36,12 +36,6 @@ - - - commons-configuration - commons-configuration - - commons-fileupload commons-fileupload diff --git a/test-tools/src/main/java/org/apache/atlas/runner/LocalSolrRunner.java b/test-tools/src/main/java/org/apache/atlas/runner/LocalSolrRunner.java index b98a3429355..828b9e74303 100644 --- a/test-tools/src/main/java/org/apache/atlas/runner/LocalSolrRunner.java +++ b/test-tools/src/main/java/org/apache/atlas/runner/LocalSolrRunner.java @@ -19,7 +19,7 @@ import org.apache.atlas.ApplicationProperties; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; diff --git a/tools/atlas-index-repair/pom.xml b/tools/atlas-index-repair/pom.xml index 0b12730d771..595034315c9 100644 --- a/tools/atlas-index-repair/pom.xml +++ b/tools/atlas-index-repair/pom.xml @@ -58,6 +58,10 @@ com.rabbitmq amqp-client + + commons-configuration + commons-configuration + org.noggit noggit diff --git a/tools/atlas-index-repair/src/main/java/org/apache/atlas/tools/RepairIndex.java b/tools/atlas-index-repair/src/main/java/org/apache/atlas/tools/RepairIndex.java index f3992ebff3f..ea2ab330db8 100644 --- a/tools/atlas-index-repair/src/main/java/org/apache/atlas/tools/RepairIndex.java +++ b/tools/atlas-index-repair/src/main/java/org/apache/atlas/tools/RepairIndex.java @@ -32,7 +32,7 @@ import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.janusgraph.core.JanusGraph; import org.janusgraph.core.schema.JanusGraphIndex; import org.janusgraph.core.schema.SchemaAction; diff --git a/tools/classification-updater/src/main/java/org/apache/atlas/tools/BulkFetchAndUpdate.java b/tools/classification-updater/src/main/java/org/apache/atlas/tools/BulkFetchAndUpdate.java index e554f541444..a4eb06fd90c 100644 --- a/tools/classification-updater/src/main/java/org/apache/atlas/tools/BulkFetchAndUpdate.java +++ b/tools/classification-updater/src/main/java/org/apache/atlas/tools/BulkFetchAndUpdate.java @@ -38,7 +38,7 @@ import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.Logger; diff --git a/tools/notification-analyzer/pom.xml b/tools/notification-analyzer/pom.xml index 76904ea5d61..25b97855bed 100644 --- a/tools/notification-analyzer/pom.xml +++ b/tools/notification-analyzer/pom.xml @@ -125,9 +125,9 @@ 1.26.2 - commons-configuration - commons-configuration - ${commons-conf.version} + org.apache.commons + commons-configuration2 + ${commons-conf2.version} commons-logging diff --git a/webapp/pom.xml b/webapp/pom.xml index 9f5c5bb4e6f..87760e5d226 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -116,11 +116,6 @@ commons-cli - - commons-configuration - commons-configuration - - commons-io commons-io diff --git a/webapp/src/main/java/org/apache/atlas/Atlas.java b/webapp/src/main/java/org/apache/atlas/Atlas.java index 07f4c30fab1..4f73d368b67 100755 --- a/webapp/src/main/java/org/apache/atlas/Atlas.java +++ b/webapp/src/main/java/org/apache/atlas/Atlas.java @@ -25,8 +25,9 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.io.FileHandler; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.util.ShutdownHookManager; import org.slf4j.Logger; @@ -64,7 +65,9 @@ private Atlas() { public static void main(String[] args) throws Exception { CommandLine cmd = parseArgs(args); - PropertiesConfiguration buildConfiguration = new PropertiesConfiguration("atlas-buildinfo.properties"); + PropertiesConfiguration buildConfiguration = new PropertiesConfiguration(); + FileHandler fileHandler = new FileHandler(buildConfiguration); + fileHandler.load("atlas-buildinfo.properties"); String appPath = "webapp/target/atlas-webapp-" + getProjectVersion(buildConfiguration); if (cmd.hasOption(APP_PATH)) { diff --git a/webapp/src/main/java/org/apache/atlas/examples/QuickStart.java b/webapp/src/main/java/org/apache/atlas/examples/QuickStart.java index ad6d54d4436..fdb96a4a1fd 100755 --- a/webapp/src/main/java/org/apache/atlas/examples/QuickStart.java +++ b/webapp/src/main/java/org/apache/atlas/examples/QuickStart.java @@ -37,7 +37,7 @@ import org.apache.atlas.v1.model.typedef.TraitTypeDefinition; import org.apache.atlas.v1.model.typedef.TypesDef; import org.apache.atlas.v1.typesystem.types.utils.TypesUtil; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import java.util.Arrays; import java.util.Collections; diff --git a/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java b/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java index c1cef5a6744..a43cfc6390d 100755 --- a/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java +++ b/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java @@ -48,7 +48,7 @@ import org.apache.atlas.type.AtlasTypeUtil; import org.apache.atlas.utils.AuthenticationUtil; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.ArrayUtils; import javax.ws.rs.core.MultivaluedMap; diff --git a/webapp/src/main/java/org/apache/atlas/notification/EntityNotificationListenerV2.java b/webapp/src/main/java/org/apache/atlas/notification/EntityNotificationListenerV2.java index 3906c9e5695..fbb7d7880cd 100644 --- a/webapp/src/main/java/org/apache/atlas/notification/EntityNotificationListenerV2.java +++ b/webapp/src/main/java/org/apache/atlas/notification/EntityNotificationListenerV2.java @@ -37,7 +37,7 @@ import org.apache.atlas.utils.AtlasPerfMetrics.MetricRecorder; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.springframework.stereotype.Component; import javax.inject.Inject; diff --git a/webapp/src/main/java/org/apache/atlas/notification/EntityNotificationSender.java b/webapp/src/main/java/org/apache/atlas/notification/EntityNotificationSender.java index 3aba146101d..50ea50289a6 100644 --- a/webapp/src/main/java/org/apache/atlas/notification/EntityNotificationSender.java +++ b/webapp/src/main/java/org/apache/atlas/notification/EntityNotificationSender.java @@ -19,7 +19,7 @@ import org.apache.atlas.GraphTransactionInterceptor; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/webapp/src/main/java/org/apache/atlas/notification/ImportTaskListenerImpl.java b/webapp/src/main/java/org/apache/atlas/notification/ImportTaskListenerImpl.java index cce6c20124b..1c04b432a28 100644 --- a/webapp/src/main/java/org/apache/atlas/notification/ImportTaskListenerImpl.java +++ b/webapp/src/main/java/org/apache/atlas/notification/ImportTaskListenerImpl.java @@ -30,7 +30,7 @@ import org.apache.atlas.repository.impexp.AsyncImportService; import org.apache.atlas.repository.store.graph.v2.asyncimport.ImportTaskListener; import org.apache.atlas.service.Service; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/webapp/src/main/java/org/apache/atlas/notification/NotificationEntityChangeListener.java b/webapp/src/main/java/org/apache/atlas/notification/NotificationEntityChangeListener.java index fcdf42aab86..85e603dfc80 100644 --- a/webapp/src/main/java/org/apache/atlas/notification/NotificationEntityChangeListener.java +++ b/webapp/src/main/java/org/apache/atlas/notification/NotificationEntityChangeListener.java @@ -32,7 +32,7 @@ import org.apache.atlas.v1.model.notification.EntityNotificationV1.OperationType; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.springframework.stereotype.Component; import javax.inject.Inject; diff --git a/webapp/src/main/java/org/apache/atlas/notification/NotificationHookConsumer.java b/webapp/src/main/java/org/apache/atlas/notification/NotificationHookConsumer.java index 32bf3016673..c30b652da96 100644 --- a/webapp/src/main/java/org/apache/atlas/notification/NotificationHookConsumer.java +++ b/webapp/src/main/java/org/apache/atlas/notification/NotificationHookConsumer.java @@ -78,7 +78,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.collections4.map.PassiveExpiringMap; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.kafka.common.TopicPartition; import org.slf4j.Logger; diff --git a/webapp/src/main/java/org/apache/atlas/web/dao/UserDao.java b/webapp/src/main/java/org/apache/atlas/web/dao/UserDao.java index 89c768800ae..67faea6ff95 100644 --- a/webapp/src/main/java/org/apache/atlas/web/dao/UserDao.java +++ b/webapp/src/main/java/org/apache/atlas/web/dao/UserDao.java @@ -22,7 +22,7 @@ import org.apache.atlas.AtlasException; import org.apache.atlas.web.model.User; import org.apache.atlas.web.security.AtlasAuthenticationException; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.AuthenticationException; diff --git a/webapp/src/main/java/org/apache/atlas/web/filters/AtlasAuthenticationFilter.java b/webapp/src/main/java/org/apache/atlas/web/filters/AtlasAuthenticationFilter.java index 652af3a86ec..bc477f76242 100644 --- a/webapp/src/main/java/org/apache/atlas/web/filters/AtlasAuthenticationFilter.java +++ b/webapp/src/main/java/org/apache/atlas/web/filters/AtlasAuthenticationFilter.java @@ -25,8 +25,8 @@ import org.apache.atlas.web.security.AtlasAuthenticationProvider; import org.apache.atlas.web.util.Servlets; import org.apache.commons.collections.iterators.IteratorEnumeration; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationConverter; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationConverter; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.UserGroupInformation; diff --git a/webapp/src/main/java/org/apache/atlas/web/filters/AtlasCSRFPreventionFilter.java b/webapp/src/main/java/org/apache/atlas/web/filters/AtlasCSRFPreventionFilter.java index 7dc12acc37e..44e9b55b01c 100644 --- a/webapp/src/main/java/org/apache/atlas/web/filters/AtlasCSRFPreventionFilter.java +++ b/webapp/src/main/java/org/apache/atlas/web/filters/AtlasCSRFPreventionFilter.java @@ -20,7 +20,7 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasException; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.json.simple.JSONObject; import org.slf4j.Logger; diff --git a/webapp/src/main/java/org/apache/atlas/web/filters/AtlasKnoxSSOAuthenticationFilter.java b/webapp/src/main/java/org/apache/atlas/web/filters/AtlasKnoxSSOAuthenticationFilter.java index a5dca7aaeea..c41f9d4686f 100644 --- a/webapp/src/main/java/org/apache/atlas/web/filters/AtlasKnoxSSOAuthenticationFilter.java +++ b/webapp/src/main/java/org/apache/atlas/web/filters/AtlasKnoxSSOAuthenticationFilter.java @@ -27,7 +27,7 @@ import com.nimbusds.jwt.SignedJWT; import org.apache.atlas.ApplicationProperties; import org.apache.atlas.web.security.AtlasAuthenticationProvider; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.http.client.utils.URIBuilder; import org.json.simple.JSONObject; diff --git a/webapp/src/main/java/org/apache/atlas/web/filters/AuditFilter.java b/webapp/src/main/java/org/apache/atlas/web/filters/AuditFilter.java index 12d34353ba9..207879c7a67 100755 --- a/webapp/src/main/java/org/apache/atlas/web/filters/AuditFilter.java +++ b/webapp/src/main/java/org/apache/atlas/web/filters/AuditFilter.java @@ -26,7 +26,7 @@ import org.apache.atlas.util.AtlasRepositoryConfiguration; import org.apache.atlas.web.util.DateTimeHelper; import org.apache.atlas.web.util.Servlets; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/webapp/src/main/java/org/apache/atlas/web/filters/HeadersUtil.java b/webapp/src/main/java/org/apache/atlas/web/filters/HeadersUtil.java index dbec3cdbfab..421250c38de 100644 --- a/webapp/src/main/java/org/apache/atlas/web/filters/HeadersUtil.java +++ b/webapp/src/main/java/org/apache/atlas/web/filters/HeadersUtil.java @@ -20,8 +20,8 @@ import com.google.common.annotations.VisibleForTesting; import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasConfiguration; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationConverter; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/webapp/src/main/java/org/apache/atlas/web/listeners/LoginProcessor.java b/webapp/src/main/java/org/apache/atlas/web/listeners/LoginProcessor.java index e8a198e3399..e7c926716af 100644 --- a/webapp/src/main/java/org/apache/atlas/web/listeners/LoginProcessor.java +++ b/webapp/src/main/java/org/apache/atlas/web/listeners/LoginProcessor.java @@ -49,7 +49,7 @@ public void login() { // first, let's see if we're running in a hadoop cluster and have the env configured boolean isHadoopCluster = isHadoopCluster(); Configuration hadoopConfig = isHadoopCluster ? getHadoopConfiguration() : new Configuration(false); - org.apache.commons.configuration.Configuration configuration = getApplicationConfiguration(); + org.apache.commons.configuration2.Configuration configuration = getApplicationConfiguration(); if (!isHadoopCluster) { // need to read the configured authentication choice and create the UGI configuration @@ -59,7 +59,7 @@ public void login() { doServiceLogin(hadoopConfig, configuration); } - protected void doServiceLogin(Configuration hadoopConfig, org.apache.commons.configuration.Configuration configuration) { + protected void doServiceLogin(Configuration hadoopConfig, org.apache.commons.configuration2.Configuration configuration) { UserGroupInformation.setConfiguration(hadoopConfig); UserGroupInformation.AuthenticationMethod authenticationMethod = SecurityUtil.getAuthenticationMethod(hadoopConfig); @@ -78,7 +78,7 @@ protected void doServiceLogin(Configuration hadoopConfig, org.apache.commons.con } } - protected void setupHadoopConfiguration(Configuration hadoopConfig, org.apache.commons.configuration.Configuration configuration) { + protected void setupHadoopConfiguration(Configuration hadoopConfig, org.apache.commons.configuration2.Configuration configuration) { String authMethod = ""; String kerberosAuthNEnabled = configuration != null ? configuration.getString(AUTHENTICATION_KERBEROS_METHOD) : null; @@ -108,7 +108,7 @@ protected Configuration getHadoopConfiguration() { * * @return the metadata configuration. */ - protected org.apache.commons.configuration.Configuration getApplicationConfiguration() { + protected org.apache.commons.configuration2.Configuration getApplicationConfiguration() { try { return ApplicationProperties.get(); } catch (AtlasException e) { @@ -135,7 +135,7 @@ protected boolean isHadoopCluster() { return isHadoopCluster; } - private String getHostname(org.apache.commons.configuration.Configuration configuration) { + private String getHostname(org.apache.commons.configuration2.Configuration configuration) { String bindAddress = configuration.getString(SecurityProperties.BIND_ADDRESS); if (bindAddress == null) { diff --git a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java index b092d480684..da9967a1ce3 100755 --- a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java +++ b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java @@ -82,9 +82,10 @@ import org.apache.atlas.web.service.ServiceState; import org.apache.atlas.web.util.Servlets; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -307,7 +308,9 @@ public Response getVersion() { if (version == null) { try { - PropertiesConfiguration configProperties = new PropertiesConfiguration("atlas-buildinfo.properties"); + PropertiesConfiguration configProperties = new PropertiesConfiguration(); + FileHandler fileHandler = new FileHandler(configProperties); + fileHandler.load("atlas-buildinfo.properties"); Map response = new HashMap<>(); diff --git a/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java b/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java index 6f404a656ff..e318a53b52c 100644 --- a/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java +++ b/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java @@ -45,7 +45,7 @@ import org.apache.atlas.utils.AtlasPerfTracer; import org.apache.atlas.web.util.Servlets; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.springframework.stereotype.Service; diff --git a/webapp/src/main/java/org/apache/atlas/web/security/AtlasADAuthenticationProvider.java b/webapp/src/main/java/org/apache/atlas/web/security/AtlasADAuthenticationProvider.java index 59329a0643d..089791fd973 100644 --- a/webapp/src/main/java/org/apache/atlas/web/security/AtlasADAuthenticationProvider.java +++ b/webapp/src/main/java/org/apache/atlas/web/security/AtlasADAuthenticationProvider.java @@ -20,8 +20,8 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.web.model.User; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationConverter; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.ldap.core.support.LdapContextSource; diff --git a/webapp/src/main/java/org/apache/atlas/web/security/AtlasAuthenticationProvider.java b/webapp/src/main/java/org/apache/atlas/web/security/AtlasAuthenticationProvider.java index 3cff9fb8eeb..9d7ca89939f 100644 --- a/webapp/src/main/java/org/apache/atlas/web/security/AtlasAuthenticationProvider.java +++ b/webapp/src/main/java/org/apache/atlas/web/security/AtlasAuthenticationProvider.java @@ -18,7 +18,7 @@ package org.apache.atlas.web.security; import org.apache.atlas.ApplicationProperties; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Scope; diff --git a/webapp/src/main/java/org/apache/atlas/web/security/AtlasKeycloakAuthenticationProvider.java b/webapp/src/main/java/org/apache/atlas/web/security/AtlasKeycloakAuthenticationProvider.java index 9839a219515..376a22d18b4 100644 --- a/webapp/src/main/java/org/apache/atlas/web/security/AtlasKeycloakAuthenticationProvider.java +++ b/webapp/src/main/java/org/apache/atlas/web/security/AtlasKeycloakAuthenticationProvider.java @@ -17,7 +17,7 @@ package org.apache.atlas.web.security; import org.apache.atlas.ApplicationProperties; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.keycloak.adapters.springsecurity.authentication.KeycloakAuthenticationProvider; import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; import org.springframework.security.core.Authentication; diff --git a/webapp/src/main/java/org/apache/atlas/web/security/AtlasLdapAuthenticationProvider.java b/webapp/src/main/java/org/apache/atlas/web/security/AtlasLdapAuthenticationProvider.java index c401576006d..105adffecd2 100644 --- a/webapp/src/main/java/org/apache/atlas/web/security/AtlasLdapAuthenticationProvider.java +++ b/webapp/src/main/java/org/apache/atlas/web/security/AtlasLdapAuthenticationProvider.java @@ -20,8 +20,8 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.web.model.User; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationConverter; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationConverter; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/webapp/src/main/java/org/apache/atlas/web/security/AtlasPamAuthenticationProvider.java b/webapp/src/main/java/org/apache/atlas/web/security/AtlasPamAuthenticationProvider.java index 49970129c3c..ca8b028e973 100644 --- a/webapp/src/main/java/org/apache/atlas/web/security/AtlasPamAuthenticationProvider.java +++ b/webapp/src/main/java/org/apache/atlas/web/security/AtlasPamAuthenticationProvider.java @@ -21,7 +21,7 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.web.model.User; -import org.apache.commons.configuration.ConfigurationConverter; +import org.apache.commons.configuration2.ConfigurationConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/webapp/src/main/java/org/apache/atlas/web/security/AtlasSecurityConfig.java b/webapp/src/main/java/org/apache/atlas/web/security/AtlasSecurityConfig.java index 5058ebdf53d..0f7ad76b41d 100644 --- a/webapp/src/main/java/org/apache/atlas/web/security/AtlasSecurityConfig.java +++ b/webapp/src/main/java/org/apache/atlas/web/security/AtlasSecurityConfig.java @@ -25,7 +25,7 @@ import org.apache.atlas.web.filters.AtlasKnoxSSOAuthenticationFilter; import org.apache.atlas.web.filters.HeadersUtil; import org.apache.atlas.web.filters.StaleTransactionCleanupFilter; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.KeycloakConfigResolver; diff --git a/webapp/src/main/java/org/apache/atlas/web/service/ActiveInstanceElectorService.java b/webapp/src/main/java/org/apache/atlas/web/service/ActiveInstanceElectorService.java index ac9ecd5c9c4..31830405cda 100644 --- a/webapp/src/main/java/org/apache/atlas/web/service/ActiveInstanceElectorService.java +++ b/webapp/src/main/java/org/apache/atlas/web/service/ActiveInstanceElectorService.java @@ -24,7 +24,7 @@ import org.apache.atlas.listener.ActiveStateChangeHandler; import org.apache.atlas.service.Service; import org.apache.atlas.util.AtlasMetricsUtil; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.curator.framework.recipes.leader.LeaderLatch; import org.apache.curator.framework.recipes.leader.LeaderLatchListener; import org.slf4j.Logger; diff --git a/webapp/src/main/java/org/apache/atlas/web/service/ActiveInstanceState.java b/webapp/src/main/java/org/apache/atlas/web/service/ActiveInstanceState.java index 8e79dbe6488..e743814bafe 100644 --- a/webapp/src/main/java/org/apache/atlas/web/service/ActiveInstanceState.java +++ b/webapp/src/main/java/org/apache/atlas/web/service/ActiveInstanceState.java @@ -23,7 +23,7 @@ import org.apache.atlas.AtlasException; import org.apache.atlas.exception.AtlasBaseException; import org.apache.atlas.ha.HAConfiguration; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.locks.InterProcessReadWriteLock; diff --git a/webapp/src/main/java/org/apache/atlas/web/service/CuratorFactory.java b/webapp/src/main/java/org/apache/atlas/web/service/CuratorFactory.java index 515333ef3be..76b4e43edfc 100644 --- a/webapp/src/main/java/org/apache/atlas/web/service/CuratorFactory.java +++ b/webapp/src/main/java/org/apache/atlas/web/service/CuratorFactory.java @@ -23,7 +23,7 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasException; import org.apache.atlas.ha.HAConfiguration; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.curator.framework.AuthInfo; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; diff --git a/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java b/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java index c898861d57a..25645535dbd 100755 --- a/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java +++ b/webapp/src/main/java/org/apache/atlas/web/service/SecureEmbeddedServer.java @@ -90,7 +90,7 @@ public SecureEmbeddedServer(String host, int port, String path) throws IOExcepti @Override protected Connector getConnector(String host, int port) throws IOException { - org.apache.commons.configuration.Configuration config = getConfiguration(); + org.apache.commons.configuration2.Configuration config = getConfiguration(); SSLContext sslContext = getSSLContext(); @@ -164,7 +164,7 @@ protected Connector getConnector(String host, int port) throws IOException { * Returns the application configuration. * @return */ - protected org.apache.commons.configuration.Configuration getConfiguration() { + protected org.apache.commons.configuration2.Configuration getConfiguration() { try { return ApplicationProperties.get(); } catch (AtlasException e) { diff --git a/webapp/src/main/java/org/apache/atlas/web/service/ServiceState.java b/webapp/src/main/java/org/apache/atlas/web/service/ServiceState.java index b2e7dd705a1..8c66813136d 100644 --- a/webapp/src/main/java/org/apache/atlas/web/service/ServiceState.java +++ b/webapp/src/main/java/org/apache/atlas/web/service/ServiceState.java @@ -25,7 +25,7 @@ import org.apache.atlas.ha.HAConfiguration; import org.apache.atlas.model.audit.AtlasAuditEntry; import org.apache.atlas.repository.audit.AtlasAuditService; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/webapp/src/main/java/org/apache/atlas/web/setup/SetupSteps.java b/webapp/src/main/java/org/apache/atlas/web/setup/SetupSteps.java index b7f5ec4a396..73738a8090d 100644 --- a/webapp/src/main/java/org/apache/atlas/web/setup/SetupSteps.java +++ b/webapp/src/main/java/org/apache/atlas/web/setup/SetupSteps.java @@ -28,7 +28,7 @@ import org.apache.atlas.setup.SetupStep; import org.apache.atlas.web.service.AtlasZookeeperSecurityProperties; import org.apache.atlas.web.service.CuratorFactory; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.locks.InterProcessMutex; import org.apache.zookeeper.ZooDefs; diff --git a/webapp/src/test/java/org/apache/atlas/AtlasIT.java b/webapp/src/test/java/org/apache/atlas/AtlasIT.java index 98139e78bd8..70bbbb9f816 100644 --- a/webapp/src/test/java/org/apache/atlas/AtlasIT.java +++ b/webapp/src/test/java/org/apache/atlas/AtlasIT.java @@ -17,7 +17,7 @@ package org.apache.atlas; import org.apache.commons.cli.CommandLine; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; diff --git a/webapp/src/test/java/org/apache/atlas/notification/EntityNotificationListenerV2Test.java b/webapp/src/test/java/org/apache/atlas/notification/EntityNotificationListenerV2Test.java index 0b3d60ab27d..a0b2eca0ef9 100644 --- a/webapp/src/test/java/org/apache/atlas/notification/EntityNotificationListenerV2Test.java +++ b/webapp/src/test/java/org/apache/atlas/notification/EntityNotificationListenerV2Test.java @@ -36,7 +36,7 @@ import org.apache.atlas.type.AtlasStructType.AtlasAttribute; import org.apache.atlas.type.AtlasTypeRegistry; import org.apache.atlas.utils.AtlasPerfMetrics.MetricRecorder; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/webapp/src/test/java/org/apache/atlas/notification/EntityNotificationSenderTest.java b/webapp/src/test/java/org/apache/atlas/notification/EntityNotificationSenderTest.java index da9c4008c20..a7c48661d6c 100644 --- a/webapp/src/test/java/org/apache/atlas/notification/EntityNotificationSenderTest.java +++ b/webapp/src/test/java/org/apache/atlas/notification/EntityNotificationSenderTest.java @@ -19,7 +19,7 @@ package org.apache.atlas.notification; import org.apache.atlas.GraphTransactionInterceptor; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/webapp/src/test/java/org/apache/atlas/notification/NotificationEntityChangeListenerTest.java b/webapp/src/test/java/org/apache/atlas/notification/NotificationEntityChangeListenerTest.java index 59a2ac156c1..02558747ed7 100644 --- a/webapp/src/test/java/org/apache/atlas/notification/NotificationEntityChangeListenerTest.java +++ b/webapp/src/test/java/org/apache/atlas/notification/NotificationEntityChangeListenerTest.java @@ -29,7 +29,7 @@ import org.apache.atlas.v1.model.instance.Referenceable; import org.apache.atlas.v1.model.instance.Struct; import org.apache.atlas.v1.model.notification.EntityNotificationV1; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.MockitoAnnotations; diff --git a/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java b/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java index 529d894ffaa..3f2a83eef2e 100644 --- a/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java +++ b/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java @@ -41,7 +41,7 @@ import org.apache.atlas.v1.model.instance.Referenceable; import org.apache.atlas.v1.model.notification.HookNotificationV1; import org.apache.atlas.web.service.ServiceState; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.RandomStringUtils; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.common.KafkaException; diff --git a/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerTest.java b/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerTest.java index 28693f767c8..b3653aa9f66 100644 --- a/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerTest.java +++ b/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerTest.java @@ -58,7 +58,7 @@ import org.apache.atlas.v1.model.notification.HookNotificationV1.EntityDeleteRequest; import org.apache.atlas.v1.model.notification.HookNotificationV1.EntityUpdateRequest; import org.apache.atlas.web.service.ServiceState; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.kafka.common.TopicPartition; import org.mockito.Mock; import org.mockito.MockedStatic; diff --git a/webapp/src/test/java/org/apache/atlas/web/TestUtils.java b/webapp/src/test/java/org/apache/atlas/web/TestUtils.java index 7c53cdd733d..fbcbb622550 100644 --- a/webapp/src/test/java/org/apache/atlas/web/TestUtils.java +++ b/webapp/src/test/java/org/apache/atlas/web/TestUtils.java @@ -17,7 +17,8 @@ package org.apache.atlas.web; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.io.FileHandler; import org.apache.commons.lang3.RandomStringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +48,9 @@ public static void writeConfiguration(PropertiesConfiguration configuration, Str } file.createNewFile(); - configuration.save(new FileWriter(file)); + + FileHandler fileHandler = new FileHandler(configuration); + fileHandler.save(new FileWriter(file)); } public static String getTempDirectory() { diff --git a/webapp/src/test/java/org/apache/atlas/web/filters/AtlasAuthenticationFilterTest.java b/webapp/src/test/java/org/apache/atlas/web/filters/AtlasAuthenticationFilterTest.java index 9057ae57986..4645f800a9a 100644 --- a/webapp/src/test/java/org/apache/atlas/web/filters/AtlasAuthenticationFilterTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/filters/AtlasAuthenticationFilterTest.java @@ -25,9 +25,9 @@ import org.apache.atlas.utils.AuthenticationUtil; import org.apache.atlas.web.security.AtlasAbstractAuthenticationProvider; import org.apache.atlas.web.util.Servlets; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.MapConfiguration; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.MapConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.authentication.client.AuthenticatedURL; diff --git a/webapp/src/test/java/org/apache/atlas/web/filters/AtlasAuthenticationKerberosFilterTest.java b/webapp/src/test/java/org/apache/atlas/web/filters/AtlasAuthenticationKerberosFilterTest.java index c8571b4f6fe..87c4056d4e6 100644 --- a/webapp/src/test/java/org/apache/atlas/web/filters/AtlasAuthenticationKerberosFilterTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/filters/AtlasAuthenticationKerberosFilterTest.java @@ -19,7 +19,7 @@ import org.apache.atlas.RequestContext; import org.apache.atlas.web.security.BaseSecurityTest; import org.apache.atlas.web.service.EmbeddedServer; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.commons.io.FileUtils; import org.apache.hadoop.hdfs.web.URLConnectionFactory; import org.eclipse.jetty.server.Server; diff --git a/webapp/src/test/java/org/apache/atlas/web/filters/AtlasKnoxSSOAuthenticationFilterTest.java b/webapp/src/test/java/org/apache/atlas/web/filters/AtlasKnoxSSOAuthenticationFilterTest.java index f5eec9f4d86..bbe1c700171 100644 --- a/webapp/src/test/java/org/apache/atlas/web/filters/AtlasKnoxSSOAuthenticationFilterTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/filters/AtlasKnoxSSOAuthenticationFilterTest.java @@ -24,7 +24,7 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasException; import org.apache.atlas.web.security.AtlasAuthenticationProvider; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.MockitoAnnotations; diff --git a/webapp/src/test/java/org/apache/atlas/web/filters/AuditFilterTest.java b/webapp/src/test/java/org/apache/atlas/web/filters/AuditFilterTest.java index 582e3d94609..857d3920220 100644 --- a/webapp/src/test/java/org/apache/atlas/web/filters/AuditFilterTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/filters/AuditFilterTest.java @@ -20,7 +20,7 @@ import org.apache.atlas.DeleteType; import org.apache.atlas.RequestContext; import org.apache.atlas.util.AtlasRepositoryConfiguration; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.testng.annotations.BeforeMethod; diff --git a/webapp/src/test/java/org/apache/atlas/web/integration/AdminJerseyResourceIT.java b/webapp/src/test/java/org/apache/atlas/web/integration/AdminJerseyResourceIT.java index 0dc57b748e5..8bce76e43e0 100755 --- a/webapp/src/test/java/org/apache/atlas/web/integration/AdminJerseyResourceIT.java +++ b/webapp/src/test/java/org/apache/atlas/web/integration/AdminJerseyResourceIT.java @@ -20,7 +20,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.atlas.AtlasClient; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.io.FileHandler; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -42,7 +43,10 @@ public void testGetVersion() throws Exception { assertNotNull(response); - PropertiesConfiguration buildConfiguration = new PropertiesConfiguration("atlas-buildinfo.properties"); + PropertiesConfiguration buildConfiguration = new PropertiesConfiguration(); + + FileHandler fileHandler = new FileHandler(buildConfiguration); + fileHandler.load("atlas-buildinfo.properties"); assertEquals(response.get("Version").asText(), buildConfiguration.getString("build.version")); assertEquals(response.get("Name").asText(), buildConfiguration.getString("project.name")); diff --git a/webapp/src/test/java/org/apache/atlas/web/integration/BaseResourceIT.java b/webapp/src/test/java/org/apache/atlas/web/integration/BaseResourceIT.java index 53466ddecfe..a0e930f1afa 100755 --- a/webapp/src/test/java/org/apache/atlas/web/integration/BaseResourceIT.java +++ b/webapp/src/test/java/org/apache/atlas/web/integration/BaseResourceIT.java @@ -62,7 +62,7 @@ import org.apache.atlas.v1.model.typedef.TraitTypeDefinition; import org.apache.atlas.v1.model.typedef.TypesDef; import org.apache.atlas.v1.typesystem.types.utils.TypesUtil; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.RandomStringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/webapp/src/test/java/org/apache/atlas/web/listeners/LoginProcessorIT.java b/webapp/src/test/java/org/apache/atlas/web/listeners/LoginProcessorIT.java index 37a64628e64..1ccd14da0f6 100644 --- a/webapp/src/test/java/org/apache/atlas/web/listeners/LoginProcessorIT.java +++ b/webapp/src/test/java/org/apache/atlas/web/listeners/LoginProcessorIT.java @@ -17,7 +17,7 @@ package org.apache.atlas.web.listeners; import org.apache.atlas.web.security.BaseSecurityTest; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.security.UserGroupInformation; @@ -39,7 +39,7 @@ public class LoginProcessorIT extends BaseSecurityTest { public void testDefaultSimpleLogin() throws Exception { LoginProcessor processor = new LoginProcessor() { @Override - protected org.apache.commons.configuration.Configuration getApplicationConfiguration() { + protected org.apache.commons.configuration2.Configuration getApplicationConfiguration() { return new PropertiesConfiguration(); } }; @@ -68,7 +68,7 @@ protected Configuration getHadoopConfiguration() { } @Override - protected org.apache.commons.configuration.Configuration getApplicationConfiguration() { + protected org.apache.commons.configuration2.Configuration getApplicationConfiguration() { PropertiesConfiguration config = new PropertiesConfiguration(); config.setProperty("atlas.authentication.method", "kerberos"); diff --git a/webapp/src/test/java/org/apache/atlas/web/resources/AdminResourceTest.java b/webapp/src/test/java/org/apache/atlas/web/resources/AdminResourceTest.java index ef1c7fce1dc..83d7ba21ae1 100644 --- a/webapp/src/test/java/org/apache/atlas/web/resources/AdminResourceTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/resources/AdminResourceTest.java @@ -69,7 +69,7 @@ import org.apache.atlas.web.service.AtlasDebugMetricsSink; import org.apache.atlas.web.service.ServiceState; import org.apache.atlas.web.util.Servlets; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.MockitoAnnotations; diff --git a/webapp/src/test/java/org/apache/atlas/web/rest/DiscoveryRESTTest.java b/webapp/src/test/java/org/apache/atlas/web/rest/DiscoveryRESTTest.java index b4bd5abcf1b..c688f31107d 100644 --- a/webapp/src/test/java/org/apache/atlas/web/rest/DiscoveryRESTTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/rest/DiscoveryRESTTest.java @@ -32,7 +32,7 @@ import org.apache.atlas.type.AtlasStructType; import org.apache.atlas.type.AtlasTypeRegistry; import org.apache.atlas.utils.AtlasJson; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/webapp/src/test/java/org/apache/atlas/web/security/AtlasADAuthenticationProviderTest.java b/webapp/src/test/java/org/apache/atlas/web/security/AtlasADAuthenticationProviderTest.java index 4cc36d5dd2e..e48b2b5cd00 100644 --- a/webapp/src/test/java/org/apache/atlas/web/security/AtlasADAuthenticationProviderTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/AtlasADAuthenticationProviderTest.java @@ -20,8 +20,8 @@ package org.apache.atlas.web.security; import org.apache.atlas.ApplicationProperties; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationConverter; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationConverter; import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.MockitoAnnotations; diff --git a/webapp/src/test/java/org/apache/atlas/web/security/AtlasAuthenticationProviderTest.java b/webapp/src/test/java/org/apache/atlas/web/security/AtlasAuthenticationProviderTest.java index d06b34e06cd..425472e12f2 100644 --- a/webapp/src/test/java/org/apache/atlas/web/security/AtlasAuthenticationProviderTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/AtlasAuthenticationProviderTest.java @@ -20,7 +20,7 @@ package org.apache.atlas.web.security; import org.apache.atlas.ApplicationProperties; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.MockitoAnnotations; diff --git a/webapp/src/test/java/org/apache/atlas/web/security/AtlasKeycloakAuthenticationProviderTest.java b/webapp/src/test/java/org/apache/atlas/web/security/AtlasKeycloakAuthenticationProviderTest.java index 97fceba1f57..1b904ea3d05 100644 --- a/webapp/src/test/java/org/apache/atlas/web/security/AtlasKeycloakAuthenticationProviderTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/AtlasKeycloakAuthenticationProviderTest.java @@ -20,7 +20,7 @@ package org.apache.atlas.web.security; import org.apache.atlas.ApplicationProperties; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.OidcKeycloakAccount; import org.keycloak.adapters.springsecurity.authentication.KeycloakAuthenticationProvider; diff --git a/webapp/src/test/java/org/apache/atlas/web/security/AtlasLdapAuthenticationProviderTest.java b/webapp/src/test/java/org/apache/atlas/web/security/AtlasLdapAuthenticationProviderTest.java index 18e962ba048..8785286e36b 100644 --- a/webapp/src/test/java/org/apache/atlas/web/security/AtlasLdapAuthenticationProviderTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/AtlasLdapAuthenticationProviderTest.java @@ -21,8 +21,8 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.web.model.User; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationConverter; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationConverter; import org.mockito.Mock; import org.mockito.MockedConstruction; import org.mockito.MockedStatic; diff --git a/webapp/src/test/java/org/apache/atlas/web/security/AtlasPamAuthenticationProviderTest.java b/webapp/src/test/java/org/apache/atlas/web/security/AtlasPamAuthenticationProviderTest.java index c63d61e89a9..2295947002d 100644 --- a/webapp/src/test/java/org/apache/atlas/web/security/AtlasPamAuthenticationProviderTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/AtlasPamAuthenticationProviderTest.java @@ -21,8 +21,8 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.web.model.User; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationConverter; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.ConfigurationConverter; import org.mockito.Mock; import org.mockito.MockedConstruction; import org.mockito.MockedStatic; diff --git a/webapp/src/test/java/org/apache/atlas/web/security/AtlasSecurityConfigTest.java b/webapp/src/test/java/org/apache/atlas/web/security/AtlasSecurityConfigTest.java index 46c5e2111c3..a0d14f293d4 100644 --- a/webapp/src/test/java/org/apache/atlas/web/security/AtlasSecurityConfigTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/AtlasSecurityConfigTest.java @@ -26,7 +26,7 @@ import org.apache.atlas.web.filters.AtlasDelegatingAuthenticationEntryPoint; import org.apache.atlas.web.filters.AtlasKnoxSSOAuthenticationFilter; import org.apache.atlas.web.filters.StaleTransactionCleanupFilter; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.KeycloakConfigResolver; import org.keycloak.adapters.KeycloakDeployment; diff --git a/webapp/src/test/java/org/apache/atlas/web/security/BaseSecurityTest.java b/webapp/src/test/java/org/apache/atlas/web/security/BaseSecurityTest.java index 721d773f52e..0c0bceddf40 100644 --- a/webapp/src/test/java/org/apache/atlas/web/security/BaseSecurityTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/BaseSecurityTest.java @@ -19,8 +19,9 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasException; import org.apache.atlas.web.TestUtils; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.commons.configuration2.io.FileHandler; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.minikdc.MiniKdc; @@ -64,7 +65,8 @@ public static String writeConfiguration(final PropertiesConfiguration configurat url = new File(confLocation, ApplicationProperties.APPLICATION_PROPERTIES).toURI().toURL(); } PropertiesConfiguration configuredProperties = new PropertiesConfiguration(); - configuredProperties.load(url); + FileHandler fileHandler = new FileHandler(configuredProperties); + fileHandler.load(url); configuredProperties.copy(configuration); @@ -101,7 +103,7 @@ public static void setUpPolicyStore(String tmpDir) throws Exception { FileUtils.write(policyFile, policyStr); } - public static void persistSSLClientConfiguration(org.apache.commons.configuration.Configuration clientConfig) + public static void persistSSLClientConfiguration(org.apache.commons.configuration2.Configuration clientConfig) throws AtlasException, IOException { //trust settings Configuration configuration = new Configuration(false); @@ -134,16 +136,16 @@ public String createJAASEntry(String context, String principal, File keytab) { } protected void generateTestProperties(Properties props) throws ConfigurationException, IOException { - PropertiesConfiguration config = - new PropertiesConfiguration(System.getProperty("user.dir") + - "/../src/conf/" + ApplicationProperties.APPLICATION_PROPERTIES); + PropertiesConfiguration config = new PropertiesConfiguration(); + FileHandler fileHandler = new FileHandler(config); + fileHandler.load(System.getProperty("user.dir") + "/../src/conf/" + ApplicationProperties.APPLICATION_PROPERTIES); for (String propName : props.stringPropertyNames()) { config.setProperty(propName, props.getProperty(propName)); } File file = new File(System.getProperty("user.dir"), ApplicationProperties.APPLICATION_PROPERTIES); file.deleteOnExit(); Writer fileWriter = new FileWriter(file); - config.save(fileWriter); + fileHandler.save(fileWriter); } protected void startEmbeddedServer(Server server) throws Exception { diff --git a/webapp/src/test/java/org/apache/atlas/web/security/FileAuthenticationTest.java b/webapp/src/test/java/org/apache/atlas/web/security/FileAuthenticationTest.java index b753bebedd3..3bb64cbda2e 100644 --- a/webapp/src/test/java/org/apache/atlas/web/security/FileAuthenticationTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/FileAuthenticationTest.java @@ -20,7 +20,7 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.web.TestUtils; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.commons.io.FileUtils; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java b/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java index e37158e9ad8..c9589be6018 100755 --- a/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java @@ -21,8 +21,9 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasClient; import org.apache.atlas.web.TestUtils; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.io.FileHandler; import org.apache.hadoop.fs.Path; import org.apache.hadoop.security.alias.JavaKeyStoreProvider; import org.testng.annotations.Test; @@ -70,7 +71,9 @@ public void setUp() throws Exception { } else { url = new File(confLocation, ApplicationProperties.APPLICATION_PROPERTIES).toURI().toURL(); } - configuration.load(url); + + FileHandler fileHandler = new FileHandler(configuration); + fileHandler.load(url); configuration.setProperty(TLS_ENABLED, true); configuration.setProperty("atlas.authentication.method.kerberos", "true"); diff --git a/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java b/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java index 3f934ce5502..40b3fbfee57 100755 --- a/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java @@ -21,7 +21,8 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasClient; import org.apache.atlas.web.TestUtils; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.io.FileHandler; import org.apache.hadoop.fs.Path; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.alias.JavaKeyStoreProvider; @@ -79,7 +80,8 @@ public void setUp() throws Exception { url = new File(confLocation, ApplicationProperties.APPLICATION_PROPERTIES).toURI().toURL(); } - configuration.load(url); + FileHandler fileHandler = new FileHandler(configuration); + fileHandler.load(url); configuration.setProperty(TLS_ENABLED, true); configuration.setProperty("atlas.authentication.method.kerberos", "true"); configuration.setProperty("atlas.authentication.keytab", userKeytabFile.getAbsolutePath()); diff --git a/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java b/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java index 5ac970a345d..eb8065a6a77 100755 --- a/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java @@ -21,7 +21,7 @@ import org.apache.atlas.AtlasClient; import org.apache.atlas.web.TestUtils; import org.apache.atlas.web.service.SecureEmbeddedServer; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.security.alias.CredentialProvider; @@ -66,7 +66,7 @@ public void setUp() throws Exception { secureEmbeddedServer = new TestSecureEmbeddedServer(21443, getWarPath()) { @Override - public org.apache.commons.configuration.Configuration getConfiguration() { + public org.apache.commons.configuration2.Configuration getConfiguration() { return configuration; } }; diff --git a/webapp/src/test/java/org/apache/atlas/web/service/ActiveInstanceElectorServiceTest.java b/webapp/src/test/java/org/apache/atlas/web/service/ActiveInstanceElectorServiceTest.java index 9efbc63f2cc..24454597662 100644 --- a/webapp/src/test/java/org/apache/atlas/web/service/ActiveInstanceElectorServiceTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/service/ActiveInstanceElectorServiceTest.java @@ -24,7 +24,7 @@ import org.apache.atlas.ha.HAConfiguration; import org.apache.atlas.listener.ActiveStateChangeHandler; import org.apache.atlas.util.AtlasMetricsUtil; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.curator.framework.recipes.leader.LeaderLatch; import org.mockito.InOrder; import org.mockito.Mock; diff --git a/webapp/src/test/java/org/apache/atlas/web/service/ActiveInstanceStateTest.java b/webapp/src/test/java/org/apache/atlas/web/service/ActiveInstanceStateTest.java index 68f7ee75598..3e1d141be69 100644 --- a/webapp/src/test/java/org/apache/atlas/web/service/ActiveInstanceStateTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/service/ActiveInstanceStateTest.java @@ -19,7 +19,7 @@ package org.apache.atlas.web.service; import org.apache.atlas.ha.HAConfiguration; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.api.CreateBuilder; import org.apache.curator.framework.api.ExistsBuilder; diff --git a/webapp/src/test/java/org/apache/atlas/web/service/CuratorFactoryTest.java b/webapp/src/test/java/org/apache/atlas/web/service/CuratorFactoryTest.java index 396db2f6854..0635fb03a75 100644 --- a/webapp/src/test/java/org/apache/atlas/web/service/CuratorFactoryTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/service/CuratorFactoryTest.java @@ -21,7 +21,7 @@ import com.google.common.base.Charsets; import org.apache.atlas.AtlasException; import org.apache.atlas.ha.HAConfiguration; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.api.ACLProvider; diff --git a/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTest.java b/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTest.java index 57ab4cbec1c..7b305dcc590 100644 --- a/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTest.java @@ -21,7 +21,7 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.web.TestUtils; import org.apache.atlas.web.security.BaseSecurityTest; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; import org.eclipse.jetty.webapp.WebAppContext; import org.testng.annotations.Test; diff --git a/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java b/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java index 5c209fa3f50..bb77e5fabc0 100755 --- a/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java +++ b/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java @@ -26,7 +26,7 @@ import org.apache.atlas.web.integration.AdminJerseyResourceIT; import org.apache.atlas.web.integration.EntityJerseyResourceIT; import org.apache.atlas.web.integration.TypesJerseyResourceIT; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.security.alias.CredentialProvider; @@ -64,7 +64,7 @@ public class SecureEmbeddedServerTestBase { @BeforeClass public void setupSecurePort() throws AtlasException { - org.apache.commons.configuration.Configuration configuration = ApplicationProperties.get(); + org.apache.commons.configuration2.Configuration configuration = ApplicationProperties.get(); securePort = configuration.getInt(Atlas.ATLAS_SERVER_HTTPS_PORT, ATLAS_DEFAULT_HTTPS_PORT); } diff --git a/webapp/src/test/java/org/apache/atlas/web/service/ServiceStateTest.java b/webapp/src/test/java/org/apache/atlas/web/service/ServiceStateTest.java index fa532a5c37d..8415144cb44 100644 --- a/webapp/src/test/java/org/apache/atlas/web/service/ServiceStateTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/service/ServiceStateTest.java @@ -23,7 +23,7 @@ import org.apache.atlas.exception.AtlasBaseException; import org.apache.atlas.ha.HAConfiguration; import org.apache.atlas.repository.audit.AtlasAuditService; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.testng.annotations.BeforeMethod; diff --git a/webapp/src/test/java/org/apache/atlas/web/setup/SetupStepsTest.java b/webapp/src/test/java/org/apache/atlas/web/setup/SetupStepsTest.java index ba8f0255091..5360f0fb3e9 100644 --- a/webapp/src/test/java/org/apache/atlas/web/setup/SetupStepsTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/setup/SetupStepsTest.java @@ -24,7 +24,7 @@ import org.apache.atlas.setup.SetupException; import org.apache.atlas.setup.SetupStep; import org.apache.atlas.web.service.CuratorFactory; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.tuple.Pair; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.api.CreateBuilder;