This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new 6aeb6882 add missing license headers (projects dir) and fix refs to
main branch (#32)
6aeb6882 is described below
commit 6aeb6882e47dab3d69415c12db3ac35a5a3d4cad
Author: PJ Fanning <[email protected]>
AuthorDate: Fri Mar 3 11:14:50 2023 +0100
add missing license headers (projects dir) and fix refs to main branch (#32)
---
CONTRIBUTING.md | 2 +-
README.md | 1 +
build.sbt | 2 +-
docs/src/main/paradox/data-transformations/index.md | 2 +-
docs/src/main/paradox/external-components.md | 2 +-
docs/src/main/paradox/other-docs/snapshots.md | 2 +-
docs/src/main/paradox/overview.md | 2 +-
project/AutomaticModuleName.scala | 9 +++++++++
project/Common.scala | 11 ++++++++++-
project/Dependencies.scala | 13 +++++++++++--
project/TestChanged.scala | 13 +++++++++++--
scripts/gh-detect-changes.sh | 4 ++--
12 files changed, 50 insertions(+), 13 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0bac39d2..7c0476df 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -56,7 +56,7 @@ For a Pull Request to be considered at all it has to meet
these requirements:
1. Do not use ``@author`` tags since it does not encourage [Collective Code
Ownership](http://www.extremeprogramming.org/rules/collective.html).
Contributors get the credit they deserve in the release notes.
-If these requirements are not met then the code should **not** be merged into
master, or even reviewed - regardless of how good or important it is. No
exceptions.
+If these requirements are not met then the code should **not** be merged into
'main' branch, or even reviewed - regardless of how good or important it is. No
exceptions.
## Creating Commits And Writing Commit Messages
diff --git a/README.md b/README.md
index 9c989bce..fb080d33 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ Community
You can join these forums and chats to discuss and ask Pekko and Pekko
connector related questions:
- [GitHub discussions](https://github.com/apache/incubator-pekko/discussions):
for questions and general discussion.
+- [Pekko user mailing
list](https://lists.apache.org/[email protected]): for Pekko
Connectors usage discussions.
- [Pekko dev mailing
list](https://lists.apache.org/[email protected]): for Pekko
Connectors development discussions.
- [GitHub
issues](https://github.com/apache/incubator-pekko-connectors/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.
diff --git a/build.sbt b/build.sbt
index a5b31eea..03aa327a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -326,7 +326,7 @@ lazy val docs = project
"akka.version" -> Dependencies.AkkaVersion,
"akka-http.version" -> Dependencies.AkkaHttpVersion,
"hadoop.version" -> Dependencies.HadoopVersion,
- "extref.github.base_url" ->
s"https://github.com/apache/incubator-pekko-connectors/tree/${if
(isSnapshot.value) "master"
+ "extref.github.base_url" ->
s"https://github.com/apache/incubator-pekko-connectors/tree/${if
(isSnapshot.value) "main"
else "v" + version.value}/%s",
"extref.pekko.base_url" ->
s"https://pekko.apache.org/docs/pekko/current/%s";,
"scaladoc.akka.base_url" ->
s"https://doc.akka.io/api/akka/${Dependencies.AkkaBinaryVersion}";,
diff --git a/docs/src/main/paradox/data-transformations/index.md
b/docs/src/main/paradox/data-transformations/index.md
index ffad824d..e21dbd61 100644
--- a/docs/src/main/paradox/data-transformations/index.md
+++ b/docs/src/main/paradox/data-transformations/index.md
@@ -17,7 +17,7 @@ Data transformation is an important part of integration with
external systems.
@@ toc { .main depth=2 }
-[Contributions](https://github.com/apache/incubator-pekko-connectors/blob/master/CONTRIBUTING.md)
are very welcome.
+[Contributions](https://github.com/apache/incubator-pekko-connectors/blob/main/CONTRIBUTING.md)
are very welcome.
[Creating an
issue](https://github.com/apache/incubator-pekko-connectors/issues) for
discussion is a good first step for such contributions.
diff --git a/docs/src/main/paradox/external-components.md
b/docs/src/main/paradox/external-components.md
index 0be94c85..68d9e25a 100644
--- a/docs/src/main/paradox/external-components.md
+++ b/docs/src/main/paradox/external-components.md
@@ -2,7 +2,7 @@
Below is a non-complete list of stream components that are maintained by other
projects.
-[Contributions](https://github.com/apache/incubator-pekko-connectors/blob/master/CONTRIBUTING.md)
are very welcome.
+[Contributions](https://github.com/apache/incubator-pekko-connectors/blob/main/CONTRIBUTING.md)
are very welcome.
[Creating an
issue](https://github.com/apache/incubator-pekko-connectors/issues) for
discussion is a good first step for such contributions.
## Buffers
diff --git a/docs/src/main/paradox/other-docs/snapshots.md
b/docs/src/main/paradox/other-docs/snapshots.md
index f99c5123..b9612005 100644
--- a/docs/src/main/paradox/other-docs/snapshots.md
+++ b/docs/src/main/paradox/other-docs/snapshots.md
@@ -3,7 +3,7 @@
[snapshots-badge]:
https://img.shields.io/nexus/s/org.pekko/pekko-connectors-csv_2.13?server=https%3A%2F%2Foss.sonatype.org
[snapshots]:
https://oss.sonatype.org/content/repositories/snapshots/com/lightbend/akka/pekko-connectors-csv_2.13/
-Snapshots are published to the Sonatype Snapshot repository after every
successful build on master.
+Snapshots are published to the Sonatype Snapshot repository after every
successful build on 'main' branch.
Add the following to your project build definition to resolve Apache Pekko
Connectors snapshots:
## Configure repository
diff --git a/docs/src/main/paradox/overview.md
b/docs/src/main/paradox/overview.md
index 2321e764..c952d159 100644
--- a/docs/src/main/paradox/overview.md
+++ b/docs/src/main/paradox/overview.md
@@ -25,7 +25,7 @@ If you want to try out a connector that has not yet been
released, give @ref[sna
## Contributing
-Please feel free to contribute to Apache Pekko Connectors by reporting issues
you identify, or by suggesting changes to the code. Please refer to our
[contributing
instructions](https://github.com/apache/incubator-pekko-connectors/blob/master/CONTRIBUTING.md)
and our [contributor
advice](https://github.com/apache/incubator-pekko-connectors/blob/master/contributor-advice.md)
to learn how it can be done. The target structure for Apache Pekko Connectors
connectors is illustrated by the @ref [...]
+Please feel free to contribute to Apache Pekko Connectors by reporting issues
you identify, or by suggesting changes to the code. Please refer to our
[contributing
instructions](https://github.com/apache/incubator-pekko-connectors/blob/main/CONTRIBUTING.md)
and our [contributor
advice](https://github.com/apache/incubator-pekko-connectors/blob/main/contributor-advice.md)
to learn how it can be done. The target structure for Apache Pekko Connectors
connectors is illustrated by the @ref[Ref [...]
We want Apache Pekko and Apache Pekko Connectors to strive in a welcoming and
open atmosphere and expect all contributors to respect our [code of
conduct](https://www.lightbend.com/conduct).
diff --git a/project/AutomaticModuleName.scala
b/project/AutomaticModuleName.scala
index a22b423f..401f55c3 100644
--- a/project/AutomaticModuleName.scala
+++ b/project/AutomaticModuleName.scala
@@ -1,3 +1,12 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, derived from Akka.
+ */
+
/**
* Copyright (C) 2016-2018 Lightbend Inc. <https://www.lightbend.com>
*/
diff --git a/project/Common.scala b/project/Common.scala
index 7ff912d3..302a805e 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -1,3 +1,12 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, derived from Akka.
+ */
+
import sbt._
import sbt.Keys._
import sbt.plugins.JvmPlugin
@@ -73,7 +82,7 @@ object Common extends AutoPlugin {
Compile / doc / scalacOptions ++=
Seq(
"-doc-source-url", {
- val branch = if (isSnapshot.value) "master" else s"v${version.value}"
+ val branch = if (isSnapshot.value) "main" else s"v${version.value}"
s"https://github.com/apache/incubator-pekko-connectors/tree/${branch}€{FILE_PATH_EXT}#L€{FILE_LINE}";
},
"-doc-canonical-base-url",
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index a7a99b88..ed5d6cb5 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -1,3 +1,12 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, derived from Akka.
+ */
+
import sbt._
import Keys._
@@ -58,8 +67,8 @@ object Dependencies {
// Releases https://github.com/FasterXML/jackson-databind/releases
// CVE issues
https://github.com/FasterXML/jackson-databind/issues?utf8=%E2%9C%93&q=+label%3ACVE
- // This should align with the Jackson minor version used in Akka 2.6.x
- // https://github.com/akka/akka/blob/master/project/Dependencies.scala#L23
+ // This should align with the Jackson minor version used in Pekko 1.0.x
+ //
https://github.com/apache/incubator-pekko/blob/main/project/Dependencies.scala
val JacksonDatabindVersion = "2.11.4"
val JacksonDatabindDependencies = Seq(
"com.fasterxml.jackson.core" % "jackson-core" % JacksonDatabindVersion,
diff --git a/project/TestChanged.scala b/project/TestChanged.scala
index 961041a2..d8b9b070 100644
--- a/project/TestChanged.scala
+++ b/project/TestChanged.scala
@@ -1,3 +1,12 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, derived from Akka.
+ */
+
package akka.stream.alpakka
import scala.collection.immutable
@@ -11,12 +20,12 @@ object TestChanged extends AutoPlugin {
override def requires = plugins.JvmPlugin
val changedDirectories = taskKey[immutable.Set[String]]("List of touched
modules in this PR branch")
- val testChanged = taskKey[Unit]("Test all subprojects with changes compared
to master")
+ val testChanged = taskKey[Unit]("Test all subprojects with changes compared
to main branch")
override lazy val buildSettings = Seq(
changedDirectories := {
val log = streams.value.log
- val target = "origin/master"
+ val target = "origin/main"
// TODO could use jgit
val diffOutput = s"git diff $target --name-only".!!.split("\n")
diff --git a/scripts/gh-detect-changes.sh b/scripts/gh-detect-changes.sh
index 290d743e..9c69583c 100755
--- a/scripts/gh-detect-changes.sh
+++ b/scripts/gh-detect-changes.sh
@@ -8,10 +8,10 @@ if [ "$GITHUB_EVENT_NAME" == "pull_request" ]
then
COMPARE_TO="origin/${GITHUB_BASE_REF}"
else
- # for non-pr (master) builds, comparison for changes is made against the
previous commit,
+ # for non-pr (main branch) builds, comparison for changes is made against
the previous commit,
# which might be:
# * merge commit, then HEAD^ is the last commit before branching out
- # * squash commit, then HEAD^ is the previous state of master
+ # * squash commit, then HEAD^ is the previous state of main branch
COMPARE_TO="HEAD^"
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
