ATLAS-689 Migrate Atlas-Storm integration to use Storm 1.0 dependencies. (svimal2106 via yhemanth)

addons/storm-bridge/pom.xml

@@ -30,7 +30,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <storm.version>0.10.0.2.3.99.0-195</storm.version>
+        <storm.version>1.0.0</storm.version>
         <hive.version>1.2.1</hive.version>
     </properties>
 

addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormAtlasHook.java

@@ -18,12 +18,12 @@
 
 package org.apache.atlas.storm.hook;
 
-import backtype.storm.ISubmitterHook;
-import backtype.storm.generated.Bolt;
-import backtype.storm.generated.SpoutSpec;
-import backtype.storm.generated.StormTopology;
-import backtype.storm.generated.TopologyInfo;
-import backtype.storm.utils.Utils;
+import org.apache.storm.ISubmitterHook;
+import org.apache.storm.generated.Bolt;
+import org.apache.storm.generated.SpoutSpec;
+import org.apache.storm.generated.StormTopology;
+import org.apache.storm.generated.TopologyInfo;
+import org.apache.storm.utils.Utils;
 import org.apache.atlas.AtlasClient;
 import org.apache.atlas.AtlasConstants;
 import org.apache.atlas.fs.model.FSDataTypes;

addons/storm-bridge/src/main/java/org/apache/atlas/storm/hook/StormTopologyUtil.java

@@ -18,10 +18,10 @@
 
 package org.apache.atlas.storm.hook;
 
-import backtype.storm.generated.Bolt;
-import backtype.storm.generated.GlobalStreamId;
-import backtype.storm.generated.Grouping;
-import backtype.storm.generated.StormTopology;
+import org.apache.storm.generated.Bolt;
+import org.apache.storm.generated.GlobalStreamId;
+import org.apache.storm.generated.Grouping;
+import org.apache.storm.generated.StormTopology;
 import com.google.common.base.Joiner;
 import org.slf4j.Logger;
 

addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java

@@ -18,8 +18,6 @@
 
 package org.apache.atlas.storm.hook;
 
-import backtype.storm.ILocalCluster;
-import backtype.storm.generated.StormTopology;
 import com.sun.jersey.api.client.ClientResponse;
 import org.apache.atlas.ApplicationProperties;
 import org.apache.atlas.AtlasClient;
@@ -33,6 +31,8 @@ import org.apache.atlas.typesystem.Referenceable;
 import org.apache.atlas.typesystem.TypesDef;
 import org.apache.atlas.typesystem.json.TypesSerialization;
 import org.apache.commons.configuration.Configuration;
+import org.apache.storm.ILocalCluster;
+import org.apache.storm.generated.StormTopology;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONObject;
 import org.slf4j.Logger;

addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormTestUtil.java

@@ -18,15 +18,15 @@
 
 package org.apache.atlas.storm.hook;
 
-import backtype.storm.Config;
-import backtype.storm.ILocalCluster;
-import backtype.storm.Testing;
-import backtype.storm.generated.StormTopology;
-import backtype.storm.testing.TestGlobalCount;
-import backtype.storm.testing.TestWordCounter;
-import backtype.storm.testing.TestWordSpout;
-import backtype.storm.topology.TopologyBuilder;
-import backtype.storm.utils.Utils;
+import org.apache.storm.Config;
+import org.apache.storm.ILocalCluster;
+import org.apache.storm.Testing;
+import org.apache.storm.generated.StormTopology;
+import org.apache.storm.testing.TestGlobalCount;
+import org.apache.storm.testing.TestWordCounter;
+import org.apache.storm.testing.TestWordSpout;
+import org.apache.storm.topology.TopologyBuilder;
+import org.apache.storm.utils.Utils;
 
 import java.util.HashMap;
 
@@ -58,6 +58,7 @@ final class StormTestUtil {
                                         StormTopology stormTopology) throws Exception {
         Config stormConf = new Config();
         stormConf.putAll(Utils.readDefaultConfig());
+        stormConf.put("storm.cluster.mode", "local");
         stormConf.setDebug(true);
         stormConf.setMaxTaskParallelism(3);
         stormConf.put(Config.STORM_TOPOLOGY_SUBMISSION_NOTIFIER_PLUGIN,

release-log.txt

@@ -20,6 +20,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
 ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
 
 ALL CHANGES:
+ATLAS-689 Migrate Atlas-Storm integration to use Storm 1.0 dependencies. (svimal2106 via yhemanth)
 ATLAS-754 InstanceSerialization does not serialize Reference in the values array of Reference.(harishjp via sumasai)
 ATLAS-626 Hive temporary table metadata is captured in atlas (sumasai)
 ATLAS-747 Hive CTAS entity registration fails because userName is null (shwethags)