From 7cd0d95e755d2b194a56994c1f98a9059cca69d8 Mon Sep 17 00:00:00 2001
From: Zach Kimberg <kimbergz@amazon.com>
Date: Thu, 25 Jul 2019 14:09:56 -0700
Subject: [PATCH] Bump Scala version to 1.6

Fix API deprecation versions
---
 .../src/main/scala/org/apache/mxnet/NDArray.scala    |  2 +-
 .../scala/org/apache/mxnet/NDArrayCollector.scala    | 12 ++++++------
 scala-package/pom.xml                                |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scala-package/core/src/main/scala/org/apache/mxnet/NDArray.scala b/scala-package/core/src/main/scala/org/apache/mxnet/NDArray.scala
index d55ed961d7ea..717120bcf984 100644
--- a/scala-package/core/src/main/scala/org/apache/mxnet/NDArray.scala
+++ b/scala-package/core/src/main/scala/org/apache/mxnet/NDArray.scala
@@ -756,7 +756,7 @@ object NDArray extends NDArrayBase {
 class NDArray private[mxnet](private[mxnet] val handle: NDArrayHandle,
                              val writable: Boolean) extends NativeResource {
 
-  @deprecated("Please use ResourceScope instead", "1.6.0")
+  @deprecated("Please use ResourceScope instead", "1.5.0")
   def this(handle: NDArrayHandle,
            writable: Boolean = true,
            addToCollector: Boolean = true) {
diff --git a/scala-package/core/src/main/scala/org/apache/mxnet/NDArrayCollector.scala b/scala-package/core/src/main/scala/org/apache/mxnet/NDArrayCollector.scala
index 5fa0aa5303b6..0761481cdfe8 100644
--- a/scala-package/core/src/main/scala/org/apache/mxnet/NDArrayCollector.scala
+++ b/scala-package/core/src/main/scala/org/apache/mxnet/NDArrayCollector.scala
@@ -64,7 +64,7 @@ import scala.collection.mutable
  *  });
  *  </pre>
  */
-@deprecated("Please use ResourceScope instead", "1.6.0")
+@deprecated("Please use ResourceScope instead", "1.5.0")
 object NDArrayCollector {
   private val logger = LoggerFactory.getLogger(classOf[NDArrayCollector])
 
@@ -76,14 +76,14 @@ object NDArrayCollector {
    * Create a collector which will dispose the collected NDArrays automatically.
    * @return an auto-disposable collector.
    */
-  @deprecated("Please use ResourceScope instead", "1.6.0")
+  @deprecated("Please use ResourceScope instead", "1.5.0")
   def auto(): NDArrayCollector = new NDArrayCollector(true)
 
   /**
    * Create a collector allows users to later dispose the collected NDArray manually.
    * @return a manually-disposable collector.
    */
-  @deprecated("Please use ResourceScope instead", "1.6.0")
+  @deprecated("Please use ResourceScope instead", "1.5.0")
   @Experimental
   def manual(): NDArrayCollector = new NDArrayCollector(false)
 
@@ -91,13 +91,13 @@ object NDArrayCollector {
    * Collect the NDArrays into the collector of the current thread.
    * @param ndArray NDArrays need to be collected.
    */
-  @deprecated("Please use ResourceScope instead", "1.6.0")
+  @deprecated("Please use ResourceScope instead", "1.5.0")
   @varargs def collect(ndArray: NDArray*): Unit = {
     currCollector.get().add(ndArray: _*)
   }
 }
 
-@deprecated("Please use ResourceScope instead", "1.6.0")
+@deprecated("Please use ResourceScope instead", "1.5.0")
 class NDArrayCollector private(private val autoDispose: Boolean = true,
                                private val doCollect: Boolean = true) {
   // native ptr (handle) of the NDArray -> NDArray
@@ -147,7 +147,7 @@ class NDArrayCollector private(private val autoDispose: Boolean = true,
    * @return The result of function <em>codeBlock</em>.
    */
   @Experimental
-  @deprecated("Please use ResourceScope instead", "1.6.0")
+  @deprecated("Please use ResourceScope instead", "1.5.0")
   def withScope[T](codeBlock: => T): T = {
     val old = NDArrayCollector.currCollector.get()
     NDArrayCollector.currCollector.set(this)
diff --git a/scala-package/pom.xml b/scala-package/pom.xml
index 147d7615a380..e1887d7c343b 100644
--- a/scala-package/pom.xml
+++ b/scala-package/pom.xml
@@ -57,7 +57,7 @@
     <scala.version>2.11.8</scala.version>
     <build.platform/>
     <scala.binary.version>2.11</scala.binary.version>
-    <base.revision>1.5.0</base.revision>
+    <base.revision>1.6.0</base.revision>
     <build.platform />
     <cxx>g++</cxx>
     <dollar>$</dollar>