You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/03 15:31:41 UTC
svn commit: r1607643 - in /tomee/tomee/trunk/examples/scala-basic: ./
build.sbt pom.xml
Author: andygumbrecht
Date: Thu Jul 3 13:31:40 2014
New Revision: 1607643
URL: http://svn.apache.org/r1607643
Log:
Update scala
Modified:
tomee/tomee/trunk/examples/scala-basic/ (props changed)
tomee/tomee/trunk/examples/scala-basic/build.sbt
tomee/tomee/trunk/examples/scala-basic/pom.xml
Propchange: tomee/tomee/trunk/examples/scala-basic/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 3 13:31:40 2014
@@ -1,2 +1,3 @@
target
*.iml
+.idea
Modified: tomee/tomee/trunk/examples/scala-basic/build.sbt
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/scala-basic/build.sbt?rev=1607643&r1=1607642&r2=1607643&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/scala-basic/build.sbt (original)
+++ tomee/tomee/trunk/examples/scala-basic/build.sbt Thu Jul 3 13:31:40 2014
@@ -19,7 +19,7 @@ name := "scala-basic"
version := "1.1.0-SNAPSHOT"
-scalaVersion := "2.9.1"
+scalaVersion := "2.11.1"
resolvers ++= Seq(
"Local Maven Repository" at "file://" + Path.userHome.absolutePath + "/.m2/repository",
@@ -27,8 +27,8 @@ resolvers ++= Seq(
)
libraryDependencies ++= Seq(
- "org.apache.openejb" % "javaee-api" % "6.0-4",
- "org.apache.openejb" % "openejb-core" % "4.5.1-SNAPSHOT" % "test",
+ "org.apache.openejb" % "javaee-api" % "6.0-6",
+ "org.apache.openejb" % "openejb-core" % "5.0.0-SNAPSHOT" % "test",
"org.scalatest" %% "scalatest" % "1.6.1" % "test"
)
Modified: tomee/tomee/trunk/examples/scala-basic/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/scala-basic/pom.xml?rev=1607643&r1=1607642&r2=1607643&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/scala-basic/pom.xml (original)
+++ tomee/tomee/trunk/examples/scala-basic/pom.xml Thu Jul 3 13:31:40 2014
@@ -29,7 +29,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <scala.version>2.9.1</scala.version>
+ <!--<scala.version>2.9.1</scala.version>-->
+ <scala.version>2.11</scala.version>
</properties>
<repositories>
@@ -51,7 +52,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.1.6</version>
<executions>
<execution>
<goals>
@@ -68,8 +69,8 @@
<!-- disable surefire because we use scalatest -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.17</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
@@ -78,7 +79,7 @@
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
- <version>1.0-M2</version>
+ <version>1.0</version>
<configuration>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<junitxml>.</junitxml>
@@ -108,12 +109,12 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
+ <version>${scala.version}.1</version>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.version}</artifactId>
- <version>2.0.M4</version>
+ <version>2.2.0</version>
<scope>test</scope>
</dependency>