Merge remote-tracking branch 'upstream/release-2.5' into release-2.5

odpi · Dec 16, 2020 · ae821d0 · ae821d0
2 parents be1d98c + 219142a
commit ae821d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/apache-atlas-adapter/src/main/resources/TypeDefMappings.json b/apache-atlas-adapter/src/main/resources/TypeDefMappings.json
@@ -1,4 +1,7 @@
 [
+  {
+    "omrs": "OpenMetadataRoot"
+  },
   {
     "atlas": "Referenceable",
     "omrs": "Referenceable",

diff --git a/pom.xml b/pom.xml
@@ -107,7 +107,7 @@
         <mock-server.version>5.11.2</mock-server.version>
         <sleepycat.version>18.3.12</sleepycat.version>
         <rhino.version>1.7.13</rhino.version>
-        <nimbus.version>9.1.5</nimbus.version>
+        <nimbus.version>9.2</nimbus.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <httpclient.version>4.5.13</httpclient.version>
         <kafka.version>2.4.1</kafka.version>