diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-04-30 21:29:54 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-04-30 21:50:09 +0200 |
| commit | eeace4ab7ef5e53e261d32871e3c097f65f99400 (patch) | |
| tree | dae493210000a1dd6cde2efd32b94275058498ba | |
| parent | 9cd3e6505aa4285750e63263e2551ab71f36ff8d (diff) | |
| download | scala-eeace4ab7ef5e53e261d32871e3c097f65f99400.tar.gz scala-eeace4ab7ef5e53e261d32871e3c097f65f99400.tar.bz2 scala-eeace4ab7ef5e53e261d32871e3c097f65f99400.zip | |
Remove akka-actor from scala-library-all
The 2.12 distribution will no longer ship an akka-actors jar.
| -rw-r--r-- | build-ant-macros.xml | 1 | ||||
| -rwxr-xr-x | build.xml | 2 | ||||
| -rwxr-xr-x | scripts/jobs/integrate/bootstrap | 3 | ||||
| -rw-r--r-- | src/build/maven/scala-library-all-pom.xml | 5 | ||||
| -rw-r--r-- | versions.properties | 1 |
5 files changed, 1 insertions, 11 deletions
diff --git a/build-ant-macros.xml b/build-ant-macros.xml index e39290117f..246ff01a39 100644 --- a/build-ant-macros.xml +++ b/build-ant-macros.xml @@ -597,7 +597,6 @@ <filter token="RELEASE_REPOSITORY" value="${remote.release.repository}" /> <filter token="SNAPSHOT_REPOSITORY" value="${remote.snapshot.repository}" /> <filter token="JLINE_VERSION" value="${jline.version}" /> - <filter token="AKKA_ACTOR_VERSION" value="${akka-actor.version.number}" /> <!-- TODO modularize compiler. <filter token="SCALA_COMPILER_DOC_VERSION" value="${scala-compiler-doc.version.number}" /> @@ -555,7 +555,6 @@ TODO: <echo message="scala-xml.version.number = ${scala-xml.version.number}"/> <echo message="scala-parser-combinators.version.number = ${scala-parser-combinators.version.number}"/> <echo message="scala-swing.version.number = ${scala-swing.version.number}"/> - <echo message="akka-actor.version.number = ${akka-actor.version.number}"/> <echo message="jline.version = ${jline.version}"/> <echo message="partest.version.number = ${partest.version.number}"/> <echo message="scalacheck.version.number = ${scalacheck.version.number}"/> @@ -566,7 +565,6 @@ TODO: <entry key="scala-xml.version.number" value="${scala-xml.version.number}"/> <entry key="scala-parser-combinators.version.number" value="${scala-parser-combinators.version.number}"/> <entry key="scala-swing.version.number" value="${scala-swing.version.number}"/> - <entry key="akka-actor.version.number" value="${akka-actor.version.number}"/> <entry key="jline.version" value="${jline.version}"/> <entry key="partest.version.number" value="${partest.version.number}"/> <entry key="scalacheck.version.number" value="${scalacheck.version.number}"/> diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index c97ca6493a..2863532cb1 100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -429,8 +429,7 @@ constructUpdatedModuleVersions() { updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dpartest.version.number=$PARTEST_VER") updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscalacheck.version.number=$SCALACHECK_VER") - # allow overriding the akka-actors and jline version using a jenkins build parameter - if [ ! -z "$AKKA_ACTOR_VER" ]; then updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dakka-actor.version.number=$AKKA_ACTOR_VER"); fi + # allow overriding the jline version using a jenkins build parameter if [ ! -z "$JLINE_VER" ] ; then updatedModuleVersions=("${updatedModuleVersions[@]}" "-Djline.version=$JLINE_VER"); fi if [ ! -z "$SCALA_BINARY_VER" ]; then updatedModuleVersions=("${updatedModuleVersions[@]}" "-Dscala.binary.version=$SCALA_BINARY_VER"); fi diff --git a/src/build/maven/scala-library-all-pom.xml b/src/build/maven/scala-library-all-pom.xml index 8cf6f660c9..074c067742 100644 --- a/src/build/maven/scala-library-all-pom.xml +++ b/src/build/maven/scala-library-all-pom.xml @@ -54,11 +54,6 @@ <artifactId>scala-swing_@SCALA_BINARY_VERSION@</artifactId> <version>@SCALA_SWING_VERSION@</version> </dependency> - <dependency> - <groupId>com.typesafe.akka</groupId> - <artifactId>akka-actor_@SCALA_BINARY_VERSION@</artifactId> - <version>@AKKA_ACTOR_VERSION@</version> - </dependency> </dependencies> <developers> <developer> diff --git a/versions.properties b/versions.properties index fc1b5f9697..1812076dff 100644 --- a/versions.properties +++ b/versions.properties @@ -25,7 +25,6 @@ scala.binary.version=2.11 scala-xml.version.number=1.0.4 scala-parser-combinators.version.number=1.0.4 scala-swing.version.number=1.0.2 -akka-actor.version.number=2.3.10 jline.version=2.12.1 # external modules, used internally (not shipped) |