Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/---bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ about: Create a report to help us improve

<!--
Please report issues regarding specific projects in their respective issue trackers, e.g.:
- Akka: https://github.com/akka/akka/issues
- Akka: https://github.com/akka/akka-core/issues
- Alpakka: https://github.com/akka/alpakka/issues
- Akka Persistence Cassandra Plugin: https://github.com/akka/akka-persistence-cassandra/issues
- ...
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/---feature-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ about: Suggest an idea for this project

<!--
Please report issues regarding specific projects in their respective issue trackers, e.g.:
- Akka: https://github.com/akka/akka/issues
- Akka: https://github.com/akka/akka-core/issues
- Alpakka: https://github.com/akka/alpakka/issues
- Akka Persistence Cassandra Plugin: https://github.com/akka/akka-persistence-cassandra/issues
- ...
Expand Down
7 changes: 0 additions & 7 deletions .github/ISSUE_TEMPLATE/---question.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: temurin:1.11.0.17 # align with akka/akka
jvm: temurin:1.11.0.17 # align with akka/akka-core

- name: Install graphviz
run: sudo apt-get install -y graphviz
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Pull Request validation states:

# Akka-http contributing guidelines

These guidelines apply to all Akka projects, by which we mean both the `akka/akka` repository,
These guidelines apply to all Akka projects, by which we mean both the `akka/akka-core` repository,
as well as any plugins or additional repos located under the Akka GitHub organisation, e.g. `akka/akka-http` and others.

These guidelines are meant to be a living document that should be changed and adapted as needed.
Expand Down Expand Up @@ -313,7 +313,7 @@ There is a number of ways timeouts can be defined in Akka tests. The following w

Special care should be given `expectNoMessage` calls, which indeed will wait the entire timeout before continuing, therefore a shorter timeout should be used in those, for example `200` or `300.millis`.

You can read up on remaining and friends in [TestKit.scala](https://github.com/akka/akka/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/akka/akka-core/blob/main/akka-testkit/src/main/scala/akka/testkit/TestKit.scala)

# Supporting infrastructure

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ private[http] final class Http2Ext(implicit val system: ActorSystem)
// Ignore incoming errors from the connection as they will cancel the binding.
// As far as it is known currently, these errors can only happen if a TCP error bubbles up
// from the TCP layer through the HTTP layer to the Http.IncomingConnection.flow.
// See https://github.com/akka/akka/issues/17992
// See https://github.com/akka/akka-core/issues/17992
case NonFatal(ex) =>
Done
}(ExecutionContext.parasitic)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2017-2024 Lightbend Inc. <https://www.lightbend.com>
*
* Copied and adapted from akka-remote
* https://github.com/akka/akka/blob/c90121485fcfc44a3cee62a0c638e1982d13d812/akka-remote/src/main/scala/akka/remote/artery/StageLogging.scala
* https://github.com/akka/akka-core/blob/c90121485fcfc44a3cee62a0c638e1982d13d812/akka-remote/src/main/scala/akka/remote/artery/StageLogging.scala
*/

package akka.http.impl.util
Expand All @@ -12,7 +12,7 @@ import akka.stream.stage.GraphStageLogic
import akka.event.LoggingAdapter

// TODO Try to reconcile with what Akka provides in StageLogging.
// We thought this could be removed when https://github.com/akka/akka/issues/18793 had been implemented
// We thought this could be removed when https://github.com/akka/akka-core/issues/18793 had been implemented
// but we need a few more changes to be able to override the default logger. So for now we keep it here.
/**
* INTERNAL API
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ class HttpExt @InternalStableApi /* constructor signature is hardcoded in Teleme
// Ignore incoming errors from the connection as they will cancel the binding.
// As far as it is known currently, these errors can only happen if a TCP error bubbles up
// from the TCP layer through the HTTP layer to the Http.IncomingConnection.flow.
// See https://github.com/akka/akka/issues/17992
// See https://github.com/akka/akka-core/issues/17992
case NonFatal(ex) => Done
}(ExecutionContext.parasitic)
} catch {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ abstract class ClientServerSpecBase(http2: Boolean) extends AkkaSpecWithMaterial

"log materialization errors in `bindFlow`" which {
"are triggered in `mapMaterialized`" in Utils.assertAllStagesStopped {
// FIXME racy feature, needs https://github.com/akka/akka/issues/17849 to be fixed
// FIXME racy feature, needs https://github.com/akka/akka-core/issues/17849 to be fixed
pending
val flow = Flow[HttpRequest].map(_ => HttpResponse()).mapMaterializedValue(_ => sys.error("BOOM"))
val binding = Http(system2).newServerAt("localhost", 0).bindFlow(flow)
Expand Down Expand Up @@ -629,7 +629,7 @@ abstract class ClientServerSpecBase(http2: Boolean) extends AkkaSpecWithMaterial
// https://github.com/akka/akka-http/issues/3963
if (http2) pending

// In akka/akka#19542 / akka/akka-http#459 it was observed that when an akka-http closes the connection after
// In akka/akka-core#19542 / akka/akka-http#459 it was observed that when an akka-http closes the connection after
// a request, the TCP connection is sometimes aborted. Aborting means that `socket.close` is called with SO_LINGER = 0
// which removes the socket immediately from the OS network stack. This might happen with or without having sent
// a FIN frame first and with or without actively sending a RST frame. However, if the client has not received all data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ trait MultipartUnmarshallersSpec extends AkkaSpecWithMaterializer {
RawHeader("Content-Additional-2", "really-anything")))) // verifies order of headers is preserved
}
// TODO: reactivate after multipart/form-data unmarshalling integrity verification is implemented
// see https://github.com/akka/akka/issues/18908
// see https://github.com/akka/akka-core/issues/18908
//
// "reject illegal multipart content" in {
// val Left(MalformedContent(msg, _)) = HttpEntity(`multipart/form-data` withBoundary "XYZABC", "--noboundary--").as[MultipartFormData]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ abstract class HeaderDirectives extends FutureDirectives {
*
* @group header
*/
// TODO When breaking binary compatibility this should become HttpOriginRange.Default, see https://github.com/akka/akka/pull/20776/files#r70049845
// TODO When breaking binary compatibility this should become HttpOriginRange.Default, see https://github.com/akka/akka-core/pull/20776/files#r70049845
def checkSameOrigin(allowed: HttpOriginRange, inner: jf.Supplier[Route]): Route =
allowed match {
case HttpOriginRanges.ALL | akka.http.scaladsl.model.headers.HttpOriginRange.`*` => pass(inner)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ trait PredefinedToResponseMarshallers extends LowPriorityToResponseMarshallerImp
// whole request with a "406 Not Acceptable" response.
//
// Adding the opaque fallback rendering will give an escape hatch for those situations.
// See akka/akka#19397, akka/akka#19842, and #1072.
// See akka/akka-core#19397, akka/akka-core#19842, and #1072.
mappedMarshallings match {
case Nil => Nil
case firstMarshalling :: _ => mappedMarshallings :+ firstMarshalling.toOpaque(HttpCharsets.`UTF-8`)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ class Http2ClientSpec extends AkkaSpecWithMaterializer("""

network.sendHEADERS(TheStreamId, endStream = true, Seq(RawHeader(":grpc-status", "0")))
// This '.request(1)' can be removed when we move to Akka 2.6, since that has
// https://github.com/akka/akka/pull/28467
// https://github.com/akka/akka-core/pull/28467
entityDataIn.request(1)
entityDataIn.expectComplete()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ abstract class Http2PersistentClientSpec(tls: Boolean) extends AkkaSpecWithMater
)
override protected def isSevere(event: Logging.LogEvent): Boolean =
event.level <= Logging.WarningLevel &&
// fix for https://github.com/akka/akka-http/issues/3732 / https://github.com/akka/akka/issues/29330
// fix for https://github.com/akka/akka-http/issues/3732 / https://github.com/akka/akka-core/issues/29330
!notSevere.exists(cand => event.message.toString.contains(cand))

case class RequestId(id: String) extends RequestResponseAssociation
Expand Down
10 changes: 1 addition & 9 deletions docs/release-train-issue-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,7 @@ Key links:

### Announcements

For important patch releases, and only if critical issues have been fixed:

- [ ] Send a release notification to [Lightbend discuss](https://discuss.akka.io)
- [ ] Tweet using the [@akkateam](https://twitter.com/akkateam/) account (or ask someone to) about the new release
- [ ] Announce internally (with links to Tweet, discuss)

For minor or major releases:

- [ ] Include noteworthy features and improvements in Akka umbrella release announcement at akka.io. Coordinate with PM and marketing.
For important patch releases, and if critical issues have been fixed.

### Afterwards

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ Http().newServerAt("0.0.0.0", port = 8080).bind(routes)
### Other removed features

* `respondWithStatus` also known as `overrideStatusCode` has not been forward ported to Akka HTTP,
as it has been seen mostly as an anti-pattern. More information here: <https://github.com/akka/akka/issues/18626>
as it has been seen mostly as an anti-pattern. More information here: <https://github.com/akka/akka-core/issues/18626>
* `respondWithMediaType` was considered an anti-pattern in spray and is not ported to Akka HTTP.
Instead users should rely on content type negotiation as Akka HTTP implements it.
More information here: [#190](https://github.com/akka/akka-http/issues/190)
Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/paradox/server-side/server-https-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ Java

For further (custom) certificate checks, you can access the `javax.net.ssl.SSLSession` via the `sslSession` attribute.

At this point dynamic renegotiation of the certificates to be used is not implemented. For details see [issue #18351](https://github.com/akka/akka/issues/18351)
and some preliminary work in [PR #19787](https://github.com/akka/akka/pull/19787).
At this point dynamic renegotiation of the certificates to be used is not implemented. For details see [issue #18351](https://github.com/akka/akka-core/issues/18351)
and some preliminary work in [PR #19787](https://github.com/akka/akka-core/pull/19787).

## Rotating certificates

Expand Down
4 changes: 2 additions & 2 deletions project/ValidatePullRequest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ object AkkaHttpValidatePullRequest extends AutoPlugin {
override lazy val buildSettings = Seq(
validatePullRequest / includeFilter := ValidatePullRequest.PathGlobFilter("akka-http-*/**"),
validatePullRequestBuildAll / excludeFilter := ValidatePullRequest.PathGlobFilter("project/MiMa.scala"),
prValidatorGithubRepository := Some("akka/akka"),
prValidatorGithubRepository := Some("akka/akka-core"),
prValidatorTargetBranch := "origin/main")

override lazy val projectSettings = inConfig(ValidatePR)(Defaults.testTasks) ++ Seq(
Expand Down Expand Up @@ -82,4 +82,4 @@ object ParadoxWithPrValidation extends AutoPlugin {
object UnidocWithPrValidation extends AutoPlugin {
override def trigger = noTrigger
override lazy val projectSettings = Seq(AkkaHttpValidatePullRequest.additionalTasks += Compile / unidoc)
}
}
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
addSbtPlugin("com.github.sbt" % "sbt-boilerplate" % "0.7.0")
addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.3")
addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2")
addSbtPlugin("io.akka" % "sbt-paradox-akka" % "25.10.0")
addSbtPlugin("io.akka" % "sbt-paradox-akka" % "25.10.2")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.32")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
Expand Down
6 changes: 3 additions & 3 deletions scripts/release_stats.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ declare author_count=$(echo "$authors" | wc -l | grep -o '[1-9].*')
declare diff_short=$(git diff --shortstat $tag_range | grep -o '[1-9].*')

declare script_user_agent="User-Agent: Akka-Stats-Script"
declare open_milestones=$(curl -s -H "$script_user_agent" "https://api.github.com/repos/akka/akka/milestones?state=open")
declare closed_milestones=$(curl -s -H "$script_user_agent" "https://api.github.com/repos/akka/akka/milestones?state=closed")
declare open_milestones=$(curl -s -H "$script_user_agent" "https://api.github.com/repos/akka/akka-core/milestones?state=open")
declare closed_milestones=$(curl -s -H "$script_user_agent" "https://api.github.com/repos/akka/akka-core/milestones?state=closed")
declare milestone_id=$(echo "$open_milestones$closed_milestones" | sed 's/"description"/\n/g' | perl -ne 'm/number":([0-9]+),"title":"(.+?)",/ && print "$1,$2\n"' | grep "$milestone_name" | cut -d"," -f 1)
declare tickets=$(curl -s -H "$script_user_agent" "https://api.github.com/repos/akka/akka/issues?milestone=$milestone_id&state=all&per_page=100" | sed 's/"comments"/\n/g' | perl -ne 'm/number":([0-9]+),"title":"(.+?)",/ && print " - *$1* $2\n"' | sort -n)
declare tickets=$(curl -s -H "$script_user_agent" "https://api.github.com/repos/akka/akka-core/issues?milestone=$milestone_id&state=all&per_page=100" | sed 's/"comments"/\n/g' | perl -ne 'm/number":([0-9]+),"title":"(.+?)",/ && print " - *$1* $2\n"' | sort -n)
declare ticket_count=$(echo "$tickets" | wc -l | grep -o '[1-9].*')

echo "$tag1 compared to Akka $tag2":
Expand Down
Loading