Upgrade to mybatis 3.2.3, scala 2.10.3, eclipse plugin 2.4.0

mnesarco · mnesarco · commit 2dd96d04a035 · 2013-11-04T11:24:42.000-05:00
diff --git a/mybatis-scala-core/pom.xml b/mybatis-scala-core/pom.xml
@@ -29,14 +29,14 @@
 
   <properties>
     <scala.binary>2.10</scala.binary>
-    <scala.version>${scala.binary}.0</scala.version>
+    <scala.version>${scala.binary}.3</scala.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.mybatis</groupId>
       <artifactId>mybatis</artifactId>
-      <version>3.2.1</version>
+      <version>3.2.3</version>
     </dependency>
     <dependency>
       <groupId>org.scala-lang</groupId>
diff --git a/mybatis-scala-core/project/Build.scala b/mybatis-scala-core/project/Build.scala
@@ -4,10 +4,10 @@ import Keys._
 object BuildSettings {
   val buildSettings = Defaults.defaultSettings ++ Seq (
     organization := "org.mybatis.scala",
-    version      := "1.0.1",
-    scalaVersion := "2.10.0"
+    version      := "1.0.2",
+    scalaVersion := "2.10.3"
   )
-  val mybatisVersion = "3.2.1"
+  val mybatisVersion = "3.2.3"
 }
 
 object Resolvers {
diff --git a/mybatis-scala-core/project/plugins.sbt b/mybatis-scala-core/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.0.0")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0")
diff --git a/mybatis-scala-samples/pom.xml b/mybatis-scala-samples/pom.xml
@@ -29,7 +29,7 @@
 
   <properties>
     <scala.binary>2.10</scala.binary>
-    <scala.version>${scala.binary}.0</scala.version>
+    <scala.version>${scala.binary}.3</scala.version>
   </properties>
 
   <dependencies>
diff --git a/mybatis-scala-samples/project/Build.scala b/mybatis-scala-samples/project/Build.scala
@@ -4,10 +4,10 @@ import Keys._
 object BuildSettings {
   val buildSettings = Defaults.defaultSettings ++ Seq (
     organization := "org.mybatis.scala",
-    version      := "1.0.1",
-    scalaVersion := "2.10.0"
+    version      := "1.0.2",
+    scalaVersion := "2.10.3"
   )
-  val mybatisVersion = "3.2.1"
+  val mybatisVersion = "3.2.3"
 }
 
 object Resolvers {
@@ -16,7 +16,7 @@ object Resolvers {
 }
 
 object Dependencies {
-  val mybatis = "org.mybatis.scala" %% "mybatis-scala-core" % "1.0.1"
+  val mybatis = "org.mybatis.scala" %% "mybatis-scala-core" % "1.0.2"
   val hsqldb = "org.hsqldb" % "hsqldb" % "2.2.8"
 }
 
diff --git a/mybatis-scala-samples/project/plugins.sbt b/mybatis-scala-samples/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.0.0")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0")
diff --git a/project/Build.scala b/project/Build.scala
@@ -4,10 +4,10 @@ import Keys._
 object BuildSettings {
   val buildSettings = Defaults.defaultSettings ++ Seq (
     organization := "org.mybatis.scala",
-    version      := "1.0.1",
-    scalaVersion := "2.10.0"
+    version      := "1.0.2",
+    scalaVersion := "2.10.3"
   )
-  val mybatisVersion = "3.2.1"
+  val mybatisVersion = "3.2.3"
 }
 
 object Resolvers {
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.0.0")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0")

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@ import Keys._`
`4`	`4`	`object BuildSettings {`
`5`	`5`	`val buildSettings = Defaults.defaultSettings ++ Seq (`
`6`	`6`	`organization := "org.mybatis.scala",`
`7`		`- version := "1.0.1",`
`8`		`- scalaVersion := "2.10.0"`
	`7`	`+ version := "1.0.2",`
	`8`	`+ scalaVersion := "2.10.3"`
`9`	`9`	`)`
`10`		`- val mybatisVersion = "3.2.1"`
	`10`	`+ val mybatisVersion = "3.2.3"`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`object Resolvers {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.0.0")`
	`1`	`+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0")`