Björn Antonsson
a8a02916aa
Updating to sbt-multi-jvm 0.2.0-M4. See #2398
...
(cherry picked from commit a4d4eb611641c93ea14ab6e0818b01bf9b93574e)
2012-08-17 15:51:39 +02:00
Roland
7bc2a98e57
Merge branch 'wip-fix-scalaVersion-∂π'
2012-08-17 14:36:56 +02:00
Roland
daefaaa75d
Merge branch 'wip-2362-ActorDSL-∂π'
2012-08-17 14:33:25 +02:00
Roland
d41160f4bf
automatically reference right scalaVersion in RST
...
using epilog_rst configuration variable in sphinx, which reads
akka-docs/epilog_rst, which is written in sphinx-scala-version task by
SBT, which is referenced by the other docs tasks as a dependency
2012-08-17 00:07:56 +02:00
Patrik Nordwall
1700edb863
Merge branch 'master' into wip-2202-cluster-domain-events-patriknw
...
Conflicts:
akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
2012-08-16 18:54:10 +02:00
Patrik Nordwall
331cd7fca3
WIP cluster docs
2012-08-16 14:48:15 +02:00
Viktor Klang
b8988f8eab
Using -C instead of -r for the ScalaTest reporter
2012-08-13 23:23:34 +02:00
Viktor Klang
0693cad9fc
#2370 - making sure that all artifacts that are exported actually are bundles.
2012-08-13 19:23:43 +02:00
Patrik Nordwall
10cb36630a
Change scalatest -r to -C, see #2374
2012-08-13 11:29:42 +02:00
RayRoestenburg
7071ac2b8d
ticket #2322 updated camel to 2.10.0
...
ticket #1928 added camel samples to a proper sample project
2012-08-11 22:04:54 +02:00
Roland
2ce455d077
Merge remote-tracking branch 'origin/master' into wip-2362-ActorDSL-∂π
2012-08-10 11:28:57 +02:00
Björn Antonsson
234ffa62e6
Make sure that akka compiles with JDK 7. See #2041
2012-08-10 11:12:39 +02:00
Roland
a4c6ea2f1f
add ActorDSL object with receiver methods, see #2362
...
tests will follow
2012-08-08 22:38:50 +02:00
Viktor Klang
8df9f30221
Upgrade to Netty 3.5.3.Final as suggested by Björn Harrtell
2012-08-08 22:26:03 +02:00
Viktor Klang
f39c99c3a6
Manual merge with master
2012-08-08 13:13:12 +02:00
Viktor Klang
95413180fe
Merge branch 'master' into wip-2030-√
2012-08-08 12:16:13 +02:00
Viktor Klang
8111439b5c
#2360 - Upgrading Typesafe Config dependency to 0.5.0
2012-08-07 17:54:50 +02:00
Viktor Klang
71fa783452
Initial port of Dataflow API, added it as its own subproject, switched to implicit value classes with cps transformation annotations
2012-08-07 14:30:16 +02:00
Viktor Klang
3c3245bdd4
#2358 - Explicitly excluding the slf4j-api dependency from Camel to only use Akkas slf4j version
2012-08-07 11:46:31 +02:00
Viktor Klang (√)
7a3649488d
Merge pull request #588 from akka/wip-2338-akka-sbt-plugin-√
...
#2338 - Akka Sbt Plugin now in build
2012-08-03 14:09:55 -07:00
Viktor Klang
eb23b5b88d
Removing the now not-needed dep on scala-reflect.jar
2012-08-02 16:02:31 +02:00
Viktor Klang
12f79f1bbf
#2338 - Akka Sbt Plugin now in build
2012-07-30 16:19:26 +02:00
Viktor Klang
9a1ae214de
#2261 - adding rewrites of Akka github urls to solidify on release
2012-07-30 13:57:32 +02:00
Viktor Klang (√)
6c5826ab23
Updating version range for OSGi
2012-07-30 01:23:33 +03:00
Roland
92059c9fb0
fix broken comment
2012-07-28 09:05:52 +02:00
Roland
25c89ae55a
extend comment explaining “online version of docs”
2012-07-28 08:52:23 +02:00
Peter Vlugter
225ad31e71
Fix sphinx with parallel execution
2012-07-28 10:50:51 +12:00
Peter Vlugter
bc47c421d0
Revert "restrict Sphinx tasks to akka-docs cage"
...
This reverts commit 2ef7e7a699 .
2012-07-28 10:43:31 +12:00
Viktor Klang
93c11e50a3
Updating to Scala-stm 0.6
2012-07-27 19:17:06 +02:00
Viktor Klang
76af653eb3
Updating Scala-stm to 0.6
2012-07-27 18:11:41 +02:00
Viktor Klang
4e68189881
merge with master
2012-07-27 17:57:13 +02:00
Roland
2ef7e7a699
restrict Sphinx tasks to akka-docs cage
2012-07-27 17:38:46 +02:00
Viktor Klang
b0850010dd
Uncommit me
2012-07-27 16:23:08 +02:00
Roland
a7b1b6c570
sphinx: run easy_install in the right directory
2012-07-27 14:35:34 +02:00
Roland
6b915793e8
fix REPL cmds for postfixOps
2012-07-27 13:59:02 +02:00
Viktor Klang
54f6184ec4
Scoping scalac and javac options to Compile
2012-07-26 14:48:36 +02:00
Viktor Klang
6c13b091fb
Adding a warning for adapted args and fixed the issues associated with it
2012-07-25 15:29:00 +02:00
Viktor Klang
d3542f8582
#2341 - enabling -deprecation in AkkaBuild and subsequently fixing tons of deprecation warnings
2012-07-24 12:12:06 +02:00
Roland
d85ce865d3
remove CPS stuff from AkkaBuild (breaks eclipse)
2012-07-23 13:59:27 +02:00
Viktor Klang
aa4ad6f3c3
Making it green
2012-07-22 21:40:09 +02:00
Viktor Klang
e5b3fd00a2
Prettify dependencies
2012-07-22 16:09:00 +02:00
Viktor Klang
743f9cd8ff
Removing Specs2 as a dependency to remove the hassle of keeping track of available versions
2012-07-21 18:09:20 +02:00
Viktor Klang
5a81ac3ba5
Bumpting to Scala 2.10.0-SNAPSHOT
2012-07-20 16:01:18 +02:00
Viktor Klang
1bf0fe4448
Partial migration to M5
2012-07-17 17:21:08 +02:00
Viktor Klang
ac5b5de90a
Merging in master, huge work trying to get things to compile, tests not green at this stage
2012-07-06 17:04:04 +02:00
Viktor Klang
12254cb424
Fixes #2321 - Upgrade Netty to 3.5.2.Final
2012-07-05 18:03:21 +02:00
Roland
cde7b29a33
Merge branch 'wip-1952-testkit-java-∂π'
2012-07-04 17:38:20 +02:00
Viktor Klang
3911b18069
Merging in master
2012-07-04 15:24:23 +02:00
Roland
dc9968dda7
don’t encourage thread leaks so easily (initialCommands)
2012-07-04 14:58:26 +02:00
Roland
52e1881ece
move 'repl' script into AkkaBuild as initialCommands, thanks Pete!
2012-07-04 11:30:02 +02:00