Adds support to read PEM keys (#29039)

Co-Authored-By: James Roper <james@jazzy.id.au>
This commit is contained in:
Ignasi Marimon-Clos 2020-05-17 00:09:24 +02:00 committed by GitHub
parent ac3065bfad
commit 54a9b3189a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 478 additions and 4 deletions

View file

@ -1,4 +1,4 @@
import akka.{AutomaticModuleName, CopyrightHeaderForBuild, Paradox, ScalafixIgnoreFilePlugin}
import akka.{ AutomaticModuleName, CopyrightHeaderForBuild, Paradox, ScalafixIgnoreFilePlugin }
enablePlugins(
UnidocRoot,
@ -11,17 +11,18 @@ enablePlugins(
disablePlugins(MimaPlugin)
addCommandAlias(
name = "fixall",
value = ";scalafixEnable;compile:scalafix;test:scalafix;multi-jvm:scalafix;scalafmtAll;test:compile;multi-jvm:compile;reload")
value =
";scalafixEnable;compile:scalafix;test:scalafix;multi-jvm:scalafix;scalafmtAll;test:compile;multi-jvm:compile;reload")
addCommandAlias(
name = "sortImports",
value = ";scalafixEnable;compile:scalafix SortImports;test:scalafix SortImports;scalafmtAll")
import akka.AkkaBuild._
import akka.{AkkaBuild, Dependencies, OSGi, Protobuf, SigarLoader, VersionGenerator}
import akka.{ AkkaBuild, Dependencies, OSGi, Protobuf, SigarLoader, VersionGenerator }
import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm
import com.typesafe.tools.mima.plugin.MimaPlugin
import sbt.Keys.{initialCommands, parallelExecution}
import sbt.Keys.{ initialCommands, parallelExecution }
import spray.boilerplate.BoilerplatePlugin
initialize := {
@ -67,6 +68,7 @@ lazy val aggregatedProjects: Seq[ProjectReference] = List[ProjectReference](
persistenceTestkit,
protobuf,
protobufV3,
pki,
remote,
remoteTests,
slf4j,
@ -313,6 +315,14 @@ lazy val protobufV3 = akkaModule("akka-protobuf-v3")
test in assembly := {}, // assembly runs tests for unknown reason which introduces another cyclic dependency to packageBin via exportedJars
description := "Akka Protobuf V3 is a shaded version of the protobuf runtime. Original POM: https://github.com/protocolbuffers/protobuf/blob/v3.9.0/java/pom.xml")
lazy val pki =
akkaModule("akka-pki")
.dependsOn(actor) // this dependency only exists for "@ApiMayChange"
.settings(Dependencies.pki)
.settings(AutomaticModuleName.settings("akka.pki"))
// The akka-pki artifact was added in Akka 2.6.2, no MiMa checks yet.
.disablePlugins(MimaPlugin)
lazy val remote =
akkaModule("akka-remote")
.dependsOn(