activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1425468 - in /activemq/activemq-apollo/trunk: ./ apollo-amqp/ apollo-bdb/ apollo-broker/ apollo-cli/ apollo-distro/src/main/descriptors/ apollo-jmx/ apollo-leveldb/ apollo-mqtt/ apollo-network/ apollo-openwire/ apollo-scala/ apollo-stomp/ ...
Date Sun, 23 Dec 2012 14:19:13 GMT
Author: chirino
Date: Sun Dec 23 14:19:12 2012
New Revision: 1425468

URL: http://svn.apache.org/viewvc?rev=1425468&view=rev
Log:
Upgrade to scala 2.10

Modified:
    activemq/activemq-apollo/trunk/apollo-amqp/pom.xml
    activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
    activemq/activemq-apollo/trunk/apollo-broker/pom.xml
    activemq/activemq-apollo/trunk/apollo-cli/pom.xml
    activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml
    activemq/activemq-apollo/trunk/apollo-jmx/pom.xml
    activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml
    activemq/activemq-apollo/trunk/apollo-mqtt/pom.xml
    activemq/activemq-apollo/trunk/apollo-network/pom.xml
    activemq/activemq-apollo/trunk/apollo-openwire/pom.xml
    activemq/activemq-apollo/trunk/apollo-scala/pom.xml
    activemq/activemq-apollo/trunk/apollo-stomp/pom.xml
    activemq/activemq-apollo/trunk/apollo-util/pom.xml
    activemq/activemq-apollo/trunk/apollo-web/pom.xml
    activemq/activemq-apollo/trunk/apollo-website/pom.xml
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-amqp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-amqp/pom.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-amqp/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-amqp/pom.xml Sun Dec 23 14:19:12 2012
@@ -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>

Modified: activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/pom.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/pom.xml Sun Dec 23 14:19:12 2012
@@ -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>

Modified: activemq/activemq-apollo/trunk/apollo-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/pom.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/pom.xml Sun Dec 23 14:19:12 2012
@@ -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>

Modified: activemq/activemq-apollo/trunk/apollo-cli/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/pom.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/pom.xml Sun Dec 23 14:19:12 2012
@@ -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>

Modified: activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml Sun Dec
23 14:19:12 2012
@@ -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 -->

Modified: activemq/activemq-apollo/trunk/apollo-jmx/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-jmx/pom.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-jmx/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-jmx/pom.xml Sun Dec 23 14:19:12 2012
@@ -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>

Modified: activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-leveldb/pom.xml Sun Dec 23 14:19:12 2012
@@ -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>

Modified: activemq/activemq-apollo/trunk/apollo-mqtt/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-mqtt/pom.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-mqtt/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-mqtt/pom.xml Sun Dec 23 14:19:12 2012
@@ -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>

Modified: activemq/activemq-apollo/trunk/apollo-network/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-network/pom.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-network/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-network/pom.xml Sun Dec 23 14:19:12 2012
@@ -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>

Modified: activemq/activemq-apollo/trunk/apollo-openwire/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/pom.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/pom.xml Sun Dec 23 14:19:12 2012
@@ -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>

Modified: activemq/activemq-apollo/trunk/apollo-scala/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-scala/pom.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-scala/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-scala/pom.xml Sun Dec 23 14:19:12 2012
@@ -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>

Modified: activemq/activemq-apollo/trunk/apollo-stomp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/pom.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/pom.xml Sun Dec 23 14:19:12 2012
@@ -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>

Modified: activemq/activemq-apollo/trunk/apollo-util/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/pom.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-util/pom.xml Sun Dec 23 14:19:12 2012
@@ -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>

Modified: activemq/activemq-apollo/trunk/apollo-web/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/pom.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/pom.xml Sun Dec 23 14:19:12 2012
@@ -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>

Modified: activemq/activemq-apollo/trunk/apollo-website/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/pom.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-website/pom.xml Sun Dec 23 14:19:12 2012
@@ -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>

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1425468&r1=1425467&r2=1425468&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Sun Dec 23 14:19:12 2012
@@ -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>
     



Mime
View raw message