diff --git a/build.sbt b/build.sbt index 2f14a4004eec..acc39c3a92c5 100644 --- a/build.sbt +++ b/build.sbt @@ -407,22 +407,17 @@ val logbackPkg = Seq( "ch.qos.logback" % "logback-classic" % logbackClassicVersion, "ch.qos.logback" % "logback-core" % logbackClassicVersion ) -val akkaActor = akkaPkg("actor") -val akkaStream = akkaPkg("stream") -val akkaTyped = akkaPkg("actor-typed") -val akkaTestkit = akkaPkg("testkit") -val akkaSLF4J = akkaPkg("slf4j") -val akkaTestkitTyped = akkaPkg("actor-testkit-typed") % Test -val akkaHttp = akkaHTTPPkg("http") -val akkaSpray = akkaHTTPPkg("http-spray-json") -val logbackTest = logbackPkg.map(_ % Test) +val akkaActor = akkaPkg("actor") +val akkaStream = akkaPkg("stream") +val akkaTestkit = akkaPkg("testkit") +val akkaSLF4J = akkaPkg("slf4j") +val akkaHttp = akkaHTTPPkg("http") +val logbackTest = logbackPkg.map(_ % Test) val akka = Seq( akkaActor, akkaStream, - akkaHttp, - akkaSpray, - akkaTyped + akkaHttp ) // === Cats =================================================================== diff --git a/distribution/engine/THIRD-PARTY/NOTICE b/distribution/engine/THIRD-PARTY/NOTICE index ba4a663793a4..dd7803cab3b2 100644 --- a/distribution/engine/THIRD-PARTY/NOTICE +++ b/distribution/engine/THIRD-PARTY/NOTICE @@ -76,11 +76,6 @@ The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `com.monovore.decline_2.13-2.4.1`. -'akka-actor-typed_2.13', licensed under the Apache-2.0, is distributed with the engine. -The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-actor-typed_2.13-2.6.20`. - - 'akka-actor_2.13', licensed under the Apache-2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-actor_2.13-2.6.20`. @@ -91,11 +86,6 @@ The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-http-core_2.13-10.2.10`. -'akka-http-spray-json_2.13', licensed under the Apache-2.0, is distributed with the engine. -The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-http-spray-json_2.13-10.2.10`. - - 'akka-http_2.13', licensed under the Apache-2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-http_2.13-10.2.10`. @@ -111,11 +101,6 @@ The license information can be found along with the copyright notices. Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20`. -'akka-slf4j_2.13', licensed under the Apache-2.0, is distributed with the engine. -The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-slf4j_2.13-2.6.20`. - - 'akka-stream_2.13', licensed under the Apache-2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-stream_2.13-2.6.20`. @@ -386,11 +371,6 @@ The license file can be found at `licenses/MIT`. Copyright notices related to this dependency can be found in the directory `io.sentry.sentry-logback-6.28.0`. -'spray-json_2.13', licensed under the Apache 2, is distributed with the engine. -The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.spray.spray-json_2.13-1.3.6`. - - 'jakarta.inject-api', licensed under the The Apache Software License, Version 2.0, is distributed with the engine. The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `jakarta.inject.jakarta.inject-api-2.0.1`. diff --git a/distribution/engine/THIRD-PARTY/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/NOTICES b/distribution/engine/THIRD-PARTY/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/NOTICES deleted file mode 100644 index 524d999be2a0..000000000000 --- a/distribution/engine/THIRD-PARTY/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/NOTICES +++ /dev/null @@ -1 +0,0 @@ -Copyright (C) 2009-2022 Lightbend Inc. diff --git a/distribution/engine/THIRD-PARTY/com.typesafe.akka.akka-http-spray-json_2.13-10.2.10/NOTICES b/distribution/engine/THIRD-PARTY/com.typesafe.akka.akka-http-spray-json_2.13-10.2.10/NOTICES deleted file mode 100644 index 524d999be2a0..000000000000 --- a/distribution/engine/THIRD-PARTY/com.typesafe.akka.akka-http-spray-json_2.13-10.2.10/NOTICES +++ /dev/null @@ -1 +0,0 @@ -Copyright (C) 2009-2022 Lightbend Inc. diff --git a/distribution/engine/THIRD-PARTY/com.typesafe.akka.akka-slf4j_2.13-2.6.20/NOTICES b/distribution/engine/THIRD-PARTY/com.typesafe.akka.akka-slf4j_2.13-2.6.20/NOTICES deleted file mode 100644 index 524d999be2a0..000000000000 --- a/distribution/engine/THIRD-PARTY/com.typesafe.akka.akka-slf4j_2.13-2.6.20/NOTICES +++ /dev/null @@ -1 +0,0 @@ -Copyright (C) 2009-2022 Lightbend Inc. diff --git a/distribution/engine/THIRD-PARTY/io.spray.spray-json_2.13-1.3.6/NOTICES b/distribution/engine/THIRD-PARTY/io.spray.spray-json_2.13-1.3.6/NOTICES deleted file mode 100644 index ef73e3c5e1a6..000000000000 --- a/distribution/engine/THIRD-PARTY/io.spray.spray-json_2.13-1.3.6/NOTICES +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2009-2011 Mathias Doenitz - * Inspired by a similar implementation by Nathan Hamblen - * (https://github.com/dispatch/classic) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -/* - * Copyright (C) 2011 Mathias Doenitz - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * Copyright (C) 2011,2012 Mathias Doenitz, Johannes Rudolph - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * Copyright (C) 2014 Mathias Doenitz - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ diff --git a/distribution/project-manager/THIRD-PARTY/NOTICE b/distribution/project-manager/THIRD-PARTY/NOTICE index 9249355d5928..82efadc35bf1 100644 --- a/distribution/project-manager/THIRD-PARTY/NOTICE +++ b/distribution/project-manager/THIRD-PARTY/NOTICE @@ -56,11 +56,6 @@ The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `com.google.flatbuffers.flatbuffers-java-24.3.25`. -'akka-actor-typed_2.13', licensed under the Apache-2.0, is distributed with the project-manager. -The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-actor-typed_2.13-2.6.20`. - - 'akka-actor_2.13', licensed under the Apache-2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-actor_2.13-2.6.20`. @@ -71,11 +66,6 @@ The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-http-core_2.13-10.2.10`. -'akka-http-spray-json_2.13', licensed under the Apache-2.0, is distributed with the project-manager. -The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-http-spray-json_2.13-10.2.10`. - - 'akka-http_2.13', licensed under the Apache-2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-http_2.13-10.2.10`. @@ -91,11 +81,6 @@ The license information can be found along with the copyright notices. Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-protobuf-v3_2.13-2.6.20`. -'akka-slf4j_2.13', licensed under the Apache-2.0, is distributed with the project-manager. -The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-slf4j_2.13-2.6.20`. - - 'akka-stream_2.13', licensed under the Apache-2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `com.typesafe.akka.akka-stream_2.13-2.6.20`. @@ -346,11 +331,6 @@ The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `io.helidon.websocket.helidon-websocket-4.0.8`. -'spray-json_2.13', licensed under the Apache 2, is distributed with the project-manager. -The license file can be found at `licenses/APACHE2.0`. -Copyright notices related to this dependency can be found in the directory `io.spray.spray-json_2.13-1.3.6`. - - 'jakarta.inject-api', licensed under the The Apache Software License, Version 2.0, is distributed with the project-manager. The license file can be found at `licenses/APACHE2.0`. Copyright notices related to this dependency can be found in the directory `jakarta.inject.jakarta.inject-api-2.0.1`. diff --git a/distribution/project-manager/THIRD-PARTY/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/NOTICES b/distribution/project-manager/THIRD-PARTY/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/NOTICES deleted file mode 100644 index 524d999be2a0..000000000000 --- a/distribution/project-manager/THIRD-PARTY/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/NOTICES +++ /dev/null @@ -1 +0,0 @@ -Copyright (C) 2009-2022 Lightbend Inc. diff --git a/distribution/project-manager/THIRD-PARTY/com.typesafe.akka.akka-http-spray-json_2.13-10.2.10/NOTICES b/distribution/project-manager/THIRD-PARTY/com.typesafe.akka.akka-http-spray-json_2.13-10.2.10/NOTICES deleted file mode 100644 index 3e3e75735a93..000000000000 --- a/distribution/project-manager/THIRD-PARTY/com.typesafe.akka.akka-http-spray-json_2.13-10.2.10/NOTICES +++ /dev/null @@ -1,3 +0,0 @@ -Copyright (C) 2009-2022 Lightbend Inc. - -Copyright (C) 2017-2022 Lightbend Inc. diff --git a/distribution/project-manager/THIRD-PARTY/com.typesafe.akka.akka-slf4j_2.13-2.6.20/NOTICES b/distribution/project-manager/THIRD-PARTY/com.typesafe.akka.akka-slf4j_2.13-2.6.20/NOTICES deleted file mode 100644 index 524d999be2a0..000000000000 --- a/distribution/project-manager/THIRD-PARTY/com.typesafe.akka.akka-slf4j_2.13-2.6.20/NOTICES +++ /dev/null @@ -1 +0,0 @@ -Copyright (C) 2009-2022 Lightbend Inc. diff --git a/distribution/project-manager/THIRD-PARTY/io.spray.spray-json_2.13-1.3.6/NOTICES b/distribution/project-manager/THIRD-PARTY/io.spray.spray-json_2.13-1.3.6/NOTICES deleted file mode 100644 index ef73e3c5e1a6..000000000000 --- a/distribution/project-manager/THIRD-PARTY/io.spray.spray-json_2.13-1.3.6/NOTICES +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2009-2011 Mathias Doenitz - * Inspired by a similar implementation by Nathan Hamblen - * (https://github.com/dispatch/classic) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -/* - * Copyright (C) 2011 Mathias Doenitz - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * Copyright (C) 2011,2012 Mathias Doenitz, Johannes Rudolph - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * Copyright (C) 2014 Mathias Doenitz - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ diff --git a/engine/language-server/src/main/resources/application.conf b/engine/language-server/src/main/resources/application.conf index 2f4369cdccfe..3faa81f78622 100644 --- a/engine/language-server/src/main/resources/application.conf +++ b/engine/language-server/src/main/resources/application.conf @@ -23,6 +23,7 @@ akka { } log-dead-letters = 1 log-dead-letters-during-shutdown = off + library-extensions = ["akka.stream.SystemMaterializer$"] } logging-service { diff --git a/engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala b/engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala index 91563928c52b..f55fe0ca399b 100644 --- a/engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala +++ b/engine/language-server/src/main/scala/org/enso/languageserver/boot/MainModule.scala @@ -1,6 +1,7 @@ package org.enso.languageserver.boot import akka.actor.ActorSystem +import akka.stream.Materializer import buildinfo.Info import com.typesafe.config.ConfigFactory import org.enso.distribution.locking.{ @@ -62,7 +63,6 @@ import java.io.{File, PrintStream} import java.net.URI import java.nio.charset.StandardCharsets import java.time.Clock - import scala.concurrent.duration.DurationInt /** A main module containing all components of the server. @@ -110,7 +110,7 @@ class MainModule(serverConfig: LanguageServerConfig, logLevel: Level) { ) log.trace("Created Language Server config [{}]", languageServerConfig) - implicit val system: ActorSystem = + val system: ActorSystem = ActorSystem( serverConfig.name, None, @@ -453,7 +453,7 @@ class MainModule(serverConfig: LanguageServerConfig, logLevel: Level) { profilingManager = profilingManager, libraryConfig = libraryConfig, config = languageServerConfig - ) + )(system) log.trace( "Created JSON connection controller factory [{}]", jsonRpcControllerFactory @@ -466,6 +466,7 @@ class MainModule(serverConfig: LanguageServerConfig, logLevel: Level) { Some(_) ) + val materializer: Materializer = Materializer.createMaterializer(system) val jsonRpcServer = new JsonRpcServer( jsonRpcProtocolFactory, @@ -478,21 +479,21 @@ class MainModule(serverConfig: LanguageServerConfig, logLevel: Level) { ), List(healthCheckEndpoint, idlenessEndpoint), messagesCallback - ) + )(system, materializer) log.trace("Created JSON RPC Server [{}]", jsonRpcServer) val binaryServer = new BinaryWebSocketServer( InboundMessageDecoder, BinaryEncoder.empty, - new BinaryConnectionControllerFactory(fileManager), + new BinaryConnectionControllerFactory(fileManager)(system), BinaryWebSocketServer.Config( outgoingBufferSize = 100, lazyMessageTimeout = 10.seconds, secureConfig = secureConfig ), messagesCallback - ) + )(system, materializer) log.trace("Created Binary WebSocket Server [{}]", binaryServer) log.debug( diff --git a/lib/scala/json-rpc-server/src/main/scala/org/enso/jsonrpc/Server.scala b/lib/scala/json-rpc-server/src/main/scala/org/enso/jsonrpc/Server.scala index e15ab30469fd..ab2bc6c5f89a 100644 --- a/lib/scala/json-rpc-server/src/main/scala/org/enso/jsonrpc/Server.scala +++ b/lib/scala/json-rpc-server/src/main/scala/org/enso/jsonrpc/Server.scala @@ -29,7 +29,6 @@ abstract class Server(implicit private val system: ActorSystem) { .generateSSLContext() .map(ctx => ConnectionContext.httpsServer(ctx)) .toOption - }) httpsContext match { case Some(ctx) => diff --git a/tools/legal-review/engine/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/copyright-ignore b/tools/legal-review/engine/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/copyright-ignore deleted file mode 100644 index ad40277caa0d..000000000000 --- a/tools/legal-review/engine/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/copyright-ignore +++ /dev/null @@ -1,6 +0,0 @@ -Copyright (C) 2014-2022 Lightbend Inc. -Copyright (C) 2016-2022 Lightbend Inc. -Copyright (C) 2017-2022 Lightbend Inc. -Copyright (C) 2018-2022 Lightbend Inc. -Copyright (C) 2019-2022 Lightbend Inc. -Copyright (C) 2020-2022 Lightbend Inc. diff --git a/tools/legal-review/engine/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/copyright-keep b/tools/legal-review/engine/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/copyright-keep deleted file mode 100644 index 524d999be2a0..000000000000 --- a/tools/legal-review/engine/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/copyright-keep +++ /dev/null @@ -1 +0,0 @@ -Copyright (C) 2009-2022 Lightbend Inc. diff --git a/tools/legal-review/engine/com.typesafe.akka.akka-http-spray-json_2.13-10.2.10/copyright-ignore b/tools/legal-review/engine/com.typesafe.akka.akka-http-spray-json_2.13-10.2.10/copyright-ignore deleted file mode 100644 index 8b0e5f6afbee..000000000000 --- a/tools/legal-review/engine/com.typesafe.akka.akka-http-spray-json_2.13-10.2.10/copyright-ignore +++ /dev/null @@ -1 +0,0 @@ -Copyright (C) 2017-2022 Lightbend Inc. diff --git a/tools/legal-review/engine/com.typesafe.akka.akka-http-spray-json_2.13-10.2.10/copyright-keep b/tools/legal-review/engine/com.typesafe.akka.akka-http-spray-json_2.13-10.2.10/copyright-keep deleted file mode 100644 index 524d999be2a0..000000000000 --- a/tools/legal-review/engine/com.typesafe.akka.akka-http-spray-json_2.13-10.2.10/copyright-keep +++ /dev/null @@ -1 +0,0 @@ -Copyright (C) 2009-2022 Lightbend Inc. diff --git a/tools/legal-review/engine/com.typesafe.akka.akka-slf4j_2.13-2.6.20/copyright-keep b/tools/legal-review/engine/com.typesafe.akka.akka-slf4j_2.13-2.6.20/copyright-keep deleted file mode 100644 index 524d999be2a0..000000000000 --- a/tools/legal-review/engine/com.typesafe.akka.akka-slf4j_2.13-2.6.20/copyright-keep +++ /dev/null @@ -1 +0,0 @@ -Copyright (C) 2009-2022 Lightbend Inc. diff --git a/tools/legal-review/engine/io.spray.spray-json_2.13-1.3.6/copyright-add b/tools/legal-review/engine/io.spray.spray-json_2.13-1.3.6/copyright-add deleted file mode 100644 index 44c0cb9b3a92..000000000000 --- a/tools/legal-review/engine/io.spray.spray-json_2.13-1.3.6/copyright-add +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2009-2011 Mathias Doenitz - * Inspired by a similar implementation by Nathan Hamblen - * (https://github.com/dispatch/classic) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ diff --git a/tools/legal-review/engine/io.spray.spray-json_2.13-1.3.6/copyright-ignore b/tools/legal-review/engine/io.spray.spray-json_2.13-1.3.6/copyright-ignore deleted file mode 100644 index 053ca9c02af3..000000000000 --- a/tools/legal-review/engine/io.spray.spray-json_2.13-1.3.6/copyright-ignore +++ /dev/null @@ -1 +0,0 @@ -Copyright (C) 2009-2011 Mathias Doenitz diff --git a/tools/legal-review/engine/io.spray.spray-json_2.13-1.3.6/copyright-keep-context b/tools/legal-review/engine/io.spray.spray-json_2.13-1.3.6/copyright-keep-context deleted file mode 100644 index 417ee2c82e03..000000000000 --- a/tools/legal-review/engine/io.spray.spray-json_2.13-1.3.6/copyright-keep-context +++ /dev/null @@ -1,3 +0,0 @@ -Copyright (C) 2011 Mathias Doenitz -Copyright (C) 2011,2012 Mathias Doenitz, Johannes Rudolph -Copyright (C) 2014 Mathias Doenitz diff --git a/tools/legal-review/engine/report-state b/tools/legal-review/engine/report-state index 2d2f14fbec8e..55a3ad8170aa 100644 --- a/tools/legal-review/engine/report-state +++ b/tools/legal-review/engine/report-state @@ -1,3 +1,3 @@ -6C4CE7219F6329519E17E044BB32CFD43391B022D686B5BDCF6421E03DFC4858 -1CCB55F023131497A0E6A16BB5B2D63E5D842572D8638017816EF1D5474B0169 +B8E190EAB26B4EEB4E2BB1F20210F07138FF38C839073ACA2204BE14329CB2AA +1F2015D6CAFE507B4166169412A30F9675DB75495403F29DA86CFAB4E8B87511 0 diff --git a/tools/legal-review/project-manager/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/copyright-ignore b/tools/legal-review/project-manager/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/copyright-ignore deleted file mode 100644 index ad40277caa0d..000000000000 --- a/tools/legal-review/project-manager/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/copyright-ignore +++ /dev/null @@ -1,6 +0,0 @@ -Copyright (C) 2014-2022 Lightbend Inc. -Copyright (C) 2016-2022 Lightbend Inc. -Copyright (C) 2017-2022 Lightbend Inc. -Copyright (C) 2018-2022 Lightbend Inc. -Copyright (C) 2019-2022 Lightbend Inc. -Copyright (C) 2020-2022 Lightbend Inc. diff --git a/tools/legal-review/project-manager/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/copyright-keep b/tools/legal-review/project-manager/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/copyright-keep deleted file mode 100644 index 524d999be2a0..000000000000 --- a/tools/legal-review/project-manager/com.typesafe.akka.akka-actor-typed_2.13-2.6.20/copyright-keep +++ /dev/null @@ -1 +0,0 @@ -Copyright (C) 2009-2022 Lightbend Inc. diff --git a/tools/legal-review/project-manager/com.typesafe.akka.akka-http-spray-json_2.13-10.2.10/copyright-keep b/tools/legal-review/project-manager/com.typesafe.akka.akka-http-spray-json_2.13-10.2.10/copyright-keep deleted file mode 100644 index 8b470e12e7e5..000000000000 --- a/tools/legal-review/project-manager/com.typesafe.akka.akka-http-spray-json_2.13-10.2.10/copyright-keep +++ /dev/null @@ -1,2 +0,0 @@ -Copyright (C) 2009-2022 Lightbend Inc. -Copyright (C) 2017-2022 Lightbend Inc. diff --git a/tools/legal-review/project-manager/com.typesafe.akka.akka-slf4j_2.13-2.6.20/copyright-keep b/tools/legal-review/project-manager/com.typesafe.akka.akka-slf4j_2.13-2.6.20/copyright-keep deleted file mode 100644 index 524d999be2a0..000000000000 --- a/tools/legal-review/project-manager/com.typesafe.akka.akka-slf4j_2.13-2.6.20/copyright-keep +++ /dev/null @@ -1 +0,0 @@ -Copyright (C) 2009-2022 Lightbend Inc. diff --git a/tools/legal-review/project-manager/io.spray.spray-json_2.13-1.3.6/copyright-add b/tools/legal-review/project-manager/io.spray.spray-json_2.13-1.3.6/copyright-add deleted file mode 100644 index 44c0cb9b3a92..000000000000 --- a/tools/legal-review/project-manager/io.spray.spray-json_2.13-1.3.6/copyright-add +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2009-2011 Mathias Doenitz - * Inspired by a similar implementation by Nathan Hamblen - * (https://github.com/dispatch/classic) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ diff --git a/tools/legal-review/project-manager/io.spray.spray-json_2.13-1.3.6/copyright-ignore b/tools/legal-review/project-manager/io.spray.spray-json_2.13-1.3.6/copyright-ignore deleted file mode 100644 index 053ca9c02af3..000000000000 --- a/tools/legal-review/project-manager/io.spray.spray-json_2.13-1.3.6/copyright-ignore +++ /dev/null @@ -1 +0,0 @@ -Copyright (C) 2009-2011 Mathias Doenitz diff --git a/tools/legal-review/project-manager/io.spray.spray-json_2.13-1.3.6/copyright-keep-context b/tools/legal-review/project-manager/io.spray.spray-json_2.13-1.3.6/copyright-keep-context deleted file mode 100644 index 417ee2c82e03..000000000000 --- a/tools/legal-review/project-manager/io.spray.spray-json_2.13-1.3.6/copyright-keep-context +++ /dev/null @@ -1,3 +0,0 @@ -Copyright (C) 2011 Mathias Doenitz -Copyright (C) 2011,2012 Mathias Doenitz, Johannes Rudolph -Copyright (C) 2014 Mathias Doenitz diff --git a/tools/legal-review/project-manager/report-state b/tools/legal-review/project-manager/report-state index 29bcd8219a41..2368972b085d 100644 --- a/tools/legal-review/project-manager/report-state +++ b/tools/legal-review/project-manager/report-state @@ -1,3 +1,3 @@ -69E9EEFDB627E4C31E3C7184A7CF645047519F5D162D8BBA2715CB494C26E4FF -FC47A03D984C60193E6785C0EC0B681C0F8903F5AF4106AEB319F26F9B3A9CBB +1EB73A5C745136872667FB588773B0698E04F9F42ACF7A8BEFFB5BC0FDC36A0B +3D185D26D960B1B235E0F0CAE4ABACA05246566E65CAB48E1B65A1286CC31D93 0