From 0e85c494abf0de89c3400da2824cd4c2f375c485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Wed, 9 Nov 2022 17:06:11 +0100 Subject: [PATCH] Prepare for Akka HTTP 10.5 (#4186) * build: Prepare for 10.5 release * MiMa current branch --- CONTRIBUTING.md | 6 +++--- LICENSE.txt | 4 ++-- build.sbt | 2 +- project/MiMa.scala | 4 ++-- scripts/create-release-issue.sh | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5a97b4ca638..b5c391d9f49 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 diff --git a/LICENSE.txt b/LICENSE.txt index a88a871389b..58fc7ae188e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -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 @@ -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 diff --git a/build.sbt b/build.sbt index 840276d889a..2672cd8adbb 100644 --- a/build.sbt +++ b/build.sbt @@ -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"), diff --git a/project/MiMa.scala b/project/MiMa.scala index 6ca72e567a5..6f3255ea9de 100644 --- a/project/MiMa.scala +++ b/project/MiMa.scala @@ -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 diff --git a/scripts/create-release-issue.sh b/scripts/create-release-issue.sh index 343e5c887a0..e7ca938fa94 100755 --- a/scripts/create-release-issue.sh +++ b/scripts/create-release-issue.sh @@ -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)