activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r961168 - in /activemq/sandbox/activemq-apollo-actor: activemq-cassandra/pom.xml pom.xml
Date Wed, 07 Jul 2010 04:13:19 GMT
Author: chirino
Date: Wed Jul  7 04:13:18 2010
New Revision: 961168

URL: http://svn.apache.org/viewvc?rev=961168&view=rev
Log:
Upgrade to scala 2.8.0 RC6

Modified:
    activemq/sandbox/activemq-apollo-actor/activemq-cassandra/pom.xml
    activemq/sandbox/activemq-apollo-actor/pom.xml

Modified: activemq/sandbox/activemq-apollo-actor/activemq-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-cassandra/pom.xml?rev=961168&r1=961167&r2=961168&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-cassandra/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-cassandra/pom.xml Wed Jul  7 04:13:18
2010
@@ -46,12 +46,10 @@
       <version>6.0-SNAPSHOT</version>
     </dependency>
     
-   <!-- val shorrockinRepo = "shorrockin Maven 2 Repository" at "http://maven.shorrockin.com"
-->
-    
     <dependency>
       <groupId>com.shorrockin</groupId>
       <artifactId>cascal</artifactId>
-      <version>1.2-Scala.2.8.0.RC5-SNAPSHOT</version>
+      <version>${cascal-version}</version>
     </dependency>
 
     <dependency>

Modified: activemq/sandbox/activemq-apollo-actor/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/pom.xml?rev=961168&r1=961167&r2=961168&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/pom.xml Wed Jul  7 04:13:18 2010
@@ -32,12 +32,21 @@
   <inceptionYear>2005</inceptionYear>
 
   <properties>
+
+    <!-- base url for site deployment.  See distribution management for full url.  Override
this in settings.xml for staging -->
+    <staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
+    <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
+
     <target-dir>target</target-dir>
     <activemq-version>6.0-SNAPSHOT</activemq-version>
     <siteId>activemq-${activemq-version}</siteId>
     <projectName>Apache ActiveMQ</projectName>
-    <!-- base url for site deployment.  See distribution management for full url.  Override
this in settings.xml for staging -->
-    <staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
+
+    <!-- dependencies that track scala version changes -->
+    <scala-version>2.8.0.RC6</scala-version>
+    <scalatest-version>1.2-for-scala-2.8.0.RC6-SNAPSHOT</scalatest-version>
+    <cascal-version>1.2-Scala.2.8.0.RC5-SNAPSHOT</cascal-version>
+    
     <servicemix.kernel.version>1.1.0</servicemix.kernel.version>
     <spring-version>2.5.5</spring-version>
     <activesoap-version>1.3</activesoap-version>
@@ -74,6 +83,7 @@
     <p2psockets-version>1.1.2</p2psockets-version>
     <regexp-version>1.3</regexp-version>
     <rome-version>0.8</rome-version>
+
     <slf4j-version>1.5.0</slf4j-version>
 
     <jaxb-api-version>2.1</jaxb-api-version>
@@ -94,18 +104,16 @@
     <hawtbuf-version>1.0-SNAPSHOT</hawtbuf-version>
     
     <jetty-version>6.1.22</jetty-version>
-    <jetty-plugin-version>7.0.1.v20091125</jetty-plugin-version>
     <scalate-version>1.2-SNAPSHOT</scalate-version>
     <servlet-api-version>2.5</servlet-api-version>
     <jackson-version>1.5.2</jackson-version>
     <logback-version>0.9.18</logback-version>
     
-    <scala-version>2.8.0.RC5</scala-version>
-    <scalatest-version>1.2-for-scala-2.8.0.RC5-SNAPSHOT</scalatest-version>
+    <!-- maven plugin versions -->
     <maven-scala-plugin-version>2.13.1</maven-scala-plugin-version>
     <maven-surefire-plugin-version>2.4.3</maven-surefire-plugin-version>
+    <jetty-plugin-version>7.0.1.v20091125</jetty-plugin-version>
     
-    <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
   </properties>
 
   <prerequisites>



Mime
View raw message