Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Upgrade to scala 2.10
git-svn-id: https://svn.apache.org/repos/asf/activemq/activemq-apollo/trunk@1425468 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
chirino committed Dec 23, 2012
1 parent 3d1fa24 commit c4d01135d76a720ebbd05dcfb59692824e789f72
Show file tree
Hide file tree
Showing 16 changed files with 51 additions and 61 deletions.
@@ -130,8 +130,7 @@
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.9.2
</artifactId>
<artifactId>scalatest_${scala-version}</artifactId>
<version>${scalatest-version}</version>
<scope>test</scope>
</dependency>
@@ -200,7 +199,7 @@

<plugin>
<groupId>org.fusesource.scalate</groupId>
<artifactId>maven-scalate-plugin</artifactId>
<artifactId>maven-scalate-plugin_2.10</artifactId>
<version>${scalate-version}</version>
<executions>
<execution>
@@ -73,8 +73,7 @@
<!-- Testing Dependencies -->
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.9.2
</artifactId>
<artifactId>scalatest_${scala-version}</artifactId>
<version>${scalatest-version}</version>
<scope>test</scope>
</dependency>
@@ -133,7 +132,7 @@

<plugin>
<groupId>org.fusesource.scalate</groupId>
<artifactId>maven-scalate-plugin</artifactId>
<artifactId>maven-scalate-plugin_2.10</artifactId>
<version>${scalate-version}</version>
<executions>
<execution>
@@ -123,8 +123,7 @@
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.9.2
</artifactId>
<artifactId>scalatest_${scala-version}</artifactId>
<version>${scalatest-version}</version>
<scope>test</scope>
</dependency>
@@ -105,8 +105,7 @@
<!-- Testing Dependencies -->
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.9.2
</artifactId>
<artifactId>scalatest_${scala-version}</artifactId>
<version>${scalatest-version}</version>
<scope>test</scope>
</dependency>
@@ -64,14 +64,14 @@
<include>com.sun.jersey:jersey-server</include>
<include>com.sun.jersey:jersey-core</include>
<include>asm:asm</include>
<include>org.fusesource.scalate:scalate-core</include>
<include>org.fusesource.scalate:scalate-util</include>
<include>org.fusesource.scalate:scalate-core_2.10</include>
<include>org.fusesource.scalate:scalate-util_2.10</include>
<include>net.sf.josql:josql</include>
<include>net.sf.josql:gentlyweb-utils</include>

<include>com.wordnik:swagger-jaxrs_2.9.1</include>
<include>com.wordnik:swagger-core_2.9.1</include>
<include>com.wordnik:swagger-annotations_2.9.1</include>
<include>com.wordnik:swagger-jaxrs_2.10.0-RC5</include>
<include>com.wordnik:swagger-core_2.10.0-RC5</include>
<include>com.wordnik:swagger-annotations_2.10.0-RC5</include>
<include>com.fasterxml.jackson.module:jackson-module-scala</include>

<!-- for JMX over REST support -->
@@ -73,7 +73,7 @@
<!-- Testing Dependencies -->
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.9.2</artifactId>
<artifactId>scalatest_${scala-version}</artifactId>
<version>${scalatest-version}</version>
<scope>test</scope>
</dependency>
@@ -132,7 +132,7 @@

<plugin>
<groupId>org.fusesource.scalate</groupId>
<artifactId>maven-scalate-plugin</artifactId>
<artifactId>maven-scalate-plugin_2.10</artifactId>
<version>${scalate-version}</version>
<executions>
<execution>
@@ -123,8 +123,7 @@
<!-- Testing Dependencies -->
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.9.2
</artifactId>
<artifactId>scalatest_${scala-version}</artifactId>
<version>${scalatest-version}</version>
<scope>test</scope>
</dependency>
@@ -183,7 +182,7 @@

<plugin>
<groupId>org.fusesource.scalate</groupId>
<artifactId>maven-scalate-plugin</artifactId>
<artifactId>maven-scalate-plugin_2.10</artifactId>
<version>${scalate-version}</version>
<executions>
<execution>
@@ -120,8 +120,7 @@
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.9.2
</artifactId>
<artifactId>scalatest_${scala-version}</artifactId>
<version>${scalatest-version}</version>
<scope>test</scope>
</dependency>
@@ -151,7 +150,7 @@

<plugin>
<groupId>org.fusesource.scalate</groupId>
<artifactId>maven-scalate-plugin</artifactId>
<artifactId>maven-scalate-plugin_2.10</artifactId>
<version>${scalate-version}</version>
<executions>
<execution>
@@ -83,8 +83,7 @@
<!-- Testing Dependencies -->
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.9.2
</artifactId>
<artifactId>scalatest_${scala-version}</artifactId>
<version>${scalatest-version}</version>
<scope>test</scope>
</dependency>
@@ -118,8 +118,7 @@
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.9.2
</artifactId>
<artifactId>scalatest_${scala-version}</artifactId>
<version>${scalatest-version}</version>
<scope>test</scope>
</dependency>
@@ -185,7 +184,7 @@

<plugin>
<groupId>org.fusesource.scalate</groupId>
<artifactId>maven-scalate-plugin</artifactId>
<artifactId>maven-scalate-plugin_2.10</artifactId>
<version>${scalate-version}</version>
<executions>
<execution>
@@ -75,9 +75,9 @@
<plugins>

<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>${maven-scala-plugin-version}</version>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>${scala-plugin-version}</version>
<executions>
<execution>
<id>compile</id>
@@ -97,7 +97,7 @@
<compilerPlugin>
<groupId>org.fusesource.jvmassert</groupId>
<artifactId>jvmassert</artifactId>
<version>1.3</version>
<version>1.4</version>
</compilerPlugin>
</compilerPlugins>
</configuration>
@@ -120,7 +120,7 @@
<compilerPlugin>
<groupId>org.fusesource.jvmassert</groupId>
<artifactId>jvmassert</artifactId>
<version>1.3</version>
<version>1.4</version>
</compilerPlugin>
</compilerPlugins>
</configuration>
@@ -167,9 +167,9 @@
<build>
<plugins>
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>${maven-scala-plugin-version}</version>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>${scala-plugin-version}</version>
<configuration>
<args>
<arg>-deprecation</arg>
@@ -178,7 +178,7 @@
<compilerPlugin>
<groupId>org.fusesource.jvmassert</groupId>
<artifactId>jvmassert</artifactId>
<version>1.3</version>
<version>1.4</version>
</compilerPlugin>
</compilerPlugins>
</configuration>
@@ -104,8 +104,7 @@
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.9.2
</artifactId>
<artifactId>scalatest_${scala-version}</artifactId>
<version>${scalatest-version}</version>
<scope>test</scope>
</dependency>
@@ -174,7 +173,7 @@

<plugin>
<groupId>org.fusesource.scalate</groupId>
<artifactId>maven-scalate-plugin</artifactId>
<artifactId>maven-scalate-plugin_2.10</artifactId>
<version>${scalate-version}</version>
<executions>
<execution>
@@ -112,8 +112,7 @@
<!-- Testing Dependencies -->
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.9.2
</artifactId>
<artifactId>scalatest_${scala-version}</artifactId>
<version>${scalatest-version}</version>
<scope>test</scope>
</dependency>
@@ -50,7 +50,7 @@
<!-- Web Framework APIs -->
<dependency>
<groupId>org.fusesource.scalate</groupId>
<artifactId>scalate-core</artifactId>
<artifactId>scalate-core_2.10</artifactId>
<version>${scalate-version}</version>
</dependency>
<dependency>
@@ -66,7 +66,7 @@

<dependency>
<groupId>com.wordnik</groupId>
<artifactId>swagger-jaxrs_2.9.1</artifactId>
<artifactId>swagger-jaxrs_2.10.0-RC5</artifactId>
<version>${swagger-version}</version>
<exclusions>
<exclusion>
@@ -106,7 +106,7 @@
<!-- Testing -->
<dependency>
<groupId>org.fusesource.scalate</groupId>
<artifactId>scalate-test</artifactId>
<artifactId>scalate-test_2.10</artifactId>
<version>${scalate-version}</version>
<scope>test</scope>
<exclusions>
@@ -153,8 +153,7 @@
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.9.2
</artifactId>
<artifactId>scalatest_${scala-version}</artifactId>
<version>${scalatest-version}</version>
<scope>test</scope>
</dependency>
@@ -234,7 +233,7 @@

<plugin>
<groupId>org.fusesource.scalate</groupId>
<artifactId>maven-scalate-plugin</artifactId>
<artifactId>maven-scalate-plugin_2.10</artifactId>
<version>${scalate-version}</version>
<executions>
<execution>
@@ -40,17 +40,17 @@

<dependency>
<groupId>org.fusesource.scalate</groupId>
<artifactId>scalate-wikitext</artifactId>
<artifactId>scalate-wikitext_2.10</artifactId>
<version>${scalate-version}</version>
</dependency>
<dependency>
<groupId>org.fusesource.scalate</groupId>
<artifactId>scalate-page</artifactId>
<artifactId>scalate-page_2.10</artifactId>
<version>${scalate-version}</version>
</dependency>
<dependency>
<groupId>org.fusesource.scalamd</groupId>
<artifactId>scalamd</artifactId>
<artifactId>scalamd_2.10</artifactId>
<version>${scalamd-version}</version>
</dependency>
<dependency>
@@ -62,7 +62,7 @@
<!-- testing -->
<dependency>
<groupId>org.fusesource.scalate</groupId>
<artifactId>scalate-test</artifactId>
<artifactId>scalate-test_2.10</artifactId>
<version>${scalate-version}</version>
<scope>test</scope>
</dependency>
@@ -87,9 +87,9 @@
</plugin>

<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>${maven-scala-plugin-version}</version>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>${scala-plugin-version}</version>
<executions>
<execution>
<goals>
@@ -127,7 +127,7 @@

<plugin>
<groupId>org.fusesource.scalate</groupId>
<artifactId>maven-scalate-plugin</artifactId>
<artifactId>maven-scalate-plugin_2.10</artifactId>
<version>${scalate-version}</version>

<configuration>
@@ -299,7 +299,7 @@
<plugins>
<plugin>
<groupId>org.fusesource.scalate</groupId>
<artifactId>maven-scalate-plugin</artifactId>
<artifactId>maven-scalate-plugin_2.10</artifactId>
<version>${scalate-version}</version>

<executions>
@@ -40,7 +40,7 @@
<projectName>Apache Apollo</projectName>

<!-- dependencies that track scala version changes -->
<scala-version>2.9.2</scala-version>
<scala-version>2.10.0</scala-version>
<scalatest-version>1.8</scalatest-version>

<activemq-version>5.7.0</activemq-version>
@@ -109,8 +109,8 @@

<jasypt-version>1.6</jasypt-version>

<scalate-version>1.5.3</scalate-version>
<scalamd-version>1.5</scalamd-version>
<scalate-version>1.6.0-SNAPSHOT</scalate-version>
<scalamd-version>1.6-SNAPSHOT</scalamd-version>

<servlet-api-version>3.0.0.v201112011016</servlet-api-version>
<jackson-version>2.1.0</jackson-version>
@@ -123,7 +123,8 @@
<selenium-version>2.25.0</selenium-version>

<!-- maven plugin versions -->
<maven-scala-plugin-version>2.15.2</maven-scala-plugin-version>

<scala-plugin-version>3.1.0</scala-plugin-version>
<maven-surefire-plugin-version>2.12</maven-surefire-plugin-version>
<jetty-plugin-version>7.0.1.v20091125</jetty-plugin-version>

0 comments on commit c4d0113

Please sign in to comment.