2.10 deprecations are 2.11 removals.

Author: christophercurrie

.gitignore

@@ -28,3 +28,6 @@ logs
 
 # SBT
 /.history
+
+# snapshots
+sonatype.sbt

build.sbt

@@ -26,7 +26,7 @@ libraryDependencies ++= Seq(
     "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.3.1" % "test",
     "com.fasterxml.jackson.datatype" % "jackson-datatype-guava" % "2.3.1" % "test",
     "com.fasterxml.jackson.module" % "jackson-module-jsonSchema" % "2.3.1" % "test",
-    "org.scalatest" %% "scalatest" % "2.1.0" % "test",
+    "org.scalatest" %% "scalatest" % "2.1.2" % "test",
     "junit" % "junit" % "4.11" % "test",
     "com.novocode" % "junit-interface" % "0.10" % "test"
 )

sonatype.sbt

@@ -1,6 +1,6 @@
 package com.fasterxml.jackson.module.scala
 
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 /**
  */

src/test/scala/com/fasterxml/jackson/module/scala/EnumContainer.scala

@@ -5,7 +5,6 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.matchers.ShouldMatchers
 import reflect.NameTransformer
-import java.lang.reflect.Modifier
 
 class PlainCtorBean(`field-name`: Int)
 {
@@ -27,7 +26,7 @@ class MethodBean
 
 //adding @SerialVersionUID puts a public static final int field on the generated class
 //this field should be ignored
-@SerialVersionUID(uid = 8675309)
+@SerialVersionUID(8675309)
 case class SerialIDBean(field: String) {
   @transient val shouldBeExluded = 10
   @volatile var alsoExcluded = 20

src/test/scala/com/fasterxml/jackson/module/scala/introspect/BeanIntrospectorTest.scala

@@ -3,16 +3,13 @@ package com.fasterxml.jackson.module.scala.introspect
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.fixture.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
-import com.fasterxml.jackson.core.Version
-import com.fasterxml.jackson.databind.{Module, ObjectMapper}
-import com.fasterxml.jackson.databind.Module.SetupContext
+import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.module.scala.JacksonModule
 import com.fasterxml.jackson.module.scala.deser.ScalaValueInstantiatorsModule
 import scala.volatile
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException
-import scala.reflect.{BeanProperty, BeanInfo}
+import scala.beans.{BeanProperty, BeanInfo}
 import org.scalatest.{Outcome, Succeeded, Matchers}
 
 class Fields {
@@ -32,7 +29,7 @@ class Methods {
 
 case class Constructors(plainField: Int = 0)
 
-@SerialVersionUID(uid = 8675309)
+@SerialVersionUID(8675309)
 case class SerialID(firstField: String, secondField: Int) {
   @transient var excluded = 10
   @volatile var alsoExcluded = "no"

src/test/scala/com/fasterxml/jackson/module/scala/introspect/TestPropertiesCollector.scala

@@ -2,14 +2,12 @@ package com.fasterxml.jackson.module.scala.ser
 
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
-import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
 
-import com.fasterxml.jackson.module.scala.{DefaultScalaModule, JacksonModule}
+import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.fasterxml.jackson.annotation._
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.PropertyNamingStrategy
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 case class ConstructorTestCaseClass(intValue: Int, stringValue: String)
 

src/test/scala/com/fasterxml/jackson/module/scala/ser/CaseClassSerializerTest.scala

@@ -1,21 +1,18 @@
 package com.fasterxml.jackson.module.scala.ser
 
 import org.junit.runner.RunWith
-import org.scalatest.matchers.ShouldMatchers
-import org.scalatest.FlatSpec
 import org.scalatest.junit.JUnitRunner
 
 import scala.collection._
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo, JsonInclude, JsonProperty}
 import com.fasterxml.jackson.annotation.JsonTypeInfo.{As, Id}
 import scala.collection.immutable.ListMap
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
-import annotation.target.getter
+import annotation.meta.getter
 import com.fasterxml.jackson.databind.{SerializerProvider, JsonSerializer}
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
-import com.google.common.collect.ImmutableMap
 
 class BeanieWeenie(@BeanProperty @JsonProperty("a") var a: Int,
                    @BeanProperty @JsonProperty("b") var b: String, 

src/test/scala/com/fasterxml/jackson/module/scala/ser/MapSerializerTest.scala

@@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.{PropertyNamingStrategy, ObjectMapper}
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import java.io.ByteArrayOutputStream
 import com.google.common.base.Optional
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 import javax.annotation.Nonnull
 
 class PojoWrittenInScala {

src/test/scala/com/fasterxml/jackson/module/scala/ser/NamingStrategyTest.scala

@@ -1,12 +1,10 @@
 package com.fasterxml.jackson.module.scala.ser
 
-import org.scalatest.FlatSpec
-import org.scalatest.matchers.ShouldMatchers
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.fasterxml.jackson.annotation._
-import scala.annotation.target.{field, getter}
+import scala.annotation.meta.{field, getter}
 import com.fasterxml.jackson.module.jsonSchema.factories.SchemaFactoryWrapper
 import com.fasterxml.jackson.module.scala.experimental.{ScalaObjectMapper, RequiredPropertiesSchemaModule}
 import com.fasterxml.jackson.databind.{ObjectMapper, JsonNode}

src/test/scala/com/fasterxml/jackson/module/scala/ser/OptionSerializerTest.scala

@@ -3,11 +3,9 @@ package com.fasterxml.jackson.module.scala.ser
 import com.fasterxml.jackson.databind.Module
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.fasterxml.jackson.annotation.JsonValue
-import org.scalatest.matchers.ShouldMatchers
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
-import org.scalatest.FlatSpec
-import scala.annotation.target.getter
+import scala.annotation.meta.getter
 
 object TestJsonValue
 {