From 34151f397daa7f076b323def3b1deec030d45636 Mon Sep 17 00:00:00 2001
From: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
Date: Sun, 30 Oct 2016 14:12:28 +0100
Subject: [PATCH] [scala] Upgrade Scala to 2.12.0

---
 pom.xml                                                         | 2 +-
 .../src/main/scala/org/wicketstuff/scala/model/Fodel.scala      | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index e1e4db7517..19b92da9d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -269,7 +269,7 @@
 		<spring.version>4.3.1.RELEASE</spring.version>
 		<cglib.version>3.2.4</cglib.version>
 		<objenesis.version>2.4</objenesis.version>
-		<scala.version>2.12.0-M5</scala.version>
+		<scala.version>2.12.0</scala.version>
 	</properties>
 
 	<prerequisites>
diff --git a/scala-extensions-parent/wicket-scala/src/main/scala/org/wicketstuff/scala/model/Fodel.scala b/scala-extensions-parent/wicket-scala/src/main/scala/org/wicketstuff/scala/model/Fodel.scala
index 593e6f3cc2..07c4702a47 100644
--- a/scala-extensions-parent/wicket-scala/src/main/scala/org/wicketstuff/scala/model/Fodel.scala
+++ b/scala-extensions-parent/wicket-scala/src/main/scala/org/wicketstuff/scala/model/Fodel.scala
@@ -40,8 +40,6 @@ class Fodel[T](getter: ⇒ T,
       throw new UnsupportedOperationException( "You cannot set the object on a readonly model.")
   	setter(value)
   }
-
-  def detach = ()
 }
 
 /**