This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch 1.0.x
in repository https://gitbox.apache.org/repos/asf/pekko-http.git
The following commit(s) were added to refs/heads/1.0.x by this push:
new 4b1dcdb30 Pekko becomes a TLP (#520) (#521)
4b1dcdb30 is described below
commit 4b1dcdb30db152fa26ce25d262f71acae0dddff3
Author: PJ Fanning <[email protected]>
AuthorDate: Fri Mar 22 16:08:35 2024 +0100
Pekko becomes a TLP (#520) (#521)
---
.github/ISSUE_TEMPLATE/---bug-report.md | 6 ++--
.github/ISSUE_TEMPLATE/---feature-request.md | 6 ++--
.github/workflows/format.yml | 2 +-
.github/workflows/link-validator.yml | 4 +--
.github/workflows/nightly.yml | 2 +-
.github/workflows/publish-1.0-docs.yml | 2 +-
.github/workflows/publish-test-reports.yml | 2 +-
.github/workflows/publish.yml | 4 +--
.github/workflows/validate-and-test.yml | 6 ++--
CONTRIBUTING.md | 38 +++++++++++-----------
DISCLAIMER | 10 ------
README.md | 10 +++---
build.sbt | 4 +--
docs/src/main/paradox/contributing.md | 2 +-
docs/src/main/paradox/introduction.md | 8 ++---
docs/src/main/paradox/release-notes/index.md | 14 ++++----
docs/src/main/paradox/routing-dsl/index.md | 2 +-
http-core/src/main/resources/reference.conf | 4 +--
.../engine/client/pool/NewHostConnectionPool.scala | 4 +--
.../impl/engine/parsing/HttpResponseParser.scala | 2 +-
.../http/impl/util/StageLoggingWithOverride.scala | 2 +-
.../scaladsl/testkit/ScalatestRouteTestSpec.scala | 2 +-
.../apache/pekko/http/javadsl/server/HttpApp.java | 2 +-
.../pekko/http/scaladsl/server/HttpApp.scala | 2 +-
legal/PekkoNotice.txt | 2 +-
project/AddMetaInfLicenseFiles.scala | 3 +-
project/GitHub.scala | 2 +-
project/ParadoxSupport.scala | 2 +-
project/Publish.scala | 2 +-
project/ValidatePullRequest.scala | 2 +-
project/project-info.conf | 6 ++--
31 files changed, 74 insertions(+), 85 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md
b/.github/ISSUE_TEMPLATE/---bug-report.md
index fc13f0dcf..3efda65b3 100644
--- a/.github/ISSUE_TEMPLATE/---bug-report.md
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -6,9 +6,9 @@ about: Create a report to help us improve
<!--
Please report issues regarding specific projects in their respective issue
trackers, e.g.:
- - Pekko: https://github.com/apache/incubator-pekko/issues
- - Pekko Connectors:
https://github.com/apache/incubator-pekko-connectors/issues
- - Pekko Persistence Cassandra Plugin:
https://github.com/apache/incubator-pekko-persistence-cassandra/issues
+ - Pekko: https://github.com/apache/pekko/issues
+ - Pekko Connectors: https://github.com/apache/pekko-connectors/issues
+ - Pekko Persistence Cassandra Plugin:
https://github.com/apache/pekko-persistence-cassandra/issues
- ...
Please explain your issue precisely, and if possible provide a reproducer
snippet (this helps resolve issues much quicker).
diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md
b/.github/ISSUE_TEMPLATE/---feature-request.md
index 84b141cc7..80fa37f81 100644
--- a/.github/ISSUE_TEMPLATE/---feature-request.md
+++ b/.github/ISSUE_TEMPLATE/---feature-request.md
@@ -6,9 +6,9 @@ about: Suggest an idea for this project
<!--
Please report issues regarding specific projects in their respective issue
trackers, e.g.:
- - Pekko: https://github.com/apache/incubator-pekko/issues
- - Pekko Connectors:
https://github.com/apache/incubator-pekko-connectors/issues
- - Pekko Persistence Cassandra Plugin:
https://github.com/apache/incubator-pekko-persistence-cassandra/issues
+ - Pekko: https://github.com/apache/pekko/issues
+ - Pekko Connectors: https://github.com/apache/pekko-connectors/issues
+ - Pekko Persistence Cassandra Plugin:
https://github.com/apache/pekko-persistence-cassandra/issues
- ...
Please explain your issue precisely, and if possible provide a reproducer
snippet (this helps resolve issues much quicker).
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 82469d9d8..7b2e54aca 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -10,7 +10,7 @@ jobs:
build:
name: Code is formatted
runs-on: ubuntu-latest
- if: github.repository == 'apache/incubator-pekko-http'
+ if: github.repository == 'apache/pekko-http'
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v4
diff --git a/.github/workflows/link-validator.yml
b/.github/workflows/link-validator.yml
index 6b35149f0..a9fbe89e2 100644
--- a/.github/workflows/link-validator.yml
+++ b/.github/workflows/link-validator.yml
@@ -11,7 +11,7 @@ on:
jobs:
validate-links:
runs-on: ubuntu-20.04
- if: github.repository == 'apache/incubator-pekko-http'
+ if: github.repository == 'apache/pekko-http'
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -22,7 +22,7 @@ jobs:
git fetch origin pull/${{ github.event.pull_request.number
}}/merge:scratch
git checkout scratch
- # needs Java 8, see
https://github.com/apache/incubator-pekko-http/pull/204#discussion_r1265279415
+ # needs Java 8, see
https://github.com/apache/pekko-http/pull/204#discussion_r1265279415
- name: Setup Java 8
uses: actions/setup-java@v3
with:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index b3e1e351f..52d3017af 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -9,7 +9,7 @@ jobs:
compile-and-test:
name: Compile and test
runs-on: ubuntu-latest
- if: github.repository == 'apache/incubator-pekko-http'
+ if: github.repository == 'apache/pekko-http'
strategy:
fail-fast: false
matrix:
diff --git a/.github/workflows/publish-1.0-docs.yml
b/.github/workflows/publish-1.0-docs.yml
index 20c8e2473..fdabbb155 100644
--- a/.github/workflows/publish-1.0-docs.yml
+++ b/.github/workflows/publish-1.0-docs.yml
@@ -24,7 +24,7 @@ jobs:
publish-docs:
name: Publish documentation to nightlies.apache.org
runs-on: ubuntu-latest
- if: github.repository == 'apache/incubator-pekko-http'
+ if: github.repository == 'apache/pekko-http'
steps:
- name: Checkout
uses: actions/checkout@v4
diff --git a/.github/workflows/publish-test-reports.yml
b/.github/workflows/publish-test-reports.yml
index 653fcce37..55ee44e76 100644
--- a/.github/workflows/publish-test-reports.yml
+++ b/.github/workflows/publish-test-reports.yml
@@ -10,7 +10,7 @@ jobs:
publish-test-results:
name: "Publish details with dorny-test-reporter"
runs-on: ubuntu-latest
- if: github.repository == 'apache/incubator-pekko-http'
+ if: github.repository == 'apache/pekko-http'
strategy:
fail-fast: false
matrix:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 62c816958..e6abbba00 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -9,7 +9,7 @@ jobs:
publish-artifacts:
name: Publish artifacts to Apache Nexus
runs-on: ubuntu-latest
- if: github.repository == 'apache/incubator-pekko-http'
+ if: github.repository == 'apache/pekko-http'
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -39,7 +39,7 @@ jobs:
publish-docs:
name: Publish documentation to nightlies.apache.org
runs-on: ubuntu-latest
- if: github.repository == 'apache/incubator-pekko-http'
+ if: github.repository == 'apache/pekko-http'
steps:
- name: Checkout
uses: actions/checkout@v4
diff --git a/.github/workflows/validate-and-test.yml
b/.github/workflows/validate-and-test.yml
index d05249ffc..5a99e2574 100644
--- a/.github/workflows/validate-and-test.yml
+++ b/.github/workflows/validate-and-test.yml
@@ -15,7 +15,7 @@ jobs:
formatting-check:
name: Checks
runs-on: ubuntu-latest
- if: github.repository == 'apache/incubator-pekko-http'
+ if: github.repository == 'apache/pekko-http'
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -45,7 +45,7 @@ jobs:
run: git diff --exit-code --color
#- name: FOSSA policy check
- # if: ${{ github.event_name == 'push' ||
github.event.pull_request.head.repo.full_name == 'apache/incubator-pekko-http'
}}
+ # if: ${{ github.event_name == 'push' ||
github.event.pull_request.head.repo.full_name == 'apache/pekko-http' }}
# run: |-
# curl -H 'Cache-Control: no-cache'
https://raw.githubusercontent.com/fossas/spectrometer/master/install.sh | bash
# fossa analyze && fossa test
@@ -55,7 +55,7 @@ jobs:
compile-and-test:
name: Compile and test
runs-on: ubuntu-latest
- if: github.repository == 'apache/incubator-pekko-http'
+ if: github.repository == 'apache/pekko-http'
strategy:
fail-fast: false
matrix:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1868579ad..44e939c37 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,27 +22,27 @@ Pekko HTTP uses tags to categorise issues into groups or
mark their phase in dev
Most notably many tags start `t:` prefix (as in `topic:`), which categorises
issues in terms of which module they relate to. Examples are:
--
[t:http:core](https://github.com/apache/incubator-pekko-http/issues?q=is%3Aopen+is%3Aissue+label%3At%3Ahttp%3Acore)
--
[t:server:dsl](https://github.com/apache/incubator-pekko-http/issues?q=is%3Aopen+is%3Aissue+label%3At%3Ahttp%3Aserver%3Adsl)
-- see [all tags here](https://github.com/apache/incubator-pekko-http/labels)
+-
[t:http:core](https://github.com/apache/pekko-http/issues?q=is%3Aopen+is%3Aissue+label%3At%3Ahttp%3Acore)
+-
[t:server:dsl](https://github.com/apache/pekko-http/issues?q=is%3Aopen+is%3Aissue+label%3At%3Ahttp%3Aserver%3Adsl)
+- see [all tags here](https://github.com/apache/pekko-http/labels)
In general *all issues are open for anyone working on them*, however if you're
new to the project and looking for an issue
that will be accepted and likely is a nice one to get started you should check
out the following tags:
-- [help
wanted](https://github.com/apache/incubator-pekko-http/labels/help%20wanted) -
which identifies issues that the core team will likely not have time to work
on, or the issue is a nice entry level ticket. If you're not sure how to solve
a ticket but would like to work on it feel free to ask in the issue about
clarification or tips.
-- [nice-to-have
(low-priority)](https://github.com/apache/incubator-pekko-http/labels/nice-to-have%20%28low-prio%29)
- are tasks which make sense, however are not very high priority (in face of
other very high priority issues). If you see something interesting in this
list, a contribution would be really wonderful!
+- [help wanted](https://github.com/apache/pekko-http/labels/help%20wanted) -
which identifies issues that the core team will likely not have time to work
on, or the issue is a nice entry level ticket. If you're not sure how to solve
a ticket but would like to work on it feel free to ask in the issue about
clarification or tips.
+- [nice-to-have
(low-priority)](https://github.com/apache/pekko-http/labels/nice-to-have%20%28low-prio%29)
- are tasks which make sense, however are not very high priority (in face of
other very high priority issues). If you see something interesting in this
list, a contribution would be really wonderful!
Another group of tickets are those which start from a number. They're used to
signal in what phase of development an issue is:
-- [0 - new](https://github.com/apache/incubator-pekko-http/labels/0%20-%20new)
- is assigned when a ticket is unclear on it's purpose or if it is valid or
not. Sometimes the additional tag `discuss` is used to mark such tickets, if
they propose large scale changed and need more discussion before moving into
triaged (or being closed as invalid)
-- [1 -
triaged](https://github.com/apache/incubator-pekko-http/labels/1%20-%20triaged)
- roughly speaking means "this ticket makes sense". Triaged tickets are safe to
pick up for contributing in terms of likeliness of a patch for it being
accepted. It is not recommended to start working on a ticket that is not
triaged.
-- [2 - pick
next](https://github.com/apache/incubator-pekko-http/labels/2%20-%20pick%20next)
- used to mark issues which are next up in the queue to be worked on.
Sometimes it's also used to mark which PRs are expected to be reviewed/merged
for the next release. The tag is non-binding, and mostly used as organisational
helper.
-- [3 - in
progress](https://github.com/apache/incubator-pekko-http/labels/3%20-%20in%20progress)
- means someone is working on this ticket. If you see a ticket that has the
tag, however seems inactive, it could have been an omission with removing the
tag, feel free to ping the ticket then if it's still being worked on.
+- [0 - new](https://github.com/apache/pekko-http/labels/0%20-%20new) - is
assigned when a ticket is unclear on it's purpose or if it is valid or not.
Sometimes the additional tag `discuss` is used to mark such tickets, if they
propose large scale changed and need more discussion before moving into triaged
(or being closed as invalid)
+- [1 - triaged](https://github.com/apache/pekko-http/labels/1%20-%20triaged) -
roughly speaking means "this ticket makes sense". Triaged tickets are safe to
pick up for contributing in terms of likeliness of a patch for it being
accepted. It is not recommended to start working on a ticket that is not
triaged.
+- [2 - pick
next](https://github.com/apache/pekko-http/labels/2%20-%20pick%20next) - used
to mark issues which are next up in the queue to be worked on. Sometimes it's
also used to mark which PRs are expected to be reviewed/merged for the next
release. The tag is non-binding, and mostly used as organisational helper.
+- [3 - in
progress](https://github.com/apache/pekko-http/labels/3%20-%20in%20progress) -
means someone is working on this ticket. If you see a ticket that has the tag,
however seems inactive, it could have been an omission with removing the tag,
feel free to ping the ticket then if it's still being worked on.
The last group of special tags indicate specific states a ticket is in:
-- [bug](https://github.com/apache/incubator-pekko-http/labels/bug) - bugs take
priority in being fixed above features. The core team dedicates a number of
days to working on bugs each sprint. Bugs which have reproducers are also great
for community contributions as they're well isolated. Sometimes we're not as
lucky to have reproducers though, then a bugfix should also include a test
reproducing the original error along with the fix.
-- [failed](https://github.com/apache/incubator-pekko-http/labels/failed) -
tickets indicate a Jenkins failure (for example from a nightly build). These
tickets usually start with the `FAILED: ...` message, and include a stacktrace
+ link to the Jenkins failure. The tickets are collected and worked on with
priority to keep the build stable and healthy. Often times it may be simple
timeout issues (Jenkins boxes are slow), though sometimes real bugs are
discovered this way.
+- [bug](https://github.com/apache/pekko-http/labels/bug) - bugs take priority
in being fixed above features. The core team dedicates a number of days to
working on bugs each sprint. Bugs which have reproducers are also great for
community contributions as they're well isolated. Sometimes we're not as lucky
to have reproducers though, then a bugfix should also include a test
reproducing the original error along with the fix.
+- [failed](https://github.com/apache/pekko-http/labels/failed) - tickets
indicate a Jenkins failure (for example from a nightly build). These tickets
usually start with the `FAILED: ...` message, and include a stacktrace + link
to the Jenkins failure. The tickets are collected and worked on with priority
to keep the build stable and healthy. Often times it may be simple timeout
issues (Jenkins boxes are slow), though sometimes real bugs are discovered this
way.
Pull Request validation states:
@@ -50,8 +50,8 @@ Pull Request validation states:
# Pekko HTTP contributing guidelines
-These guidelines apply to all Apache Pekko projects, by which we mean both the
`apache/incubator-pekko` repository,
-as well as any plugins or additional repos located under the Pekko GitHub
organisation, e.g. `apache/incubator-pekko-http` and others.
+These guidelines apply to all Apache Pekko projects, by which we mean both the
`apache/pekko` repository,
+as well as any plugins or additional repos located under the Pekko GitHub
organisation, e.g. `apache/pekko-http` and others.
These guidelines are meant to be a living document that should be changed and
adapted as needed.
We encourage changes that make it easier to achieve our goals in an efficient
way.
@@ -64,9 +64,9 @@ You can read its full text here: [ASF Code of
Conduct](https://www.apache.org/fo
The below steps are how to get a patch into a `main` development branch.
The steps are exactly the same for everyone involved in the project (be it
core team, or first time contributor).
-1. To avoid duplicated effort, it might be good to check the [issue
tracker](https://github.com/apache/incubator-pekko-http/issues) and [existing
pull requests](https://github.com/apache/incubator-pekko-http/pulls) for
existing work.
- - If there is no ticket yet, feel free to [create
one](https://github.com/apache/incubator-pekko-http/issues/new) to discuss the
problem and the approach you want to take to solve it.
-1. [Fork the
project](https://github.com/apache/incubator-pekko-http#fork-destination-box)
on GitHub. You'll need to create a feature-branch for your work on your fork,
as this way you'll be able to submit a PullRequest against the mainline Pekko
HTTP.
+1. To avoid duplicated effort, it might be good to check the [issue
tracker](https://github.com/apache/pekko-http/issues) and [existing pull
requests](https://github.com/apache/pekko-http/pulls) for existing work.
+ - If there is no ticket yet, feel free to [create
one](https://github.com/apache/pekko-http/issues/new) to discuss the problem
and the approach you want to take to solve it.
+1. [Fork the
project](https://github.com/apache/pekko-http#fork-destination-box) on GitHub.
You'll need to create a feature-branch for your work on your fork, as this way
you'll be able to submit a PullRequest against the mainline Pekko HTTP.
1. Create a branch on your fork and work on the feature. For example: `git
checkout -b wip-custom-headers-pekko-http`
- Please make sure to follow the general quality guidelines (specified
below) when developing your patch.
- Please write additional tests covering your feature and adjust existing
ones if needed before submitting your Pull Request. The `validatePullRequest`
sbt task ([explained below](#the-validatepullrequest-task)) may come in handy
to verify your changes are correct.
@@ -83,7 +83,7 @@ The steps are exactly the same for everyone involved in the
project (be it core
The TL;DR; of the above very precise workflow version is:
-1. Fork incubator-pekko-http
+1. Fork pekko-http
2. Hack and test on your feature (on a branch)
3. Submit a PR
4. Sign the ASF CLA if necessary
@@ -319,7 +319,7 @@ There is a number of ways timeouts can be defined in Pekko
tests. The following
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/apache/incubator-pekko/blob/main/pekko-testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala)
+You can read up on remaining and friends in
[TestKit.scala](https://github.com/apache/pekko/blob/main/pekko-testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala)
# Supporting infrastructure
@@ -334,7 +334,7 @@ We do not yet publish snapshots.
## Related links
* [Apache Contributor License
Agreement](https://www.apache.org/licenses/contributor-agreements.html)
-* [Pekko HTTP Issue
Tracker](https://github.com/apache/incubator-pekko-http/issues)
+* [Pekko HTTP Issue Tracker](https://github.com/apache/pekko-http/issues)
* [Scalariform](https://github.com/scala-ide/scalariform)
# Development tools
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 6a31e0f49..000000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,10 +0,0 @@
-Apache Pekko (incubating) is an effort undergoing incubation at the Apache
-Software Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
diff --git a/README.md b/README.md
index 372002895..86aacc73d 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ they do not have it installed already.
### Running the Build
- Open a command window and change directory to your preferred base directory
-- Use git to clone the [repo](https://github.com/apache/incubator-pekko-http)
or download a source release from https://pekko.apache.org (and unzip or untar
it, as appropriate)
+- Use git to clone the [repo](https://github.com/apache/pekko-http) or
download a source release from https://pekko.apache.org (and unzip or untar it,
as appropriate)
- Change directory to the directory where you installed the source (you should
have a file called `build.sbt` in this directory)
- `sbt compile` compiles the main source for project default version of Scala
(2.13)
- `sbt +compile` will compile for all supported versions of Scala
@@ -69,16 +69,16 @@ they do not have it installed already.
If you have questions about the contribution process or discuss specific
issues, please interact with the community using the following resources.
-- [GitHub
discussions](https://github.com/apache/incubator-pekko-http/discussions): for
questions and general discussion.
+- [GitHub discussions](https://github.com/apache/pekko-http/discussions): for
questions and general discussion.
- [Pekko users mailing
list](https://lists.apache.org/[email protected]): for Pekko
development discussions.
- [Pekko dev mailing
list](https://lists.apache.org/[email protected]): for Pekko
development discussions.
-- [GitHub issues](https://github.com/apache/incubator-pekko-http/issues): for
bug reports and feature requests. Please search the existing issues before
creating new ones. If you are unsure whether you have found a bug, consider
asking in GitHub discussions or the mailing list first.
+- [GitHub issues](https://github.com/apache/pekko-http/issues): for bug
reports and feature requests. Please search the existing issues before creating
new ones. If you are unsure whether you have found a bug, consider asking in
GitHub discussions or the mailing list first.
<!--
[stackoverflow-badge]:
https://img.shields.io/badge/stackoverflow%3A-pekko--http-blue.svg?style=flat-square
[stackoverflow]: https://stackoverflow.com/questions/tagged/pekko-http
[github-issues-badge]:
https://img.shields.io/badge/github%3A-issues-blue.svg?style=flat-square
-[github-issues]: https://github.com/apache/incubator-pekko-http/issues
+[github-issues]: https://github.com/apache/pekko-http/issues
[scaladex-badge]:
https://index.scala-lang.org/count.svg?q=dependencies:pekko/pekko-http*&subject=scaladex:&color=blue&style=flat-square
[scaladex-projects]:
https://index.scala-lang.org/search?q=dependencies:pekko/pekko-http*
-->
@@ -88,7 +88,7 @@ If you have questions about the contribution process or
discuss specific issues,
Contributions are *very* welcome!
If you see an issue that you'd like to see fixed, the best way to make it
happen is to help out by submitting a pull request.
-For ideas of where to contribute, [tickets marked as "help
wanted"](https://github.com/apache/incubator-pekko-http/labels/help%20wanted)
are a good starting point.
+For ideas of where to contribute, [tickets marked as "help
wanted"](https://github.com/apache/pekko-http/labels/help%20wanted) are a good
starting point.
Refer to the [CONTRIBUTING.md](CONTRIBUTING.md) file for more details about
the workflow,
and general hints on how to prepare your pull request. You can also ask for
clarifications or guidance in GitHub issues directly.
diff --git a/build.sbt b/build.sbt
index 770d64add..da909de2c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -20,7 +20,7 @@ import spray.boilerplate.BoilerplatePlugin
import com.lightbend.paradox.apidoc.ApidocPlugin.autoImport.apidocRootPackage
sourceDistName := "apache-pekko-http"
-sourceDistIncubating := true
+sourceDistIncubating := false
// pekkoInlineEnabled must be set to false when this is backported to 1.0.x
branch
ThisBuild / pekkoInlineEnabled := false
@@ -36,7 +36,7 @@ inThisBuild(Def.settings(
Some(url(s"https://pekko.apache.org/api/pekko-http/$apiVersion/";))
},
scmInfo := Some(
- ScmInfo(url("https://github.com/apache/incubator-pekko-http";),
"[email protected]:apache/incubator-pekko-http.git")),
+ ScmInfo(url("https://github.com/apache/pekko-http";),
"[email protected]:apache/pekko-http.git")),
description := "Apache Pekko Http: Modern, fast, asynchronous,
streaming-first HTTP server and client.",
testOptions ++= Seq(
Tests.Argument(TestFrameworks.JUnit, "-q", "-v"),
diff --git a/docs/src/main/paradox/contributing.md
b/docs/src/main/paradox/contributing.md
index 4ed85eced..a38f32a4c 100644
--- a/docs/src/main/paradox/contributing.md
+++ b/docs/src/main/paradox/contributing.md
@@ -4,7 +4,7 @@
We follow the standard GitHub [fork &
pull](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests#fork--pull)
approach to pull requests. Just fork the official repo, develop in a branch,
and submit a PR!
-For a more detailed description of our process, please refer to the
[CONTRIBUTING.md](https://github.com/apache/incubator-pekko-http/blob/main/CONTRIBUTING.md)
page on the github project.
+For a more detailed description of our process, please refer to the
[CONTRIBUTING.md](https://github.com/apache/pekko-http/blob/main/CONTRIBUTING.md)
page on the github project.
## Snapshots
diff --git a/docs/src/main/paradox/introduction.md
b/docs/src/main/paradox/introduction.md
index 45b069f84..46e106b5c 100644
--- a/docs/src/main/paradox/introduction.md
+++ b/docs/src/main/paradox/introduction.md
@@ -48,20 +48,20 @@ You can bootstrap a new project with Apache Pekko HTTP
already configured using
@@@ div { .group-scala }
For Scala (sbt)
: ```sh
- sbt new apache/incubator-pekko-http-quickstart-scala.g8
+ sbt new apache/pekko-http-quickstart-scala.g8
```
@@@
@@@ div { .group-java }
For Java (Maven or Gradle)
: ```sh
- sbt new apache/incubator-pekko-http-quickstart-java.g8
+ sbt new apache/pekko-http-quickstart-java.g8
```
From there on the prepared project can be built using Gradle or Maven.
@@@
More instructions can be found on the @scala[[template
-project](https://github.com/apache/incubator-pekko-http-quickstart-scala.g8)]@java[[template
-project](https://github.com/apache/incubator-pekko-http-quickstart-java.g8)].
+project](https://github.com/apache/pekko-http-quickstart-scala.g8)]@java[[template
+project](https://github.com/apache/pekko-http-quickstart-java.g8)].
## Routing DSL for HTTP servers
diff --git a/docs/src/main/paradox/release-notes/index.md
b/docs/src/main/paradox/release-notes/index.md
index 0d7a2d0cd..729a3bee5 100644
--- a/docs/src/main/paradox/release-notes/index.md
+++ b/docs/src/main/paradox/release-notes/index.md
@@ -5,8 +5,8 @@
This is a bug fix release. There have also been some doc and build
improvements.
### Bug Fixes
-* Add optional throttle to handle excessive HTTP/2 non-data frames
([PR394](https://github.com/apache/incubator-pekko-http/pull/394))
-* Set the minimum required Pekko version to 1.0.0 (had been 1.0.1)
([PR328](https://github.com/apache/incubator-pekko-http/pull/328))
+* Add optional throttle to handle excessive HTTP/2 non-data frames
([PR394](https://github.com/apache/pekko-http/pull/394))
+* Set the minimum required Pekko version to 1.0.0 (had been 1.0.1)
([PR328](https://github.com/apache/pekko-http/pull/328))
## 1.0.0
@@ -26,18 +26,18 @@ properly acknowledged, please get in touch.
### Bug Fixes
We haven't had to fix many bugs that were in Akka HTTP 10.2.10.
-* Use Java NIO Files#createTempFile
[PR170](https://github.com/apache/incubator-pekko-http/pull/170) (Akka HTTP
[CVE-2023-33251](https://akka.io/security/akka-http-cve-2023-05-15.html))
+* Use Java NIO Files#createTempFile
[PR170](https://github.com/apache/pekko-http/pull/170) (Akka HTTP
[CVE-2023-33251](https://akka.io/security/akka-http-cve-2023-05-15.html))
### Additions
-* Scala 3 support
([PR150](https://github.com/apache/incubator-pekko-http/pull/150))
-* Added pekko-http-cors
([PR208](https://github.com/apache/incubator-pekko-http/pull/208))
+* Scala 3 support ([PR150](https://github.com/apache/pekko-http/pull/150))
+* Added pekko-http-cors
([PR208](https://github.com/apache/pekko-http/pull/208))
### Other Changes
-* Remove http2-support module. This module was only kept for compatibility
reasons before. Its code has long been part of the pekko-http-core
([PR52](https://github.com/apache/incubator-pekko-http/pull/52))
+* Remove http2-support module. This module was only kept for compatibility
reasons before. Its code has long been part of the pekko-http-core
([PR52](https://github.com/apache/pekko-http/pull/52))
### Dependency Upgrades
We have tried to limit the changes to third party dependencies that are used
in Pekko HTTP 1.0.0. These are some exceptions:
-* parboiled 2.5.0
([PR14](https://github.com/apache/incubator-pekko-http/pull/14)). We have
dropped the use of the internal Akka/Pekko copy of parboiled in favour of using
the jar directly. There have been reports of small binary compatibility issues
between parboiled 2.4.1 and parboiled 2.5.0
([#174](https://github.com/apache/incubator-pekko-http/issues/174)).
+* parboiled 2.5.0 ([PR14](https://github.com/apache/pekko-http/pull/14)). We
have dropped the use of the internal Akka/Pekko copy of parboiled in favour of
using the jar directly. There have been reports of small binary compatibility
issues between parboiled 2.4.1 and parboiled 2.5.0
([#174](https://github.com/apache/pekko-http/issues/174)).
* jackson 2.14.3
* scalatest 3.2.14. Pekko users who have existing tests based on Akka Testkit
may need to migrate their tests due to the scalatest upgrade. The [scalatest
3.2 release notes](https://www.scalatest.org/release_notes/3.2.0) have a
detailed description of the changes needed.
diff --git a/docs/src/main/paradox/routing-dsl/index.md
b/docs/src/main/paradox/routing-dsl/index.md
index 3a545830a..5f05cbf77 100644
--- a/docs/src/main/paradox/routing-dsl/index.md
+++ b/docs/src/main/paradox/routing-dsl/index.md
@@ -55,7 +55,7 @@ the Routing DSL will look like:
## Getting started
-The project template in @scala[[Apache Pekko HTTP Quickstart for
Scala](https://github.com/apache/incubator-pekko-http-quickstart-scala.g8)]@java[[Apache
Pekko HTTP Quickstart for
Java](https://github.com/apache/incubator-pekko-http-quickstart-java.g8)] will
help you to get a working Apache Pekko HTTP server running.
+The project template in @scala[[Apache Pekko HTTP Quickstart for
Scala](https://github.com/apache/pekko-http-quickstart-scala.g8)]@java[[Apache
Pekko HTTP Quickstart for
Java](https://github.com/apache/pekko-http-quickstart-java.g8)] will help you
to get a working Apache Pekko HTTP server running.
## Compared with Play framework routes
diff --git a/http-core/src/main/resources/reference.conf
b/http-core/src/main/resources/reference.conf
index 56df978fd..ec2c1b7d6 100644
--- a/http-core/src/main/resources/reference.conf
+++ b/http-core/src/main/resources/reference.conf
@@ -308,7 +308,7 @@ pekko.http {
ping-timeout = 0s
frame-type-throttle {
- # Configure the throttle for non-data frame types
(https://github.com/apache/incubator-pekko-http/issues/332).
+ # Configure the throttle for non-data frame types
(https://github.com/apache/pekko-http/issues/332).
# The supported frame-types for throttlng are:
# reset, headers, continuation, go-away, priority, ping, push-promise,
window-update
# If you are concerned about CVE-2023-44487, you could set:
pekko.http.server.http2.frame-type-throttle.frame-types = ["reset"]
@@ -568,7 +568,7 @@ pekko.http {
# Note that this is only implemented in the new host connection pool
max-connection-lifetime = infinite
- # Client-side pipelining is not currently supported. See
https://github.com/apache/incubator-pekko-http/issues/32
+ # Client-side pipelining is not currently supported. See
https://github.com/apache/pekko-http/issues/32
pipelining-limit = 1
# The minimum duration to backoff new connection attempts after the
previous connection attempt failed.
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/client/pool/NewHostConnectionPool.scala
b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/client/pool/NewHostConnectionPool.scala
index f591e73b0..24c4ea5e9 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/client/pool/NewHostConnectionPool.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/client/pool/NewHostConnectionPool.scala
@@ -357,7 +357,7 @@ private[client] object NewHostConnectionPool {
case NonFatal(ex) =>
error(
ex,
- "Slot execution failed. That's probably a bug. Please file
a bug at https://github.com/apache/incubator-pekko-http/issues. Slot is
restarted.")
+ "Slot execution failed. That's probably a bug. Please file
a bug at https://github.com/apache/pekko-http/issues. Slot is restarted.")
try {
cancelCurrentTimeout()
@@ -385,7 +385,7 @@ private[client] object NewHostConnectionPool {
else
throw new IllegalStateException(
"State transition loop exceeded maximum number of loops. The
pool will shutdown itself. " +
- "That's probably a bug. Please file a bug at
https://github.com/apache/incubator-pekko-http/issues. ")
+ "That's probably a bug. Please file a bug at
https://github.com/apache/pekko-http/issues. ")
loop(event, arg, 10)
}
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/parsing/HttpResponseParser.scala
b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/parsing/HttpResponseParser.scala
index 467497a29..95a893432 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/impl/engine/parsing/HttpResponseParser.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/impl/engine/parsing/HttpResponseParser.scala
@@ -128,7 +128,7 @@ private[http] class HttpResponseParser(protected val
settings: ParserSettings,
} else if (isNewLine(cursor + 3)) {
parseStatusCode()
// Status format with no reason phrase and no trailing space accepted,
diverging from the spec
- // See https://github.com/apache/incubator-pekko-http/pull/989
+ // See https://github.com/apache/pekko-http/pull/989
skipNewLine(cursor + 3)
} else badStatusCode()
}
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/impl/util/StageLoggingWithOverride.scala
b/http-core/src/main/scala/org/apache/pekko/http/impl/util/StageLoggingWithOverride.scala
index a09a81e62..c7ace934a 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/impl/util/StageLoggingWithOverride.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/impl/util/StageLoggingWithOverride.scala
@@ -11,7 +11,7 @@
* Copyright (C) 2017-2022 Lightbend Inc. <https://www.lightbend.com>
*
* Copied and adapted from pekko-stream
- *
https://github.com/apache/incubator-pekko/blob/bd1af56fcead435cb3d730e759223dcb2b0fb4c6/stream/src/main/scala/org/apache/pekko/stream/stage/StageLogging.scala
+ *
https://github.com/apache/pekko/blob/bd1af56fcead435cb3d730e759223dcb2b0fb4c6/stream/src/main/scala/org/apache/pekko/stream/stage/StageLogging.scala
*/
package org.apache.pekko.http.impl.util
diff --git
a/http-testkit/src/test/scala/org/apache/pekko/http/scaladsl/testkit/ScalatestRouteTestSpec.scala
b/http-testkit/src/test/scala/org/apache/pekko/http/scaladsl/testkit/ScalatestRouteTestSpec.scala
index 4baccc712..3b4737d62 100644
---
a/http-testkit/src/test/scala/org/apache/pekko/http/scaladsl/testkit/ScalatestRouteTestSpec.scala
+++
b/http-testkit/src/test/scala/org/apache/pekko/http/scaladsl/testkit/ScalatestRouteTestSpec.scala
@@ -98,7 +98,7 @@ class ScalatestRouteTestSpec extends AnyFreeSpec with
Matchers with ScalatestRou
}
"running on pekko dispatcher threads" in Await.result(Future {
- // https://github.com/apache/incubator-pekko-http/pull/2526
+ // https://github.com/apache/pekko-http/pull/2526
// Check will block while waiting on the response, this might lead to
starvation
// on the BatchingExecutor of pekko's dispatcher if the blocking is
not managed properly.
Get() ~> complete(Future(HttpResponse())) ~> check {
diff --git
a/http/src/main/java/org/apache/pekko/http/javadsl/server/HttpApp.java
b/http/src/main/java/org/apache/pekko/http/javadsl/server/HttpApp.java
index 21209cd38..ba80fa624 100644
--- a/http/src/main/java/org/apache/pekko/http/javadsl/server/HttpApp.java
+++ b/http/src/main/java/org/apache/pekko/http/javadsl/server/HttpApp.java
@@ -30,7 +30,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicReference;
/**
- * DEPRECATED, consider
https://github.com/apache/incubator-pekko-http-quickstart-java.g8 instead
+ * DEPRECATED, consider
https://github.com/apache/pekko-http-quickstart-java.g8 instead
*
* <p>Bootstrap trait for Http Server. It helps booting up a pekko-http server
by only defining the
* desired routes. It offers additional hooks to modify the default behavior.
diff --git
a/http/src/main/scala/org/apache/pekko/http/scaladsl/server/HttpApp.scala
b/http/src/main/scala/org/apache/pekko/http/scaladsl/server/HttpApp.scala
index 974829b07..7c8507b32 100644
--- a/http/src/main/scala/org/apache/pekko/http/scaladsl/server/HttpApp.scala
+++ b/http/src/main/scala/org/apache/pekko/http/scaladsl/server/HttpApp.scala
@@ -30,7 +30,7 @@ import scala.io.StdIn
import scala.util.{ Failure, Success, Try }
/**
- * DEPRECATED, consider
https://github.com/apache/incubator-pekko-http-quickstart-scala.g8 instead
+ * DEPRECATED, consider
https://github.com/apache/pekko-http-quickstart-scala.g8 instead
*
* Bootstrap trait for Http Server. It helps booting up a pekko-http server by
only defining the desired routes.
* It offers additional hooks to modify the default behavior.
diff --git a/legal/PekkoNotice.txt b/legal/PekkoNotice.txt
index 678a2f6bc..1a0e8d8a3 100644
--- a/legal/PekkoNotice.txt
+++ b/legal/PekkoNotice.txt
@@ -1,4 +1,4 @@
-Apache Pekko (Incubating) HTTP
+Apache Pekko HTTP
Copyright 2022-2024 The Apache Software Foundation
This product includes software developed at
diff --git a/project/AddMetaInfLicenseFiles.scala
b/project/AddMetaInfLicenseFiles.scala
index af865589d..1c0e14694 100644
--- a/project/AddMetaInfLicenseFiles.scala
+++ b/project/AddMetaInfLicenseFiles.scala
@@ -29,8 +29,7 @@ object AddMetaInfLicenseFiles extends AutoPlugin {
override lazy val projectSettings = Seq(
apacheSonatypeLicenseFile := baseDir.value / "legal" /
"StandardLicense.txt",
- apacheSonatypeNoticeFile := baseDir.value / "legal" / "PekkoNotice.txt",
- apacheSonatypeDisclaimerFile := Some((LocalRootProject /
baseDirectory).value / "DISCLAIMER"))
+ apacheSonatypeNoticeFile := baseDir.value / "legal" / "PekkoNotice.txt")
/**
* Settings specific for Pekko http-core subproject which require a
different license file.
diff --git a/project/GitHub.scala b/project/GitHub.scala
index 4a44dc897..a44d1a1eb 100644
--- a/project/GitHub.scala
+++ b/project/GitHub.scala
@@ -19,6 +19,6 @@ object GitHub {
def url(v: String, isSnapshot: Boolean): String = {
val branch = if (isSnapshot) "main" else "v" + v
- "https://github.com/apache/incubator-pekko-http/tree/"; + branch
+ "https://github.com/apache/pekko-http/tree/"; + branch
}
}
diff --git a/project/ParadoxSupport.scala b/project/ParadoxSupport.scala
index cc02918b2..03d1c10e7 100644
--- a/project/ParadoxSupport.scala
+++ b/project/ParadoxSupport.scala
@@ -29,7 +29,7 @@ object ParadoxSupport {
val paradoxWithCustomDirectives = Seq(
paradoxDirectives += ((context: Writer.Context) =>
new SignatureDirective(context.location.tree.label, context.properties,
context)),
- pekkoParadoxGithub :=
Some("https://github.com/apache/incubator-pekko-http";),
+ pekkoParadoxGithub := Some("https://github.com/apache/pekko-http";),
Compile / paradoxMarkdownToHtml / sourceGenerators += Def.taskDyn {
val targetFile = (Compile / paradox / sourceManaged).value /
"license-report.md"
diff --git a/project/Publish.scala b/project/Publish.scala
index bceffdf79..164ec583a 100644
--- a/project/Publish.scala
+++ b/project/Publish.scala
@@ -42,7 +42,7 @@ object Publish extends AutoPlugin {
"pekko-http-contributors",
"Apache Pekko HTTP Contributors",
"[email protected]",
-
url("https://github.com/apache/incubator-pekko-http/graphs/contributors";))))
+ url("https://github.com/apache/pekko-http/graphs/contributors";))))
override lazy val buildSettings = Seq(
dynverSonatypeSnapshots := true)
diff --git a/project/ValidatePullRequest.scala
b/project/ValidatePullRequest.scala
index 57248216f..1825f57a9 100644
--- a/project/ValidatePullRequest.scala
+++ b/project/ValidatePullRequest.scala
@@ -158,7 +158,7 @@ object ValidatePullRequest extends AutoPlugin {
try {
import scala.collection.JavaConverters._
val gh =
GitHubBuilder.fromEnvironment().withOAuthToken(GitHub.envTokenOrThrow).build()
- val comments =
gh.getRepository("apache/incubator-pekko-http").getIssue(prId).getComments.asScala
+ val comments =
gh.getRepository("apache/pekko-http").getIssue(prId).getComments.asScala
def triggersBuildAll(c: GHIssueComment): Boolean =
buildAllMagicPhrase.findFirstIn(c.getBody).isDefined
comments.collectFirst {
diff --git a/project/project-info.conf b/project/project-info.conf
index cd319752e..b67c0e86b 100644
--- a/project/project-info.conf
+++ b/project/project-info.conf
@@ -10,7 +10,7 @@ project-info {
new-tab: false
}
issues: {
- url: "https://github.com/apache/incubator-pekko-http/issues";
+ url: "https://github.com/apache/pekko-http/issues";
text: "Github issues"
}
release-notes: {
@@ -27,8 +27,8 @@ project-info {
url: "https://lists.apache.org/[email protected]";
}
{
- text: "apache/incubator-pekko-http discussion"
- url: "https://github.com/apache/incubator-pekko-http/discussions";
+ text: "apache/pekko-http discussion"
+ url: "https://github.com/apache/pekko-http/discussions";
}
]
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
