Upgraded Akka to Scala 2.8.0 final, finally...
This commit is contained in:
parent
9b683d0780
commit
e43bb778f1
8 changed files with 166 additions and 14 deletions
|
|
@ -2,9 +2,9 @@
|
||||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>net.lag</groupId>
|
<groupId>net.lag</groupId>
|
||||||
<artifactId>configgy_2.8.0</artifactId>
|
<artifactId>configgy</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<version>1.5.5</version>
|
<version>2.8.0-1.5.5</version>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>Apache 2</name>
|
<name>Apache 2</name>
|
||||||
Binary file not shown.
|
|
@ -0,0 +1,152 @@
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<parent>
|
||||||
|
<groupId>org.scala-tools</groupId>
|
||||||
|
<artifactId>scala-tools-parent</artifactId>
|
||||||
|
<version>1.3</version>
|
||||||
|
</parent>
|
||||||
|
<artifactId>vscaladoc</artifactId>
|
||||||
|
<version>1.1-md-3</version>
|
||||||
|
<name>${project.artifactId}</name>
|
||||||
|
<inceptionYear>2008</inceptionYear>
|
||||||
|
<scm>
|
||||||
|
<connection>scm:svn:http://vscaladoc.googlecode.com/svn/tags/vscaladoc-1.1</connection>
|
||||||
|
<developerConnection>scm:svn:https://vscaladoc.googlecode.com/svn/tags/vscaladoc-1.1</developerConnection>
|
||||||
|
<url>http://code.google.com/p/vscaladoc/source/browse/tags/vscaladoc-1.1</url>
|
||||||
|
</scm>
|
||||||
|
<issueManagement>
|
||||||
|
<system>code.google</system>
|
||||||
|
<url>http://code.google.com/p/vscaladoc/issues/list</url>
|
||||||
|
</issueManagement>
|
||||||
|
<ciManagement>
|
||||||
|
<system>hudson</system>
|
||||||
|
<url>http://scala-tools.org/hudson/job/vscaladoc</url>
|
||||||
|
</ciManagement>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<scala.version>2.7.1</scala.version>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<repositories>
|
||||||
|
<repository>
|
||||||
|
<id>scala-tools.org</id>
|
||||||
|
<name>Scala-Tools Maven2 Repository</name>
|
||||||
|
<url>http://scala-tools.org/repo-releases</url>
|
||||||
|
</repository>
|
||||||
|
</repositories>
|
||||||
|
|
||||||
|
<pluginRepositories>
|
||||||
|
<pluginRepository>
|
||||||
|
<id>scala-tools.org</id>
|
||||||
|
<name>Scala-Tools Maven2 Repository</name>
|
||||||
|
<url>http://scala-tools.org/repo-releases</url>
|
||||||
|
</pluginRepository>
|
||||||
|
</pluginRepositories>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.scala-lang</groupId>
|
||||||
|
<artifactId>scala-library</artifactId>
|
||||||
|
<version>${scala.version}</version>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.scala-lang</groupId>
|
||||||
|
<artifactId>scala-compiler</artifactId>
|
||||||
|
<version>${scala.version}</version>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>junit</groupId>
|
||||||
|
<artifactId>junit</artifactId>
|
||||||
|
<version>3.8.1</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<sourceDirectory>src/main/scala</sourceDirectory>
|
||||||
|
<testSourceDirectory>src/test/scala</testSourceDirectory>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.scala-tools</groupId>
|
||||||
|
<artifactId>maven-scala-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>compile</id>
|
||||||
|
<goals>
|
||||||
|
<goal>compile</goal>
|
||||||
|
<goal>testCompile</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<args>
|
||||||
|
<arg>-target:jvm-1.5</arg>
|
||||||
|
</args>
|
||||||
|
<scalaVersion>${scala.version}</scalaVersion>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-eclipse-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<downloadSources>true</downloadSources>
|
||||||
|
<excludes>
|
||||||
|
<exclude>org.scala-lang:scala-library</exclude>
|
||||||
|
</excludes>
|
||||||
|
<classpathContainers>
|
||||||
|
<classpathContainer>ch.epfl.lamp.sdt.launching.SCALA_CONTAINER</classpathContainer>
|
||||||
|
</classpathContainers>
|
||||||
|
<projectnatures>
|
||||||
|
<java.lang.String>ch.epfl.lamp.sdt.core.scalanature</java.lang.String>
|
||||||
|
<java.lang.String>org.eclipse.jdt.core.javanature</java.lang.String>
|
||||||
|
</projectnatures>
|
||||||
|
<buildcommands>
|
||||||
|
<java.lang.String>ch.epfl.lamp.sdt.core.scalabuilder</java.lang.String>
|
||||||
|
</buildcommands>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>net.sf.alchim</groupId>
|
||||||
|
<artifactId>yuicompressor-maven-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<goals>
|
||||||
|
<goal>compress</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<nosuffix>true</nosuffix>
|
||||||
|
<aggregations>
|
||||||
|
<aggregation>
|
||||||
|
<!-- remove files after aggregation (default: false) -->
|
||||||
|
<removeIncluded>true</removeIncluded>
|
||||||
|
<!-- insert new line after each concatenation (default: false) -->
|
||||||
|
<insertNewLine>true</insertNewLine>
|
||||||
|
<output>${project.build.directory}/classes/org/scala_tools/vscaladoc/_highlighter/shAll.js</output>
|
||||||
|
<!-- files to include, path relative to output's directory or absolute path-->
|
||||||
|
<includes>
|
||||||
|
<include>shCore*.js</include>
|
||||||
|
<include>shBrush*.js</include>
|
||||||
|
</includes>
|
||||||
|
</aggregation>
|
||||||
|
</aggregations>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
<reporting>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.scala-tools</groupId>
|
||||||
|
<artifactId>maven-scala-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<vscaladocVersion>1.0</vscaladocVersion>
|
||||||
|
<scalaVersion>${scala.version}</scalaVersion>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</reporting>
|
||||||
|
</project>
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
<?xml version='1.0' encoding='UTF-8'?>
|
<?xml version='1.0' encoding='UTF-8'?>
|
||||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.scala-tools.sbinary</groupId>
|
<groupId>sbinary</groupId>
|
||||||
<artifactId>sbinary_2.8.0</artifactId>
|
<artifactId>sbinary</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<version>0.3.1-SNAPSHOT</version>
|
<version>2.8.0-0.3.1</version>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.scala-lang</groupId>
|
<groupId>org.scala-lang</groupId>
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
project.organization=se.scalablesolutions.akka
|
project.organization=se.scalablesolutions.akka
|
||||||
project.name=akka
|
project.name=akka
|
||||||
project.version=0.10
|
project.version=0.10
|
||||||
scala.version=2.8.0.RC3
|
scala.version=2.8.0
|
||||||
sbt.version=0.7.4
|
sbt.version=0.7.4
|
||||||
def.scala.version=2.7.7
|
def.scala.version=2.7.7
|
||||||
build.scala.versions=2.8.0.RC3
|
build.scala.versions=2.8.0
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
|
||||||
val ATMO_VERSION = "0.6"
|
val ATMO_VERSION = "0.6"
|
||||||
val CASSANDRA_VERSION = "0.6.1"
|
val CASSANDRA_VERSION = "0.6.1"
|
||||||
val LIFT_VERSION = "2.0-scala280-SNAPSHOT"
|
val LIFT_VERSION = "2.0-scala280-SNAPSHOT"
|
||||||
val SCALATEST_VERSION = "1.2-for-scala-2.8.0.RC3-SNAPSHOT"
|
val SCALATEST_VERSION = "1.2-for-scala-2.8.0.final-SNAPSHOT"
|
||||||
val MULTIVERSE_VERSION = "0.6-SNAPSHOT"
|
val MULTIVERSE_VERSION = "0.6-SNAPSHOT"
|
||||||
|
|
||||||
// ------------------------------------------------------------
|
// ------------------------------------------------------------
|
||||||
|
|
@ -177,10 +177,10 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
|
||||||
val netty = "org.jboss.netty" % "netty" % "3.2.1.Final" % "compile"
|
val netty = "org.jboss.netty" % "netty" % "3.2.1.Final" % "compile"
|
||||||
val commons_codec = "commons-codec" % "commons-codec" % "1.4" % "compile"
|
val commons_codec = "commons-codec" % "commons-codec" % "1.4" % "compile"
|
||||||
val commons_io = "commons-io" % "commons-io" % "1.4" % "compile"
|
val commons_io = "commons-io" % "commons-io" % "1.4" % "compile"
|
||||||
val dispatch_json = "net.databinder" % "dispatch-json_2.8.0.RC3" % "0.7.4" % "compile"
|
val dispatch_json = "net.databinder" % "dispatch-json_2.8.0" % "0.7.4" % "compile"
|
||||||
val dispatch_http = "net.databinder" % "dispatch-http_2.8.0.RC3" % "0.7.4" % "compile"
|
val dispatch_http = "net.databinder" % "dispatch-http_2.8.0" % "0.7.4" % "compile"
|
||||||
val sjson = "sjson.json" % "sjson" % "0.6-SNAPSHOT-2.8.RC3" % "compile"
|
val sjson = "sjson.json" % "sjson" % "0.7-SNAPSHOT-2.8.0" % "compile"
|
||||||
val sbinary = "sbinary" % "sbinary" % "2.8.0.RC3-0.3.1-SNAPSHOT" % "compile"
|
val sbinary = "sbinary" % "sbinary" % "2.8.0-0.3.1" % "compile"
|
||||||
val jackson = "org.codehaus.jackson" % "jackson-mapper-asl" % "1.2.1" % "compile"
|
val jackson = "org.codehaus.jackson" % "jackson-mapper-asl" % "1.2.1" % "compile"
|
||||||
val jackson_core = "org.codehaus.jackson" % "jackson-core-asl" % "1.2.1" % "compile"
|
val jackson_core = "org.codehaus.jackson" % "jackson-core-asl" % "1.2.1" % "compile"
|
||||||
val h2_lzf = "voldemort.store.compress" % "h2-lzf" % "1.0" % "compile"
|
val h2_lzf = "voldemort.store.compress" % "h2-lzf" % "1.0" % "compile"
|
||||||
|
|
@ -188,7 +188,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
|
||||||
val jta_1_1 = "org.apache.geronimo.specs" % "geronimo-jta_1.1_spec" % "1.1.1" % "compile" intransitive()
|
val jta_1_1 = "org.apache.geronimo.specs" % "geronimo-jta_1.1_spec" % "1.1.1" % "compile" intransitive()
|
||||||
val werkz = "org.codehaus.aspectwerkz" % "aspectwerkz-nodeps-jdk5" % "2.2.1" % "compile"
|
val werkz = "org.codehaus.aspectwerkz" % "aspectwerkz-nodeps-jdk5" % "2.2.1" % "compile"
|
||||||
val werkz_core = "org.codehaus.aspectwerkz" % "aspectwerkz-jdk5" % "2.2.1" % "compile"
|
val werkz_core = "org.codehaus.aspectwerkz" % "aspectwerkz-jdk5" % "2.2.1" % "compile"
|
||||||
val configgy = "net.lag" % "configgy" % "2.8.0.RC3-1.5.2-SNAPSHOT" % "compile"
|
val configgy = "net.lag" % "configgy" % "2.8.0-1.5.5" % "compile"
|
||||||
val guicey = "org.guiceyfruit" % "guice-all" % "2.0" % "compile"
|
val guicey = "org.guiceyfruit" % "guice-all" % "2.0" % "compile"
|
||||||
val aopalliance = "aopalliance" % "aopalliance" % "1.0" % "compile"
|
val aopalliance = "aopalliance" % "aopalliance" % "1.0" % "compile"
|
||||||
val protobuf = "com.google.protobuf" % "protobuf-java" % "2.3.0" % "compile"
|
val protobuf = "com.google.protobuf" % "protobuf-java" % "2.3.0" % "compile"
|
||||||
|
|
@ -245,7 +245,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
|
||||||
}
|
}
|
||||||
|
|
||||||
class AkkaRedisProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
|
class AkkaRedisProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
|
||||||
val redis = "com.redis" % "redisclient" % "2.8.0.RC3-1.4" % "compile"
|
val redis = "com.redis" % "redisclient" % "2.8.0-1.4" % "compile"
|
||||||
val commons_codec = "commons-codec" % "commons-codec" % "1.4" % "compile"
|
val commons_codec = "commons-codec" % "commons-codec" % "1.4" % "compile"
|
||||||
override def testOptions = TestFilter((name: String) => name.endsWith("Test")) :: Nil
|
override def testOptions = TestFilter((name: String) => name.endsWith("Test")) :: Nil
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue