Skip to content

Commit

Permalink
Rename sbt akka modules
Browse files Browse the repository at this point in the history
Co-authored-by: Sean Glover <sean@seanglover.com>
  • Loading branch information
mdedetrich and seglo authored Jan 5, 2023
1 parent b92b749 commit 24c03cd
Show file tree
Hide file tree
Showing 2,930 changed files with 1,466 additions and 1,462 deletions.
2 changes: 1 addition & 1 deletion .github/autolabeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

dependency-change: "/project/Dependencies.scala"

't:stream': ["/akka-stream", "/akka-stream-testkit", "/akka-stream-tests", "/akka-stream-tests-tck", "/akka-stream-typed"]
't:stream': ["/stream", "/stream-testkit", "/stream-tests", "/stream-tests-tck", "/stream-typed"]
14 changes: 7 additions & 7 deletions .github/workflows/nightly-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Enable jvm-opts
run: cp .jvmopts-ci .jvmopts

- name: sbt akka-cluster-metrics/test
- name: sbt cluster-metrics/test
run: |-
sbt \
-Djava.security.egd=file:/dev/./urandom \
Expand All @@ -44,7 +44,7 @@ jobs:
-Dmultinode.Xmx256M \
-Dmultinode.Xlog:gc \
-Dmultinode.XX:+AlwaysActAsServerClassMachine \
clean akka-cluster-metrics/test
clean cluster-metrics/test
# comment out test report until an apache or GitHub published action (action-surefire-report) can be found or added allowlist from INFRA
# - name: Test Reports
Expand Down Expand Up @@ -80,9 +80,9 @@ jobs:
fail-fast: false
matrix:
command:
- akka-cluster/test akka-distributed-data/test akka-cluster-tools/test akka-cluster-metrics/test
- akka-cluster-sharding/test
- akka-cluster-typed/test akka-cluster-sharding-typed/test
- cluster/test distributed-data/test cluster-tools/test cluster-metrics/test
- cluster-sharding/test
- cluster-typed/test cluster-sharding-typed/test
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -240,8 +240,8 @@ jobs:
fail-fast: false
matrix:
command:
- akka-remote/test akka-remote-tests/test
- akka-cluster/test akka-cluster-typed/test
- remote/test remote-tests/test
- cluster/test cluster-typed/test
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/scala3-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ jobs:
strategy:
matrix:
command:
- akka-testkit/test akka-actor-tests/test
- akka-actor-testkit-typed/test akka-actor-typed-tests/test
- akka-bench-jmh/test
- akka-cluster/test akka-cluster-tools/test akka-cluster-typed/test akka-distributed-data/test akka-cluster-metrics/test akka-cluster-sharding/test akka-cluster-sharding-typed/test
- akka-discovery/test akka-coordination/test
- akka-persistence/test akka-persistence-shared/test akka-persistence-query/test akka-persistence-typed/test akka-persistence-testkit/test akka-persistence-tck/test akka-persistence-typed-tests/test
- akka-pki/test akka-slf4j/test
- akka-serialization-jackson/test
- akka-stream/test akka-stream-testkit/test akka-stream-tests/test akka-stream-typed/test
- akka-stream-tests-tck/test
- akka-remote/test akka-remote-tests/test akka-protobuf/test akka-protobuf-v3/test
- testkit/test actor-tests/test
- actor-testkit-typed/test actor-typed-tests/test
- bench-jmh/test
- cluster/test cluster-tools/test cluster-typed/test distributed-data/test cluster-metrics/test cluster-sharding/test cluster-sharding-typed/test
- discovery/test coordination/test
- persistence/test persistence-shared/test persistence-query/test persistence-typed/test persistence-testkit/test persistence-tck/test persistence-typed-tests/test
- pki/test slf4j/test
- serialization-jackson/test
- stream/test stream-testkit/test stream-tests/test stream-typed/test
- stream-tests-tck/test
- remote/test remote-tests/test protobuf/test protobuf-v3/test
fail-fast: true
steps:
- name: Checkout
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/scala3-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ jobs:
strategy:
matrix:
command:
- akka-testkit/Test/compile akka-actor-tests/Test/compile
- akka-actor-testkit-typed/Test/compile akka-actor-typed-tests/Test/compile
- akka-bench-jmh/Test/compile
- akka-cluster/Test/compile akka-cluster-tools/Test/compile akka-cluster-typed/Test/compile akka-distributed-data/Test/compile akka-cluster-metrics/Test/compile akka-cluster-sharding/Test/compile akka-cluster-sharding-typed/Test/compile
- akka-discovery/Test/compile akka-coordination/Test/compile
- akka-persistence/Test/compile akka-persistence-shared/Test/compile akka-persistence-query/Test/compile akka-persistence-typed/Test/compile akka-persistence-testkit/Test/compile akka-persistence-tck/Test/compile akka-persistence-typed-tests/Test/compile
- akka-pki/Test/compile akka-slf4j/Test/compile
- akka-serialization-jackson/Test/compile
- akka-stream/Test/compile akka-stream-testkit/Test/compile akka-stream-tests/Test/compile akka-stream-typed/Test/compile
- akka-stream-tests-tck/Test/compile
- akka-remote/Test/compile akka-remote-tests/Test/compile akka-protobuf/Test/compile akka-protobuf-v3/Test/compile
- testkit/Test/compile actor-tests/Test/compile
- actor-testkit-typed/Test/compile actor-typed-tests/Test/compile
- bench-jmh/Test/compile
- cluster/Test/compile cluster-tools/Test/compile cluster-typed/Test/compile distributed-data/Test/compile cluster-metrics/Test/compile cluster-sharding/Test/compile cluster-sharding-typed/Test/compile
- discovery/Test/compile coordination/Test/compile
- persistence/Test/compile persistence-shared/Test/compile persistence-query/Test/compile persistence-typed/Test/compile persistence-testkit/Test/compile persistence-tck/Test/compile persistence-typed-tests/Test/compile
- pki/Test/compile slf4j/Test/compile
- serialization-jackson/Test/compile
- stream/Test/compile stream-testkit/Test/compile stream-tests/Test/compile stream-typed/Test/compile
- stream-tests-tck/Test/compile
- remote/Test/compile remote-tests/Test/compile protobuf/Test/compile protobuf-v3/Test/compile
fail-fast: true
steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ activemq-data
docs/_build/
docs/exts/
docs/rst_preprocessed/
akka-osgi/src/main/resources/*.conf
osgi/src/main/resources/*.conf
akka.sublime-project
akka.sublime-workspace
akka.tmproj
Expand All @@ -64,7 +64,7 @@ metals.sbt
mongoDB/
multiverse.log
out
project/akka-build.properties
project/pekko-build.properties
project/boot/*
project/plugins/project
redis/
Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ The Pekko build includes a special task called `validatePullRequest`, which inve
(uncommitted changes) in your local working directory and figures out which projects are impacted by those changes,
then running tests only on those projects.

For example, changing something in `akka-actor` would cause tests to be run in all projects which depend on it
(e.g. `akka-actor-tests`, `akka-stream`, `docs` etc.).
For example, changing something in `actor` would cause tests to be run in all projects which depend on it
(e.g. `actor-tests`, `stream`, `docs` etc.).

To use the task, simply type `validatePullRequest`, and the output should include entries like shown below:

Expand Down Expand Up @@ -258,7 +258,7 @@ PR fails due to binary compatibility issues, you may see an error like this:
In such situations it's good to consult with a core team member whether the violation can be safely ignored or if it would indeed
break binary compatibility. If the violation can be ignored add exclude statements from the mima output to
a new file named `<module>/src/main/mima-filters/<last-version>.backwards.excludes/<pr-or-issue>-<issue-number>-<description>.excludes`,
e.g. `akka-actor/src/main/mima-filters/2.6.0.backwards.excludes/pr-12345-rename-internal-classes.excludes`. Make sure to add a comment
e.g. `actor/src/main/mima-filters/2.6.0.backwards.excludes/pr-12345-rename-internal-classes.excludes`. Make sure to add a comment
in the file that describes briefly why the incompatibility can be ignored.

Situations when it may be acceptable to ignore a MiMa issued warning include:
Expand Down Expand Up @@ -424,8 +424,8 @@ For first time contributors, the workflow will be run after an approval from a c

To speed up PR validation times the Akka build contains a special sbt task called `validatePullRequest`,
which is smart enough to figure out which projects should be built if a PR only has changes in some parts of the project.
For example, if your PR only touches `akka-persistence`, no `akka-remote` tests need to be run, however the task
will validate all projects that depend on `akka-persistence` (including samples).
For example, if your PR only touches `persistence`, no `remote` tests need to be run, however the task
will validate all projects that depend on `persistence` (including samples).
Also, tests tagged as `PerformanceTest`, `TimingTest`, `LongRunningTest`, and all multi-node tests are excluded from PR validation.

You can exclude the same kind of tests in your local build by starting sbt with:
Expand Down Expand Up @@ -494,7 +494,7 @@ There are a number of ways timeouts can be defined in Pekko tests. The following

Special care should be given to `expectNoMessage` calls, which indeed will wait for the entire timeout before continuing. Therefore a shorter timeout should be used in those, for example `200.millis` or `300.millis`. Prefer the method without timeout parameter, which will use the configured `expect-no-message-default` timeout.

You can read up on `remaining` and friends in [TestKit.scala](https://github.com/apache/incubator-pekko/blob/main/akka-testkit/src/main/scala/akka/testkit/TestKit.scala).
You can read up on `remaining` and friends in [TestKit.scala](https://github.com/apache/incubator-pekko/blob/main/testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala).

### Contributing modules

Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,6 @@ Licenses for dependency projects can be found here:

---------------

akka-protobuf contains the sources of Google protobuf 2.5.0 runtime support,
moved into the source package `akka.protobuf` so as to avoid version conflicts.
pekko-protobuf contains the sources of Google protobuf 2.5.0 runtime support,
moved into the source package `org.apache.pekko.protobuf` so as to avoid version conflicts.
For license information see COPYING.protobuf
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import pekko.testkit.PekkoSpec
class ConfigSpec extends PekkoSpec(ConfigFactory.defaultReference(ActorSystem.findClassLoader())) with Assertions {

"The default configuration file (i.e. reference.conf)" must {
"contain all configuration properties for akka-actor that are used in code with their correct defaults" in {
"contain all configuration properties for pekko-actor that are used in code with their correct defaults" in {

val settings = system.settings
val config = settings.config
Expand Down Expand Up @@ -174,15 +174,15 @@ class ConfigSpec extends PekkoSpec(ConfigFactory.defaultReference(ActorSystem.fi
}

"SLF4J Settings" must {
"not be amended for default reference in akka-actor" in {
"not be amended for default reference in pekko-actor" in {
val dynamicAccess = system.asInstanceOf[ExtendedActorSystem].dynamicAccess
val config = ActorSystem.Settings.amendSlf4jConfig(ConfigFactory.defaultReference(), dynamicAccess)
config.getStringList("pekko.loggers").size() should ===(1)
config.getStringList("pekko.loggers").get(0) should ===(classOf[DefaultLogger].getName)
config.getString("pekko.logging-filter") should ===(classOf[DefaultLoggingFilter].getName)
}

"not be amended when akka-slf4j is not in classpath" in {
"not be amended when pekko-slf4j is not in classpath" in {
val dynamicAccess = system.asInstanceOf[ExtendedActorSystem].dynamicAccess
val config = ActorSystem.Settings.amendSlf4jConfig(
ConfigFactory.parseString("pekko.use-slf4j = on").withFallback(ConfigFactory.defaultReference()),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ abstract class DockerBindDnsService(config: Config) extends PekkoSpec(config) wi
"53/tcp" -> List(PortBinding.of("", hostPort)).asJava,
"53/udp" -> List(PortBinding.of("", hostPort)).asJava).asJava)
.binds(HostConfig.Bind
.from(new java.io.File("akka-actor-tests/src/test/bind/").getAbsolutePath)
.from(new java.io.File("actor-tests/src/test/bind/").getAbsolutePath)
.to("/data/bind")
.build())
.build())
.build()

val containerName = "akka-test-dns-" + getClass.getCanonicalName
val containerName = "pekko-test-dns-" + getClass.getCanonicalName

client
.listContainers(ListContainersParam.allContainers())
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* Copyright (C) 2020-2022 Lightbend Inc. <https://www.lightbend.com>
*/

package org.apache.pekko.util

import org.apache.pekko.testkit.PekkoSpec

class ManifestInfoSpec extends PekkoSpec {
"ManifestInfo" should {
"produce a clear message" in {
val versions = Map(
"pekko-actor" -> new ManifestInfo.Version("2.6.4"),
"pekko-persistence" -> new ManifestInfo.Version("2.5.3"),
"pekko-cluster" -> new ManifestInfo.Version("2.5.3"),
"unrelated" -> new ManifestInfo.Version("2.5.3"))
val allModules = List("pekko-actor", "pekko-persistence", "pekko-cluster")
ManifestInfo.checkSameVersion("Pekko", allModules, versions) shouldBe Some(
"You are using version 2.6.4 of Pekko, but it appears you (perhaps indirectly) also depend on older versions of related artifacts. " +
"You can solve this by adding an explicit dependency on version 2.6.4 of the [pekko-persistence, pekko-cluster] artifacts to your project. " +
"Here's a complete collection of detected artifacts: (2.5.3, [pekko-cluster, pekko-persistence]), (2.6.4, [pekko-actor]). " +
"See also: https://doc.akka.io/docs/akka/current/common/binary-compatibility-rules.html#mixed-versioning-is-not-allowed")
}

"support dynver" in {
val versions = Map(
"pekko-actor" -> new ManifestInfo.Version("2.6.4"),
"pekko-persistence" -> new ManifestInfo.Version("2.6.4+10-abababef"))
val allModules = List("pekko-actor", "pekko-persistence")
ManifestInfo.checkSameVersion("Pekko", allModules, versions) shouldBe Some(
"You are using version 2.6.4+10-abababef of Pekko, but it appears you (perhaps indirectly) also depend on older versions of related artifacts. " +
"You can solve this by adding an explicit dependency on version 2.6.4+10-abababef of the [pekko-actor] artifacts to your project. " +
"Here's a complete collection of detected artifacts: (2.6.4, [pekko-actor]), (2.6.4+10-abababef, [pekko-persistence]). " +
"See also: https://doc.akka.io/docs/akka/current/common/binary-compatibility-rules.html#mixed-versioning-is-not-allowed")
}
}
}
Loading

0 comments on commit 24c03cd

Please sign in to comment.