Skip to content

Commit

Permalink
Prepare for Akka HTTP 10.5 (#4186)
Browse files Browse the repository at this point in the history
* build: Prepare for 10.5 release
* MiMa current branch
  • Loading branch information
johanandren authored Nov 9, 2022
1 parent 73a1d9f commit 0e85c49
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ You may also check out these [other resources](https://akka.io/get-involved/).

Depending on which version (or sometimes module) you want to work on, you should target a specific branch as explained below:

* `main` – active development branch of akka-http 10.4.x
* `release-10.2`branch for fixes to akka-http 10.2.x
* `release-10.1` – branch for fixes to akka-http 10.1.x
* `main` – active development branch of akka-http 10.5.x
* `release-10.4` - maintenance branch for akka-http 10.4.x
* `release-10.2`maintenance branch for akka-http 10.2.x (only critical bug and security fixes)

## Tags

Expand Down
4 changes: 2 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Business Source License 1.1
Parameters

Licensor: Lightbend, Inc.
Licensed Work: Akka HTTP 10.4.x
Licensed Work: Akka HTTP 10.5.x
The Licensed Work is (c) 2022 Lightbend Inc.
Additional Use Grant:
If you develop an application using a version of Play Framework that
Expand All @@ -15,7 +15,7 @@ Additional Use Grant:
Connecting to a Play Framework websocket and/or Play Framework
request/response bodies for server and play-ws client.

Change Date: 2025-10-25
Change Date: TBD ( 3 years after 10.5.0 release )

Change License: Apache License, Version 2.0

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ inThisBuild(Def.settings(
url("https://github.com/akka/akka-http/graphs/contributors"))
),
startYear := Some(2014),
licenses := Seq(("BUSL-1.1", url("https://raw.githubusercontent.com/akka/akka-http/main/LICENSE.txt"))), // FIXME change s/main/v10.4.1/ when released
licenses := Seq(("BUSL-1.1", url("https://raw.githubusercontent.com/akka/akka-http/main/LICENSE.txt"))), // FIXME change s/main/v10.5.0/ when released
description := "Akka Http: Modern, fast, asynchronous, streaming-first HTTP server and client.",
testOptions ++= Seq(
Tests.Argument(TestFrameworks.JUnit, "-q", "-v"),
Expand Down
4 changes: 2 additions & 2 deletions project/MiMa.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ object MiMa extends AutoPlugin {
override def trigger = allRequirements

// A fork is a branch of the project where new releases are created that are not ancestors of the current release line
val forks = Seq("10.2.")
val currentFork = "10.4."
val forks = Seq("10.2.", "10.4.")
val currentFork = "10.5."

// manually maintained list of previous versions to make sure all incompatibilities are found
// even if so far no files have been been created in this project's mima-filters directory
Expand Down
2 changes: 1 addition & 1 deletion scripts/create-release-issue.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
VERSION=$1
if [ -z $VERSION ]
then
echo specify the version name to be released, eg. 10.4.0
echo specify the version name to be released, eg. 10.5.0
else
sed -e 's/\$VERSION\$/'$VERSION'/g' docs/release-train-issue-template.md > /tmp/release-$VERSION.tmp
echo Created $(gh issue create --title "Release $VERSION" --body-file /tmp/release-$VERSION.md --milestone $VERSION --web)
Expand Down

0 comments on commit 0e85c49

Please sign in to comment.