Skip to content

Commit 3375ba4

Browse files
ATLAS-5266: Upgrading commons-configuration1 to commons-configuration2.
1 parent d355acd commit 3375ba4

176 files changed

Lines changed: 263 additions & 265 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

addons/falcon-bridge-shim/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
<version>${falcon.version}</version>
4949
<scope>provided</scope>
5050
<exclusions>
51+
<exclusion>
52+
<groupId>commons-configuration</groupId>
53+
<artifactId>commons-configuration</artifactId>
54+
</exclusion>
5155
<exclusion>
5256
<groupId>javax.servlet</groupId>
5357
<artifactId>servlet-api</artifactId>

addons/falcon-bridge/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@
9999
<groupId>org.springframework</groupId>
100100
<artifactId>spring-tx</artifactId>
101101
</exclusion>
102+
<exclusion>
103+
<groupId>commons-configuration</groupId>
104+
<artifactId>commons-configuration</artifactId>
105+
</exclusion>
102106
</exclusions>
103107
</dependency>
104108
<dependency>

addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.apache.atlas.utils.AuthenticationUtil;
3333
import org.apache.atlas.utils.ParamChecker;
3434
import org.apache.atlas.v1.typesystem.types.utils.TypesUtil;
35-
import org.apache.commons.configuration.Configuration;
35+
import org.apache.commons.configuration2.Configuration;
3636
import org.apache.commons.lang3.RandomStringUtils;
3737
import org.apache.falcon.entity.FeedHelper;
3838
import org.apache.falcon.entity.FileSystemStorage;

addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseBridge.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.apache.commons.cli.Options;
3737
import org.apache.commons.cli.ParseException;
3838
import org.apache.commons.collections.CollectionUtils;
39-
import org.apache.commons.configuration.Configuration;
39+
import org.apache.commons.configuration2.Configuration;
4040
import org.apache.commons.lang3.ArrayUtils;
4141
import org.apache.commons.lang3.StringUtils;
4242
import org.apache.hadoop.hbase.HBaseConfiguration;

addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public void testCreateTable() throws Exception {
159159
// Methods for creating HBase
160160
private void createAtlasClient() {
161161
try {
162-
org.apache.commons.configuration.Configuration configuration = ApplicationProperties.get();
162+
org.apache.commons.configuration2.Configuration configuration = ApplicationProperties.get();
163163
String[] atlasEndPoint = configuration.getStringArray(HBaseAtlasHook.ATTR_ATLAS_ENDPOINT);
164164

165165
configuration.setProperty("atlas.cluster.name", CLUSTER_NAME);

addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import org.apache.commons.cli.MissingArgumentException;
5252
import org.apache.commons.collections.CollectionUtils;
5353
import org.apache.commons.collections.MapUtils;
54-
import org.apache.commons.configuration.Configuration;
54+
import org.apache.commons.configuration2.Configuration;
5555
import org.apache.commons.lang3.ArrayUtils;
5656
import org.apache.commons.lang3.RandomStringUtils;
5757
import org.apache.commons.lang3.StringUtils;

addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridgeV2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
import org.apache.commons.cli.CommandLine;
4747
import org.apache.commons.collections.MapUtils;
48-
import org.apache.commons.configuration.Configuration;
48+
import org.apache.commons.configuration2.Configuration;
4949
import org.apache.commons.io.FileUtils;
5050
import org.apache.commons.lang3.ArrayUtils;
5151
import org.apache.commons.lang3.RandomStringUtils;

addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/utils/ActiveEntityFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.common.annotations.VisibleForTesting;
2121
import org.apache.atlas.hive.hook.HiveHook;
2222
import org.apache.atlas.model.notification.HookNotification;
23-
import org.apache.commons.configuration.Configuration;
23+
import org.apache.commons.configuration2.Configuration;
2424
import org.slf4j.Logger;
2525
import org.slf4j.LoggerFactory;
2626

addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.apache.atlas.model.notification.HookNotification;
3434
import org.apache.atlas.utils.AuthenticationUtil;
3535
import org.apache.atlas.utils.ParamChecker;
36-
import org.apache.commons.configuration.Configuration;
36+
import org.apache.commons.configuration2.Configuration;
3737
import org.apache.commons.lang3.RandomStringUtils;
3838
import org.apache.commons.lang3.StringUtils;
3939
import org.apache.hadoop.fs.Path;

addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.apache.atlas.model.typedef.AtlasTypesDef;
3838
import org.apache.atlas.type.AtlasTypeUtil;
3939
import org.apache.commons.collections.CollectionUtils;
40-
import org.apache.commons.configuration.Configuration;
40+
import org.apache.commons.configuration2.Configuration;
4141
import org.apache.commons.lang3.StringUtils;
4242
import org.apache.hadoop.fs.Path;
4343
import org.apache.hadoop.hive.conf.HiveConf;

0 commit comments

Comments
 (0)