Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

prefix Akka HTTP versions #342

Merged
merged 2 commits into from
Oct 24, 2023
Merged

prefix Akka HTTP versions #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
915018a
prefix Akka HTTP versions
pjfanning Oct 24, 2023
5dbfde2
javafmt
pjfanning Oct 24, 2023
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 docs/src/main/paradox/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Since 10.0.9
# Since Akka HTTP 10.0.9
RedirectMatch 301 ^(.*)/common/de-coding.html$ $1/common/encoding.html
RedirectMatch 301 ^(.*)/low-level-server-side-api.html$ $1/server-side/low-level-api.html
RedirectMatch 301 ^(.*)/server-side-https-support.html$ $1/server-side/https-support.html
Expand Down
4 changes: 2 additions & 2 deletions http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/HttpCookie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ public static HttpCookie create(
}

/**
* @deprecated Since 10.2.0. Use {@link #create(String, String, Optional, OptionalLong, Optional,
* Optional, boolean, boolean, Optional, Optional)} instead.
* @deprecated Since Akka HTTP 10.2.0. Use {@link #create(String, String, Optional, OptionalLong,
* Optional, Optional, boolean, boolean, Optional, Optional)} instead.
*/
@SuppressWarnings("unchecked")
public static HttpCookie create(
Expand Down
2 changes: 1 addition & 1 deletion ...-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/ConnectionPoolSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ abstract class ConnectionPoolSettings extends js.ConnectionPoolSettings { self:
self.copyDeep(_.withResponseEntitySubscriptionTimeout(newValue), responseEntitySubscriptionTimeout = newValue)

/**
* Since 10.1.0, the transport is configured in [[ClientConnectionSettings]]. This method is a shortcut for
* Since Akka HTTP 10.1.0, the transport is configured in [[ClientConnectionSettings]]. This method is a shortcut for
* `withUpdatedConnectionSettings(_.withTransport(newTransport))`.
*/
def withTransport(newValue: ClientTransport): ConnectionPoolSettings =
Expand Down
2 changes: 1 addition & 1 deletion project/Doc.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ object UnidocRoot extends AutoPlugin {
if (isJdk8) Seq("-Xdoclint:none")
else Seq("-Xdoclint:none", "--ignore-source-errors")),
// genjavadoc needs to generate synthetic methods since the java code uses them
// fails since 10.0.11 disabled to get the doc gen to pass, see #1584
// fails since Akka HTTP 10.0.11 disabled to get the doc gen to pass, see #1584
// scalacOptions += "-P:genjavadoc:suppressSynthetic=false",
// FIXME: see https://github.com/akka/akka-http/issues/230
JavaUnidoc / unidoc / sources ~= (_.filterNot(
Expand Down
Loading