diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-04-30 21:42:58 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-04-30 21:42:58 -0700 |
commit | 00b5adfbf3618639b501d1859f7a023083a4b8c3 (patch) | |
tree | dae493210000a1dd6cde2efd32b94275058498ba | |
parent | 4210262867a541d4cbf0aaf2b06bedeef9520c2b (diff) | |
parent | eeace4ab7ef5e53e261d32871e3c097f65f99400 (diff) | |
download | scala-00b5adfbf3618639b501d1859f7a023083a4b8c3.tar.gz scala-00b5adfbf3618639b501d1859f7a023083a4b8c3.tar.bz2 scala-00b5adfbf3618639b501d1859f7a023083a4b8c3.zip |
Merge pull request #4476 from lrytz/noAkkaActors
Remove the akka-actors dependency
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | build-ant-macros.xml | 1 | ||||
-rwxr-xr-x | build.xml | 6 | ||||
-rwxr-xr-x | scripts/jobs/integrate/bootstrap | 28 | ||||
-rw-r--r-- | src/build/maven/scala-library-all-pom.xml | 5 | ||||
-rwxr-xr-x | tools/binary-repo-lib.sh | 2 | ||||
-rw-r--r-- | versions.properties | 1 |
7 files changed, 11 insertions, 34 deletions
@@ -97,7 +97,7 @@ Once the `publish-core` task has completed on a commit, you can try it out in sb ``` $ sbt -> set resolvers += "pr" at "http://private-repo.typesafe.com/typesafe/scala-pr-validation-snapshots/" +> set resolvers += "pr" at "https://scala-ci.typesafe.com/artifactory/scala-pr-validation-snapshots/" > set scalaVersion := "<milestone>-<sha7>-SNAPSHOT" > console ``` 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}" /> @@ -464,9 +464,9 @@ TODO: <property name="sbt.lib.dir" value="${build-sbt.dir}/${sbt.latest.version}/lib"/> <property name="sbt.interface.jar" value="${sbt.lib.dir}/interface.jar"/> - <property name="sbt.interface.url" value="http://private-repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/interface/${sbt.latest.version}/jars/interface.jar"/> + <property name="sbt.interface.url" value="http://dl.bintray.com/typesafe/ivy-releases/org.scala-sbt/interface/${sbt.latest.version}/jars/interface.jar"/> <property name="sbt.interface.src.jar" value="${sbt.src.dir}/compiler-interface-src.jar"/> - <property name="sbt.interface.src.url" value="http://private-repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/compiler-interface/${sbt.latest.version}/jars/compiler-interface-src.jar"/> + <property name="sbt.interface.src.url" value="http://dl.bintray.com/typesafe/ivy-releases/org.scala-sbt/compiler-interface/${sbt.latest.version}/jars/compiler-interface-src.jar"/> <!-- Additional command line arguments for scalac. They are added to all build targets --> @@ -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 3b25b2c45d..2863532cb1 100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -72,26 +72,13 @@ # Requirements # - sbtCmd must point to sbt from sbt-extras -# - ~/.sonatype-curl that consists of user = USER:PASS -# - ~/.m2/settings.xml with credentials for sonatype -# <server> -# <id>private-repo</id> -# <username>jenkinside</username> -# <password></password> -# </server> -# - ~/.credentials (for sonatype) -# realm=Sonatype Nexus Repository Manager -# host=oss.sonatype.org -# user=lamp -# password= -# - ~/.credentials-private-repo for private-repo.typesafe.com, as follows: -# realm=Artifactory Realm -# host=private-repo.typesafe.com -# user=jenkinside -# password= -# - ~/.sbt/0.13/plugins/gpg.sbt with: +# - ~/.sonatype-curl, ~/.m2/settings.xml, ~/.credentials, ~/.credentials-sonatype, ~/.credentials-private-repo +# as defined by https://github.com/scala/scala-jenkins-infra/tree/master/templates/default +# - ~/.sbt/0.13/plugins/gpg.sbt with: # addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1") +# Note: private-repo used to be private-repo.typesafe.com. now we're running artifactory on scala-ci.typesafe.com/artifactory + moduleVersioning=${moduleVersioning-"versions.properties"} @@ -124,7 +111,7 @@ mkdir -p $baseDir/resolutionScratch_ # repo used to publish "locker" scala to (to start the bootstrap) releaseTempRepoCred="private-repo" -releaseTempRepoUrl=${releaseTempRepoUrl-"http://private-repo.typesafe.com/typesafe/scala-release-temp/"} +releaseTempRepoUrl=${releaseTempRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-release-temp/"} # Used below in sbtArgs since we use a dedicated repository to share artifcacts between jobs, # so we need to configure SBT to use these rather than its default, Maven Central. @@ -442,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/tools/binary-repo-lib.sh b/tools/binary-repo-lib.sh index 437c0a0c08..9c037a0efb 100755 --- a/tools/binary-repo-lib.sh +++ b/tools/binary-repo-lib.sh @@ -3,7 +3,7 @@ # Library to push and pull binary artifacts from a remote repository using CURL. remote_urlget="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" -remote_urlpush="http://private-repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" +remote_urlpush="http://dl.bintray.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap" libraryJar="$(pwd)/lib/scala-library.jar" desired_ext=".desired.sha1" push_jar="$(pwd)/tools/push.jar" 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) |