ATLAS-2987: Update component versions of Atlas to use Hadoop3, HBase2…

… and Solr7
atlanhq · Mar 13, 2019 · 2e1c563 · 2e1c563
1 parent 4493653
commit 2e1c563
Show file tree

Hide file tree

Showing 86 changed files with 3,548 additions and 5,722 deletions.
diff --git a/LICENSE b/LICENSE
@@ -218,6 +218,9 @@ Apache License.  For details, see 3party-licenses/janusgraph-LICENSE
 This product bundles pnotify, which is available under
 Apache License.  For details, see 3party-licenses/pnotify-LICENSE
 
+This product bundles hppc, which is available under
+Apache License.  For details, see 3party-licenses/pnotify-LICENSE
+
 This product bundles mock(for python tests) 1.0.1, which is available under
 BSD License.  For details, see 3party-licenses/mock-LICENSE
 

diff --git a/NOTICE b/NOTICE
@@ -1,22 +1,6 @@
-Apache Atlas (incubating)
+Apache Atlas
 
 Copyright [2015-2017] The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
-
-==============================================================
-
-This product bundles titan 0.5.4(https://github.com/thinkaurelius/titan/blob/titan05):
-
-==============================================================
- Titan: Distributed Graph Database
- Copyright 2012 and onwards Aurelius
-==============================================================
-Titan includes software developed by Aurelius (http://thinkaurelius.com/) and the following individuals:
-
- * Matthias Broecheler
- * Dan LaRocque
- * Marko A. Rodriguez
- * Stephen Mallette
- * Pavel Yaskevich
diff --git a/addons/falcon-bridge-shim/pom.xml b/addons/falcon-bridge-shim/pom.xml
@@ -30,10 +30,6 @@
     <name>Apache Atlas Falcon Bridge Shim</name>
     <packaging>jar</packaging>
 
-    <properties>
-        <falcon.version>0.8</falcon.version>
-    </properties>
-
     <dependencies>
         <!-- Logging -->
         <dependency>

diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml
@@ -30,10 +30,6 @@
     <name>Apache Atlas Falcon Bridge</name>
     <packaging>jar</packaging>
 
-    <properties>
-        <falcon.version>0.8</falcon.version>
-    </properties>
-
     <dependencies>
         <!-- Logging -->
         <dependency>

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
@@ -109,7 +109,7 @@ private <T extends Entity> T loadEntity(EntityType type, String resource, String
                 break;
 
             case PROCESS:
-                ((org.apache.falcon.entity.v0.process.Process) entity).setName(name);
+                ((Process) entity).setName(name);
                 break;
         }
         return (T)entity;

diff --git a/addons/hbase-bridge-shim/pom.xml b/addons/hbase-bridge-shim/pom.xml
@@ -46,6 +46,10 @@
                     <groupId>javax.servlet</groupId>
                     <artifactId>servlet-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>