Repository: falcon Updated Branches: refs/heads/0.6.1 dde43120a -> 89c2749f7
FALCON-1144 Dynamic partitions not getting registered in Hcat. Contributed by Suhas Vasu Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/2edd402a Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/2edd402a Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/2edd402a Branch: refs/heads/0.6.1 Commit: 2edd402a150e5926fd1b0e99030cee13460e0f84 Parents: dde4312 Author: Suhas Vasu <[email protected]> Authored: Thu Apr 9 12:15:57 2015 +0530 Committer: Suhas Vasu <[email protected]> Committed: Thu Apr 9 12:15:57 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 13 +++++++++++++ client/pom.xml | 4 ++-- .../main/java/org/apache/falcon/ResponseHelper.java | 2 +- .../src/main/java/org/apache/falcon/cli/FalconCLI.java | 2 +- .../java/org/apache/falcon/cli/FalconMetadataCLI.java | 2 +- .../java/org/apache/falcon/client/FalconClient.java | 2 +- .../main/java/org/apache/falcon/recipe/RecipeTool.java | 2 +- .../java/org/apache/falcon/resource/EntityList.java | 2 +- .../org/apache/falcon/resource/FeedLookupResult.java | 2 +- .../org/apache/falcon/resource/LineageGraphResult.java | 2 +- common/pom.xml | 4 ++-- .../apache/falcon/catalog/CatalogPartitionHandler.java | 2 +- .../main/java/org/apache/falcon/entity/EntityUtil.java | 2 +- .../main/java/org/apache/falcon/entity/ExternalId.java | 2 +- .../main/java/org/apache/falcon/entity/FeedHelper.java | 2 +- .../org/apache/falcon/entity/FileSystemStorage.java | 2 +- .../java/org/apache/falcon/entity/ProcessHelper.java | 2 +- .../apache/falcon/entity/parser/FeedEntityParser.java | 2 +- .../falcon/entity/parser/ProcessEntityParser.java | 2 +- .../apache/falcon/entity/store/FeedLocationStore.java | 2 +- .../java/org/apache/falcon/group/FeedGroupMap.java | 2 +- .../metadata/EntityRelationshipGraphBuilder.java | 2 +- .../metadata/InstanceRelationshipGraphBuilder.java | 2 +- .../falcon/metadata/RelationshipGraphBuilder.java | 2 +- .../java/org/apache/falcon/security/CurrentUser.java | 2 +- .../falcon/security/DefaultAuthorizationProvider.java | 2 +- .../java/org/apache/falcon/update/UpdateHelper.java | 2 +- .../org/apache/falcon/util/ApplicationProperties.java | 2 +- .../java/org/apache/falcon/util/FalconRadixUtils.java | 2 +- .../main/java/org/apache/falcon/util/RadixNode.java | 2 +- .../main/java/org/apache/falcon/util/RadixTree.java | 2 +- .../falcon/workflow/WorkflowExecutionContext.java | 2 +- .../workflow/WorkflowJobEndNotificationService.java | 2 +- common/src/main/resources/startup.properties | 2 +- .../apache/falcon/messaging/JMSMessageConsumer.java | 2 +- .../org/apache/falcon/messaging/FeedProducerTest.java | 2 +- .../apache/falcon/messaging/ProcessProducerTest.java | 2 +- oozie-el-extensions/pom.xml | 5 +++++ .../org/apache/oozie/extensions/OozieELExtensions.java | 2 +- .../java/org/apache/falcon/logging/LogProvider.java | 2 +- .../org/apache/falcon/oozie/OozieEntityBuilder.java | 2 +- .../oozie/feed/FeedReplicationCoordinatorBuilder.java | 2 +- .../process/ProcessExecutionCoordinatorBuilder.java | 2 +- .../oozie/process/ProcessExecutionWorkflowBuilder.java | 2 +- .../falcon/service/SharedLibraryHostingService.java | 2 +- .../falcon/workflow/engine/OozieWorkflowEngine.java | 2 +- .../oozie/feed/OozieFeedWorkflowBuilderTest.java | 2 +- .../oozie/workflow/FalconPostProcessingTest.java | 2 +- pom.xml | 6 +++--- prism/src/main/java/org/apache/falcon/Main.java | 2 +- .../apache/falcon/resource/AbstractEntityManager.java | 2 +- .../falcon/resource/AbstractInstanceManager.java | 2 +- .../resource/AbstractSchedulableEntityManager.java | 2 +- .../apache/falcon/resource/admin/AdminResource.java | 2 +- .../resource/metadata/LineageMetadataResource.java | 2 +- .../resource/metadata/MetadataDiscoveryResource.java | 2 +- .../falcon/security/FalconAuthenticationFilter.java | 2 +- .../RemoteUserInHeaderBasedAuthenticationHandler.java | 2 +- .../src/main/java/org/apache/falcon/util/Servlets.java | 2 +- .../org/apache/falcon/resource/EntityManagerTest.java | 2 +- .../org/apache/falcon/replication/FeedReplicator.java | 2 +- src/conf/startup.properties | 2 +- 62 files changed, 82 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d8bca8c..067cb9d 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,17 @@ Apache Falcon Change log Trunk (Unreleased) + INCOMPATIBLE CHANGES + + NEW FEATURES + IMPROVEMENTS + + OPTIMIZATIONS + + BUG FIXES + +Branch: 0.6.1 (Proposed Release Version: 0.6.1) FALCON-1134 Create branch 0.6.1 and update version to 0.6.1 (Shaik Idris Ali) @@ -135,6 +145,9 @@ Trunk (Unreleased) (Suhas vasu) BUG FIXES + FALCON-1144 Dynamic partitions not getting registered in Hcat + (Suhas Vasu) + FALCON-1132 Falcon trunk is broken due to failure in IT test (Ajay Yadava via Suhas Vasu) http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 81d94c6..d7b7656 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -68,8 +68,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/client/src/main/java/org/apache/falcon/ResponseHelper.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/falcon/ResponseHelper.java b/client/src/main/java/org/apache/falcon/ResponseHelper.java index 666e418..2261ceb 100644 --- a/client/src/main/java/org/apache/falcon/ResponseHelper.java +++ b/client/src/main/java/org/apache/falcon/ResponseHelper.java @@ -20,7 +20,7 @@ package org.apache.falcon; import java.util.Date; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.entity.v0.SchemaHelper; import org.apache.falcon.resource.FeedInstanceResult; import org.apache.falcon.resource.FeedLookupResult; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/client/src/main/java/org/apache/falcon/cli/FalconCLI.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/falcon/cli/FalconCLI.java b/client/src/main/java/org/apache/falcon/cli/FalconCLI.java index 958ea62..4ea9fc3 100644 --- a/client/src/main/java/org/apache/falcon/cli/FalconCLI.java +++ b/client/src/main/java/org/apache/falcon/cli/FalconCLI.java @@ -26,7 +26,7 @@ import org.apache.commons.cli.OptionGroup; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.LifeCycle; import org.apache.falcon.client.FalconCLIException; import org.apache.falcon.client.FalconClient; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/client/src/main/java/org/apache/falcon/cli/FalconMetadataCLI.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/falcon/cli/FalconMetadataCLI.java b/client/src/main/java/org/apache/falcon/cli/FalconMetadataCLI.java index 515d328..2f57c7d 100644 --- a/client/src/main/java/org/apache/falcon/cli/FalconMetadataCLI.java +++ b/client/src/main/java/org/apache/falcon/cli/FalconMetadataCLI.java @@ -22,7 +22,7 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import org.apache.commons.cli.OptionGroup; import org.apache.commons.cli.Options; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.client.FalconCLIException; import org.apache.falcon.client.FalconClient; import org.apache.falcon.metadata.RelationshipType; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/client/src/main/java/org/apache/falcon/client/FalconClient.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/falcon/client/FalconClient.java b/client/src/main/java/org/apache/falcon/client/FalconClient.java index 15691a6..8b40ef2 100644 --- a/client/src/main/java/org/apache/falcon/client/FalconClient.java +++ b/client/src/main/java/org/apache/falcon/client/FalconClient.java @@ -24,7 +24,7 @@ import com.sun.jersey.api.client.WebResource; import com.sun.jersey.api.client.config.DefaultClientConfig; import com.sun.jersey.client.urlconnection.HTTPSProperties; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.net.util.TrustManagerUtils; import org.apache.falcon.LifeCycle; import org.apache.falcon.cli.FalconMetadataCLI; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/client/src/main/java/org/apache/falcon/recipe/RecipeTool.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/falcon/recipe/RecipeTool.java b/client/src/main/java/org/apache/falcon/recipe/RecipeTool.java index 1a2e2f0..3cb64ee 100644 --- a/client/src/main/java/org/apache/falcon/recipe/RecipeTool.java +++ b/client/src/main/java/org/apache/falcon/recipe/RecipeTool.java @@ -25,7 +25,7 @@ import org.apache.commons.cli.Option; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.*; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/client/src/main/java/org/apache/falcon/resource/EntityList.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/falcon/resource/EntityList.java b/client/src/main/java/org/apache/falcon/resource/EntityList.java index d43418c..4c96195 100644 --- a/client/src/main/java/org/apache/falcon/resource/EntityList.java +++ b/client/src/main/java/org/apache/falcon/resource/EntityList.java @@ -18,7 +18,7 @@ package org.apache.falcon.resource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.entity.v0.Entity; import org.apache.falcon.entity.v0.EntityType; import org.apache.falcon.entity.v0.process.Input; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/client/src/main/java/org/apache/falcon/resource/FeedLookupResult.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/falcon/resource/FeedLookupResult.java b/client/src/main/java/org/apache/falcon/resource/FeedLookupResult.java index bc08f00..d2bf259 100644 --- a/client/src/main/java/org/apache/falcon/resource/FeedLookupResult.java +++ b/client/src/main/java/org/apache/falcon/resource/FeedLookupResult.java @@ -18,7 +18,7 @@ package org.apache.falcon.resource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.entity.v0.feed.LocationType; import javax.xml.bind.annotation.XmlAccessType; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/client/src/main/java/org/apache/falcon/resource/LineageGraphResult.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/falcon/resource/LineageGraphResult.java b/client/src/main/java/org/apache/falcon/resource/LineageGraphResult.java index acf5d11..0e20b7e 100644 --- a/client/src/main/java/org/apache/falcon/resource/LineageGraphResult.java +++ b/client/src/main/java/org/apache/falcon/resource/LineageGraphResult.java @@ -18,7 +18,7 @@ package org.apache.falcon.resource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index ec1d7d1..b90e592 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -72,8 +72,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/catalog/CatalogPartitionHandler.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/catalog/CatalogPartitionHandler.java b/common/src/main/java/org/apache/falcon/catalog/CatalogPartitionHandler.java index f8a3d46..d0b09df 100644 --- a/common/src/main/java/org/apache/falcon/catalog/CatalogPartitionHandler.java +++ b/common/src/main/java/org/apache/falcon/catalog/CatalogPartitionHandler.java @@ -19,7 +19,7 @@ package org.apache.falcon.catalog; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.entity.CatalogStorage; import org.apache.falcon.entity.ClusterHelper; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/entity/EntityUtil.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/entity/EntityUtil.java b/common/src/main/java/org/apache/falcon/entity/EntityUtil.java index 3656ae4..26d3da2 100644 --- a/common/src/main/java/org/apache/falcon/entity/EntityUtil.java +++ b/common/src/main/java/org/apache/falcon/entity/EntityUtil.java @@ -21,7 +21,7 @@ package org.apache.falcon.entity; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.Pair; import org.apache.falcon.Tag; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/entity/ExternalId.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/entity/ExternalId.java b/common/src/main/java/org/apache/falcon/entity/ExternalId.java index c53d83a..688d5a6 100644 --- a/common/src/main/java/org/apache/falcon/entity/ExternalId.java +++ b/common/src/main/java/org/apache/falcon/entity/ExternalId.java @@ -18,7 +18,7 @@ package org.apache.falcon.entity; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.Tag; import org.apache.falcon.entity.v0.SchemaHelper; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/entity/FeedHelper.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/entity/FeedHelper.java b/common/src/main/java/org/apache/falcon/entity/FeedHelper.java index 7f9acc9..20f348d 100644 --- a/common/src/main/java/org/apache/falcon/entity/FeedHelper.java +++ b/common/src/main/java/org/apache/falcon/entity/FeedHelper.java @@ -18,7 +18,7 @@ package org.apache.falcon.entity; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.LifeCycle; import org.apache.falcon.Tag; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/entity/FileSystemStorage.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/entity/FileSystemStorage.java b/common/src/main/java/org/apache/falcon/entity/FileSystemStorage.java index a5caf8e..8948ad4 100644 --- a/common/src/main/java/org/apache/falcon/entity/FileSystemStorage.java +++ b/common/src/main/java/org/apache/falcon/entity/FileSystemStorage.java @@ -18,7 +18,7 @@ package org.apache.falcon.entity; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.Pair; import org.apache.falcon.entity.common.FeedDataPath; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/entity/ProcessHelper.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/entity/ProcessHelper.java b/common/src/main/java/org/apache/falcon/entity/ProcessHelper.java index 504509d..29aefa0 100644 --- a/common/src/main/java/org/apache/falcon/entity/ProcessHelper.java +++ b/common/src/main/java/org/apache/falcon/entity/ProcessHelper.java @@ -18,7 +18,7 @@ package org.apache.falcon.entity; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.entity.v0.EntityType; import org.apache.falcon.entity.v0.feed.Feed; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/entity/parser/FeedEntityParser.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/entity/parser/FeedEntityParser.java b/common/src/main/java/org/apache/falcon/entity/parser/FeedEntityParser.java index 448fd70..4547c23 100644 --- a/common/src/main/java/org/apache/falcon/entity/parser/FeedEntityParser.java +++ b/common/src/main/java/org/apache/falcon/entity/parser/FeedEntityParser.java @@ -18,7 +18,7 @@ package org.apache.falcon.entity.parser; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.catalog.CatalogServiceFactory; import org.apache.falcon.entity.*; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/entity/parser/ProcessEntityParser.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/entity/parser/ProcessEntityParser.java b/common/src/main/java/org/apache/falcon/entity/parser/ProcessEntityParser.java index 3119b36..56cc4ca 100644 --- a/common/src/main/java/org/apache/falcon/entity/parser/ProcessEntityParser.java +++ b/common/src/main/java/org/apache/falcon/entity/parser/ProcessEntityParser.java @@ -18,7 +18,7 @@ package org.apache.falcon.entity.parser; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.entity.ClusterHelper; import org.apache.falcon.entity.EntityUtil; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/entity/store/FeedLocationStore.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/entity/store/FeedLocationStore.java b/common/src/main/java/org/apache/falcon/entity/store/FeedLocationStore.java index fefd74b..a9b7617 100644 --- a/common/src/main/java/org/apache/falcon/entity/store/FeedLocationStore.java +++ b/common/src/main/java/org/apache/falcon/entity/store/FeedLocationStore.java @@ -18,7 +18,7 @@ package org.apache.falcon.entity.store; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.entity.FeedHelper; import org.apache.falcon.entity.v0.Entity; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/group/FeedGroupMap.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/group/FeedGroupMap.java b/common/src/main/java/org/apache/falcon/group/FeedGroupMap.java index e2dcfce..a832366 100644 --- a/common/src/main/java/org/apache/falcon/group/FeedGroupMap.java +++ b/common/src/main/java/org/apache/falcon/group/FeedGroupMap.java @@ -17,7 +17,7 @@ */ package org.apache.falcon.group; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.entity.FeedHelper; import org.apache.falcon.entity.v0.Entity; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/metadata/EntityRelationshipGraphBuilder.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/metadata/EntityRelationshipGraphBuilder.java b/common/src/main/java/org/apache/falcon/metadata/EntityRelationshipGraphBuilder.java index c22bcdb..d90f7ec 100644 --- a/common/src/main/java/org/apache/falcon/metadata/EntityRelationshipGraphBuilder.java +++ b/common/src/main/java/org/apache/falcon/metadata/EntityRelationshipGraphBuilder.java @@ -31,7 +31,7 @@ import org.apache.falcon.entity.v0.process.Outputs; import org.apache.falcon.entity.v0.process.Process; import org.apache.falcon.entity.v0.process.Workflow; import org.apache.falcon.workflow.WorkflowExecutionArgs; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/metadata/InstanceRelationshipGraphBuilder.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/metadata/InstanceRelationshipGraphBuilder.java b/common/src/main/java/org/apache/falcon/metadata/InstanceRelationshipGraphBuilder.java index 87bac69..2288443 100644 --- a/common/src/main/java/org/apache/falcon/metadata/InstanceRelationshipGraphBuilder.java +++ b/common/src/main/java/org/apache/falcon/metadata/InstanceRelationshipGraphBuilder.java @@ -20,7 +20,7 @@ package org.apache.falcon.metadata; import com.tinkerpop.blueprints.Graph; import com.tinkerpop.blueprints.Vertex; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.entity.CatalogStorage; import org.apache.falcon.entity.FeedHelper; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/metadata/RelationshipGraphBuilder.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/metadata/RelationshipGraphBuilder.java b/common/src/main/java/org/apache/falcon/metadata/RelationshipGraphBuilder.java index b92224b..0c3fcee 100644 --- a/common/src/main/java/org/apache/falcon/metadata/RelationshipGraphBuilder.java +++ b/common/src/main/java/org/apache/falcon/metadata/RelationshipGraphBuilder.java @@ -25,7 +25,7 @@ import com.tinkerpop.blueprints.GraphQuery; import com.tinkerpop.blueprints.Vertex; import org.apache.falcon.entity.v0.SchemaHelper; import org.apache.falcon.security.CurrentUser; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/security/CurrentUser.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/security/CurrentUser.java b/common/src/main/java/org/apache/falcon/security/CurrentUser.java index 11adccd..4aed5d7 100644 --- a/common/src/main/java/org/apache/falcon/security/CurrentUser.java +++ b/common/src/main/java/org/apache/falcon/security/CurrentUser.java @@ -18,7 +18,7 @@ package org.apache.falcon.security; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/security/DefaultAuthorizationProvider.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/security/DefaultAuthorizationProvider.java b/common/src/main/java/org/apache/falcon/security/DefaultAuthorizationProvider.java index f6da2cf..449be80 100644 --- a/common/src/main/java/org/apache/falcon/security/DefaultAuthorizationProvider.java +++ b/common/src/main/java/org/apache/falcon/security/DefaultAuthorizationProvider.java @@ -18,7 +18,7 @@ package org.apache.falcon.security; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang.Validate; import org.apache.falcon.FalconException; import org.apache.falcon.entity.EntityNotRegisteredException; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/update/UpdateHelper.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/update/UpdateHelper.java b/common/src/main/java/org/apache/falcon/update/UpdateHelper.java index 54d799c..6603bc6 100644 --- a/common/src/main/java/org/apache/falcon/update/UpdateHelper.java +++ b/common/src/main/java/org/apache/falcon/update/UpdateHelper.java @@ -18,7 +18,7 @@ package org.apache.falcon.update; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.entity.EntityUtil; import org.apache.falcon.entity.FeedHelper; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/util/ApplicationProperties.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/util/ApplicationProperties.java b/common/src/main/java/org/apache/falcon/util/ApplicationProperties.java index 6d89199..1d8cf49 100644 --- a/common/src/main/java/org/apache/falcon/util/ApplicationProperties.java +++ b/common/src/main/java/org/apache/falcon/util/ApplicationProperties.java @@ -19,7 +19,7 @@ package org.apache.falcon.util; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.expression.ExpressionHelper; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/util/FalconRadixUtils.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/util/FalconRadixUtils.java b/common/src/main/java/org/apache/falcon/util/FalconRadixUtils.java index 573180a..0374dc1 100644 --- a/common/src/main/java/org/apache/falcon/util/FalconRadixUtils.java +++ b/common/src/main/java/org/apache/falcon/util/FalconRadixUtils.java @@ -19,7 +19,7 @@ package org.apache.falcon.util; import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.entity.common.FeedDataPath; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/util/RadixNode.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/util/RadixNode.java b/common/src/main/java/org/apache/falcon/util/RadixNode.java index 12227cb..35d7ef3 100644 --- a/common/src/main/java/org/apache/falcon/util/RadixNode.java +++ b/common/src/main/java/org/apache/falcon/util/RadixNode.java @@ -18,7 +18,7 @@ package org.apache.falcon.util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Collection; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/util/RadixTree.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/util/RadixTree.java b/common/src/main/java/org/apache/falcon/util/RadixTree.java index 436d7f2..a667506 100644 --- a/common/src/main/java/org/apache/falcon/util/RadixTree.java +++ b/common/src/main/java/org/apache/falcon/util/RadixTree.java @@ -18,7 +18,7 @@ package org.apache.falcon.util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.entity.store.FeedPathStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/workflow/WorkflowExecutionContext.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/workflow/WorkflowExecutionContext.java b/common/src/main/java/org/apache/falcon/workflow/WorkflowExecutionContext.java index 887cea2..53ef5de 100644 --- a/common/src/main/java/org/apache/falcon/workflow/WorkflowExecutionContext.java +++ b/common/src/main/java/org/apache/falcon/workflow/WorkflowExecutionContext.java @@ -23,7 +23,7 @@ import org.apache.commons.cli.GnuParser; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.entity.v0.EntityType; import org.apache.falcon.entity.v0.SchemaHelper; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/java/org/apache/falcon/workflow/WorkflowJobEndNotificationService.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/workflow/WorkflowJobEndNotificationService.java b/common/src/main/java/org/apache/falcon/workflow/WorkflowJobEndNotificationService.java index 90b66c8..c4f8843 100644 --- a/common/src/main/java/org/apache/falcon/workflow/WorkflowJobEndNotificationService.java +++ b/common/src/main/java/org/apache/falcon/workflow/WorkflowJobEndNotificationService.java @@ -18,7 +18,7 @@ package org.apache.falcon.workflow; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.aspect.GenericAlert; import org.apache.falcon.entity.v0.SchemaHelper; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/common/src/main/resources/startup.properties ---------------------------------------------------------------------- diff --git a/common/src/main/resources/startup.properties b/common/src/main/resources/startup.properties index 4f41548..65746d7 100644 --- a/common/src/main/resources/startup.properties +++ b/common/src/main/resources/startup.properties @@ -50,7 +50,7 @@ *.broker.impl.class=org.apache.activemq.ActiveMQConnectionFactory ##### List of shared libraries for Falcon workflows ##### -*.shared.libs=activemq-core,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms +*.shared.libs=activemq-core,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3 ##### Workflow Job Execution Completion listeners ##### *.workflow.execution.listeners= http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/messaging/src/main/java/org/apache/falcon/messaging/JMSMessageConsumer.java ---------------------------------------------------------------------- diff --git a/messaging/src/main/java/org/apache/falcon/messaging/JMSMessageConsumer.java b/messaging/src/main/java/org/apache/falcon/messaging/JMSMessageConsumer.java index 4df1490..d3178fb 100644 --- a/messaging/src/main/java/org/apache/falcon/messaging/JMSMessageConsumer.java +++ b/messaging/src/main/java/org/apache/falcon/messaging/JMSMessageConsumer.java @@ -18,7 +18,7 @@ package org.apache.falcon.messaging; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.aspect.GenericAlert; import org.apache.falcon.messaging.util.MessagingUtil; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/messaging/src/test/java/org/apache/falcon/messaging/FeedProducerTest.java ---------------------------------------------------------------------- diff --git a/messaging/src/test/java/org/apache/falcon/messaging/FeedProducerTest.java b/messaging/src/test/java/org/apache/falcon/messaging/FeedProducerTest.java index 2f5aa70..8f9d227 100644 --- a/messaging/src/test/java/org/apache/falcon/messaging/FeedProducerTest.java +++ b/messaging/src/test/java/org/apache/falcon/messaging/FeedProducerTest.java @@ -41,7 +41,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/messaging/src/test/java/org/apache/falcon/messaging/ProcessProducerTest.java ---------------------------------------------------------------------- diff --git a/messaging/src/test/java/org/apache/falcon/messaging/ProcessProducerTest.java b/messaging/src/test/java/org/apache/falcon/messaging/ProcessProducerTest.java index 1cd3310..77274ef 100644 --- a/messaging/src/test/java/org/apache/falcon/messaging/ProcessProducerTest.java +++ b/messaging/src/test/java/org/apache/falcon/messaging/ProcessProducerTest.java @@ -22,7 +22,7 @@ import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerService; import org.apache.falcon.workflow.WorkflowExecutionArgs; import org.apache.falcon.workflow.WorkflowExecutionContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/oozie-el-extensions/pom.xml ---------------------------------------------------------------------- diff --git a/oozie-el-extensions/pom.xml b/oozie-el-extensions/pom.xml index 0cbc7c0..df2b66f 100644 --- a/oozie-el-extensions/pom.xml +++ b/oozie-el-extensions/pom.xml @@ -77,6 +77,11 @@ <groupId>net.sourceforge.findbugs</groupId> <artifactId>annotations</artifactId> </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/oozie-el-extensions/src/main/java/org/apache/oozie/extensions/OozieELExtensions.java ---------------------------------------------------------------------- diff --git a/oozie-el-extensions/src/main/java/org/apache/oozie/extensions/OozieELExtensions.java b/oozie-el-extensions/src/main/java/org/apache/oozie/extensions/OozieELExtensions.java index f3533b8..167afde 100644 --- a/oozie-el-extensions/src/main/java/org/apache/oozie/extensions/OozieELExtensions.java +++ b/oozie-el-extensions/src/main/java/org/apache/oozie/extensions/OozieELExtensions.java @@ -18,7 +18,7 @@ package org.apache.oozie.extensions; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.oozie.command.coord.CoordCommandUtils; import org.apache.oozie.coord.CoordELEvaluator; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/oozie/src/main/java/org/apache/falcon/logging/LogProvider.java ---------------------------------------------------------------------- diff --git a/oozie/src/main/java/org/apache/falcon/logging/LogProvider.java b/oozie/src/main/java/org/apache/falcon/logging/LogProvider.java index b4eae5d..ff7707a 100644 --- a/oozie/src/main/java/org/apache/falcon/logging/LogProvider.java +++ b/oozie/src/main/java/org/apache/falcon/logging/LogProvider.java @@ -17,7 +17,7 @@ */ package org.apache.falcon.logging; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.entity.ClusterHelper; import org.apache.falcon.entity.EntityUtil; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/oozie/src/main/java/org/apache/falcon/oozie/OozieEntityBuilder.java ---------------------------------------------------------------------- diff --git a/oozie/src/main/java/org/apache/falcon/oozie/OozieEntityBuilder.java b/oozie/src/main/java/org/apache/falcon/oozie/OozieEntityBuilder.java index a9d2f57..f00290e 100644 --- a/oozie/src/main/java/org/apache/falcon/oozie/OozieEntityBuilder.java +++ b/oozie/src/main/java/org/apache/falcon/oozie/OozieEntityBuilder.java @@ -19,7 +19,7 @@ package org.apache.falcon.oozie; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.entity.CatalogStorage; import org.apache.falcon.entity.ClusterHelper; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/oozie/src/main/java/org/apache/falcon/oozie/feed/FeedReplicationCoordinatorBuilder.java ---------------------------------------------------------------------- diff --git a/oozie/src/main/java/org/apache/falcon/oozie/feed/FeedReplicationCoordinatorBuilder.java b/oozie/src/main/java/org/apache/falcon/oozie/feed/FeedReplicationCoordinatorBuilder.java index 04aab29..de6f373 100644 --- a/oozie/src/main/java/org/apache/falcon/oozie/feed/FeedReplicationCoordinatorBuilder.java +++ b/oozie/src/main/java/org/apache/falcon/oozie/feed/FeedReplicationCoordinatorBuilder.java @@ -19,7 +19,7 @@ package org.apache.falcon.oozie.feed; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.LifeCycle; import org.apache.falcon.Tag; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/oozie/src/main/java/org/apache/falcon/oozie/process/ProcessExecutionCoordinatorBuilder.java ---------------------------------------------------------------------- diff --git a/oozie/src/main/java/org/apache/falcon/oozie/process/ProcessExecutionCoordinatorBuilder.java b/oozie/src/main/java/org/apache/falcon/oozie/process/ProcessExecutionCoordinatorBuilder.java index 0366350..60f9fe1 100644 --- a/oozie/src/main/java/org/apache/falcon/oozie/process/ProcessExecutionCoordinatorBuilder.java +++ b/oozie/src/main/java/org/apache/falcon/oozie/process/ProcessExecutionCoordinatorBuilder.java @@ -18,7 +18,7 @@ package org.apache.falcon.oozie.process; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.LifeCycle; import org.apache.falcon.Tag; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/oozie/src/main/java/org/apache/falcon/oozie/process/ProcessExecutionWorkflowBuilder.java ---------------------------------------------------------------------- diff --git a/oozie/src/main/java/org/apache/falcon/oozie/process/ProcessExecutionWorkflowBuilder.java b/oozie/src/main/java/org/apache/falcon/oozie/process/ProcessExecutionWorkflowBuilder.java index 61cc3c2..8b18ecc 100644 --- a/oozie/src/main/java/org/apache/falcon/oozie/process/ProcessExecutionWorkflowBuilder.java +++ b/oozie/src/main/java/org/apache/falcon/oozie/process/ProcessExecutionWorkflowBuilder.java @@ -18,7 +18,7 @@ package org.apache.falcon.oozie.process; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.LifeCycle; import org.apache.falcon.Tag; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/oozie/src/main/java/org/apache/falcon/service/SharedLibraryHostingService.java ---------------------------------------------------------------------- diff --git a/oozie/src/main/java/org/apache/falcon/service/SharedLibraryHostingService.java b/oozie/src/main/java/org/apache/falcon/service/SharedLibraryHostingService.java index ba87a62..b3b7bf3 100644 --- a/oozie/src/main/java/org/apache/falcon/service/SharedLibraryHostingService.java +++ b/oozie/src/main/java/org/apache/falcon/service/SharedLibraryHostingService.java @@ -18,7 +18,7 @@ package org.apache.falcon.service; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.entity.ClusterHelper; import org.apache.falcon.entity.EntityUtil; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java ---------------------------------------------------------------------- diff --git a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java b/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java index f4ffbc1..aef5ad2 100644 --- a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java +++ b/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java @@ -18,7 +18,7 @@ package org.apache.falcon.workflow.engine; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.LifeCycle; import org.apache.falcon.entity.ClusterHelper; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/oozie/src/test/java/org/apache/falcon/oozie/feed/OozieFeedWorkflowBuilderTest.java ---------------------------------------------------------------------- diff --git a/oozie/src/test/java/org/apache/falcon/oozie/feed/OozieFeedWorkflowBuilderTest.java b/oozie/src/test/java/org/apache/falcon/oozie/feed/OozieFeedWorkflowBuilderTest.java index 1c599b5..b223447 100644 --- a/oozie/src/test/java/org/apache/falcon/oozie/feed/OozieFeedWorkflowBuilderTest.java +++ b/oozie/src/test/java/org/apache/falcon/oozie/feed/OozieFeedWorkflowBuilderTest.java @@ -17,7 +17,7 @@ */ package org.apache.falcon.oozie.feed; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.Tag; import org.apache.falcon.cluster.util.EmbeddedCluster; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/oozie/src/test/java/org/apache/falcon/oozie/workflow/FalconPostProcessingTest.java ---------------------------------------------------------------------- diff --git a/oozie/src/test/java/org/apache/falcon/oozie/workflow/FalconPostProcessingTest.java b/oozie/src/test/java/org/apache/falcon/oozie/workflow/FalconPostProcessingTest.java index f08949d..1aad647 100644 --- a/oozie/src/test/java/org/apache/falcon/oozie/workflow/FalconPostProcessingTest.java +++ b/oozie/src/test/java/org/apache/falcon/oozie/workflow/FalconPostProcessingTest.java @@ -21,7 +21,7 @@ import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerService; import org.apache.falcon.workflow.FalconPostProcessing; import org.apache.falcon.workflow.WorkflowExecutionArgs; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f19e67d..a9396b5 100644 --- a/pom.xml +++ b/pom.xml @@ -464,9 +464,9 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.4</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/prism/src/main/java/org/apache/falcon/Main.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/Main.java b/prism/src/main/java/org/apache/falcon/Main.java index de9f657..96e003c 100644 --- a/prism/src/main/java/org/apache/falcon/Main.java +++ b/prism/src/main/java/org/apache/falcon/Main.java @@ -24,7 +24,7 @@ import org.apache.commons.cli.GnuParser; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.util.BuildProperties; import org.apache.falcon.util.EmbeddedServer; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java index c0df4d6..c56ecbb 100644 --- a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java +++ b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java @@ -20,7 +20,7 @@ package org.apache.falcon.resource; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.FalconRuntimException; import org.apache.falcon.FalconWebException; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java index 9630a3b..f0c4596 100644 --- a/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java +++ b/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java @@ -18,7 +18,7 @@ package org.apache.falcon.resource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.*; import org.apache.falcon.entity.EntityUtil; import org.apache.falcon.entity.FeedHelper; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/prism/src/main/java/org/apache/falcon/resource/AbstractSchedulableEntityManager.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractSchedulableEntityManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractSchedulableEntityManager.java index f7c2f61..6198c74 100644 --- a/prism/src/main/java/org/apache/falcon/resource/AbstractSchedulableEntityManager.java +++ b/prism/src/main/java/org/apache/falcon/resource/AbstractSchedulableEntityManager.java @@ -18,7 +18,7 @@ package org.apache.falcon.resource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.FalconWebException; import org.apache.falcon.Pair; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/prism/src/main/java/org/apache/falcon/resource/admin/AdminResource.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/resource/admin/AdminResource.java b/prism/src/main/java/org/apache/falcon/resource/admin/AdminResource.java index 2798534..50b668c 100644 --- a/prism/src/main/java/org/apache/falcon/resource/admin/AdminResource.java +++ b/prism/src/main/java/org/apache/falcon/resource/admin/AdminResource.java @@ -18,7 +18,7 @@ package org.apache.falcon.resource.admin; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.util.BuildProperties; import org.apache.falcon.util.DeploymentProperties; import org.apache.falcon.util.RuntimeProperties; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/prism/src/main/java/org/apache/falcon/resource/metadata/LineageMetadataResource.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/resource/metadata/LineageMetadataResource.java b/prism/src/main/java/org/apache/falcon/resource/metadata/LineageMetadataResource.java index 0c6b2b6..8fcb50f 100644 --- a/prism/src/main/java/org/apache/falcon/resource/metadata/LineageMetadataResource.java +++ b/prism/src/main/java/org/apache/falcon/resource/metadata/LineageMetadataResource.java @@ -27,7 +27,7 @@ import com.tinkerpop.blueprints.VertexQuery; import com.tinkerpop.blueprints.util.io.graphson.GraphSONMode; import com.tinkerpop.blueprints.util.io.graphson.GraphSONUtility; import com.tinkerpop.gremlin.java.GremlinPipeline; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.FalconWebException; import org.apache.falcon.entity.store.ConfigurationStore; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/prism/src/main/java/org/apache/falcon/resource/metadata/MetadataDiscoveryResource.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/resource/metadata/MetadataDiscoveryResource.java b/prism/src/main/java/org/apache/falcon/resource/metadata/MetadataDiscoveryResource.java index d709eb0..23a003a 100644 --- a/prism/src/main/java/org/apache/falcon/resource/metadata/MetadataDiscoveryResource.java +++ b/prism/src/main/java/org/apache/falcon/resource/metadata/MetadataDiscoveryResource.java @@ -24,7 +24,7 @@ import com.tinkerpop.blueprints.GraphQuery; import com.tinkerpop.blueprints.Vertex; import com.tinkerpop.blueprints.util.io.graphson.GraphSONMode; import com.tinkerpop.blueprints.util.io.graphson.GraphSONUtility; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconWebException; import org.apache.falcon.metadata.RelationshipLabel; import org.apache.falcon.metadata.RelationshipProperty; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/prism/src/main/java/org/apache/falcon/security/FalconAuthenticationFilter.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/security/FalconAuthenticationFilter.java b/prism/src/main/java/org/apache/falcon/security/FalconAuthenticationFilter.java index fa13a7d..df64b44 100644 --- a/prism/src/main/java/org/apache/falcon/security/FalconAuthenticationFilter.java +++ b/prism/src/main/java/org/apache/falcon/security/FalconAuthenticationFilter.java @@ -18,7 +18,7 @@ package org.apache.falcon.security; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.util.Servlets; import org.apache.falcon.util.StartupProperties; import org.apache.hadoop.security.UserGroupInformation; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/prism/src/main/java/org/apache/falcon/security/RemoteUserInHeaderBasedAuthenticationHandler.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/security/RemoteUserInHeaderBasedAuthenticationHandler.java b/prism/src/main/java/org/apache/falcon/security/RemoteUserInHeaderBasedAuthenticationHandler.java index 1d32e86..237b204 100644 --- a/prism/src/main/java/org/apache/falcon/security/RemoteUserInHeaderBasedAuthenticationHandler.java +++ b/prism/src/main/java/org/apache/falcon/security/RemoteUserInHeaderBasedAuthenticationHandler.java @@ -18,7 +18,7 @@ package org.apache.falcon.security; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.security.authentication.client.AuthenticationException; import org.apache.hadoop.security.authentication.server.AuthenticationToken; import org.apache.hadoop.security.authentication.server.PseudoAuthenticationHandler; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/prism/src/main/java/org/apache/falcon/util/Servlets.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/util/Servlets.java b/prism/src/main/java/org/apache/falcon/util/Servlets.java index 37766f0..664ad4c 100644 --- a/prism/src/main/java/org/apache/falcon/util/Servlets.java +++ b/prism/src/main/java/org/apache/falcon/util/Servlets.java @@ -18,7 +18,7 @@ package org.apache.falcon.util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.servlet.http.HttpServletRequest; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/prism/src/test/java/org/apache/falcon/resource/EntityManagerTest.java ---------------------------------------------------------------------- diff --git a/prism/src/test/java/org/apache/falcon/resource/EntityManagerTest.java b/prism/src/test/java/org/apache/falcon/resource/EntityManagerTest.java index 6f75111..9b0dec5 100644 --- a/prism/src/test/java/org/apache/falcon/resource/EntityManagerTest.java +++ b/prism/src/test/java/org/apache/falcon/resource/EntityManagerTest.java @@ -17,7 +17,7 @@ */ package org.apache.falcon.resource; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.FalconWebException; import org.apache.falcon.entity.store.FeedLocationStore; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/replication/src/main/java/org/apache/falcon/replication/FeedReplicator.java ---------------------------------------------------------------------- diff --git a/replication/src/main/java/org/apache/falcon/replication/FeedReplicator.java b/replication/src/main/java/org/apache/falcon/replication/FeedReplicator.java index aa58aa9..a8cc7e7 100644 --- a/replication/src/main/java/org/apache/falcon/replication/FeedReplicator.java +++ b/replication/src/main/java/org/apache/falcon/replication/FeedReplicator.java @@ -18,7 +18,7 @@ package org.apache.falcon.replication; import org.apache.commons.cli.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.falcon.FalconException; import org.apache.falcon.entity.EntityUtil; import org.apache.falcon.entity.Storage; http://git-wip-us.apache.org/repos/asf/falcon/blob/2edd402a/src/conf/startup.properties ---------------------------------------------------------------------- diff --git a/src/conf/startup.properties b/src/conf/startup.properties index 70efc9d..6bbd06e 100644 --- a/src/conf/startup.properties +++ b/src/conf/startup.properties @@ -62,7 +62,7 @@ prism.configstore.listeners=org.apache.falcon.entity.v0.EntityGraph,\ *.broker.impl.class=org.apache.activemq.ActiveMQConnectionFactory ##### List of shared libraries for Falcon workflows ##### -*.shared.libs=activemq-core,ant,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms +*.shared.libs=activemq-core,ant,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3 ##### Workflow Job Execution Completion listeners ##### *.workflow.execution.listeners=
