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 8ee4bebe add license and notice to all jars (#18)
8ee4bebe is described below
commit 8ee4bebea0c5f77ee6e537645eba3ff01b162901
Author: PJ Fanning <[email protected]>
AuthorDate: Tue Jan 10 11:02:41 2023 +0100
add license and notice to all jars (#18)
* add license and notice to all jars
---
LICENSE | 2 +-
NOTICE | 11 +++++++++++
build.sbt | 1 +
project/Common.scala | 25 +++++++++++++------------
project/MetaInfLicenseNoticeCopy.scala | 30 ++++++++++++++++++++++++++++++
5 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/LICENSE b/LICENSE
index a12e20f8..215fd10c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
This software is licensed under the Apache 2 license, quoted below.
-Copyright 2016 Lightbend Inc. [http://www.lightbend.com]
+Copyright 2016 Lightbend Inc. [https://www.lightbend.com]
Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 00000000..198c9f4b
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,11 @@
+Apache Pekko-HTTP
+Copyright 2022, 2023 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+
+This product contains significant parts that were originally based on software
from Lightbend (Akka <https://akka.io/>).
+Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
+
+Apache Pekko Connectors is derived from Alpakka 4.0.x, the last version that
was distributed under the
+Apache License, Version 2.0 License.
\ No newline at end of file
diff --git a/build.sbt b/build.sbt
index f351e263..50647c8d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -416,6 +416,7 @@ def pekkoConnectorProject(projectId: String,
ProblemFilters.exclude[Problem]("com.google.*")),
Test / parallelExecution := false)
.settings(additionalSettings: _*)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.dependsOn(testkit % Test)
}
diff --git a/project/Common.scala b/project/Common.scala
index 34a7bc54..b7186fc3 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -22,16 +22,17 @@ object Common extends AutoPlugin {
override def globalSettings = Seq(
organization := "org.apache.pekko",
- organizationName := "Lightbend Inc.",
- organizationHomepage := Some(url("https://www.lightbend.com/";)),
- homepage := Some(url("https://doc.akka.io/docs/alpakka/current";)),
- scmInfo := Some(ScmInfo(url("https://github.com/akka/alpakka";),
"[email protected]:akka/alpakka.git")),
+ organizationName := "Apache Pekko",
+ organizationHomepage := Some(url("https://www.apache.org/";)),
+ homepage := Some(url("https://pekko.apache.org/";)),
+ scmInfo :=
Some(ScmInfo(url("https://github.com/apache/incubator-pekko-connectors";),
+ "[email protected]:apache/incubator-pekko-connectors.git")),
developers += Developer("contributors",
"Contributors",
- "https://gitter.im/akka/dev";,
- url("https://github.com/akka/alpakka/graphs/contributors";)),
+ "",
+
url("https://github.com/apache/incubator-pekko-connectors/graphs/contributors";)),
licenses := Seq(("Apache-2.0",
url("https://www.apache.org/licenses/LICENSE-2.0";))),
- description := "Alpakka is a Reactive Enterprise Integration library for
Java and Scala, based on Reactive Streams and Akka.",
+ description := "Apache Pekko Connectors is a Reactive Enterprise
Integration library for Java and Scala, based on Reactive Streams and Pekko.",
fatalWarnings := true,
mimaReportSignatureProblems := true,
// Ignore unused keys which affect documentation
@@ -58,7 +59,7 @@ object Common extends AutoPlugin {
}),
Compile / doc / scalacOptions := scalacOptions.value ++ Seq(
"-doc-title",
- "Alpakka",
+ "Apache Pekko Connectors",
"-doc-version",
version.value,
"-sourcepath",
@@ -73,7 +74,7 @@ object Common extends AutoPlugin {
Seq(
"-doc-source-url", {
val branch = if (isSnapshot.value) "master" else s"v${version.value}"
-
s"https://github.com/akka/alpakka/tree/${branch}€{FILE_PATH_EXT}#L€{FILE_LINE}";
+
s"https://github.com/apache/incubator-pekko-connectors/tree/${branch}€{FILE_PATH_EXT}#L€{FILE_LINE}";
},
"-doc-canonical-base-url",
"https://doc.akka.io/api/alpakka/current/";),
@@ -112,7 +113,7 @@ object Common extends AutoPlugin {
Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-F", "4"),
scalafmtOnCompile := false,
javafmtOnCompile := false,
- headerLicense := Some(
- HeaderLicense.Custom("Copyright (C) since 2016 Lightbend Inc.
<https://www.lightbend.com>")),
- sonatypeProfileName := "com.lightbend")
+ headerLicense := Some(HeaderLicense.Custom(
+ "Copyright (C) since 2016 Lightbend Inc. <https://www.lightbend.com>")),
+ sonatypeProfileName := "org.apache.pekko")
}
diff --git a/project/MetaInfLicenseNoticeCopy.scala
b/project/MetaInfLicenseNoticeCopy.scala
new file mode 100644
index 00000000..1965dc54
--- /dev/null
+++ b/project/MetaInfLicenseNoticeCopy.scala
@@ -0,0 +1,30 @@
+/*
+ * 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, which was derived from Akka.
+ */
+
+import sbt.Keys._
+import sbt._
+
+/**
+ * Copies LICENSE and NOTICE files into jar META-INF dir
+ */
+object MetaInfLicenseNoticeCopy {
+
+ val settings: Seq[Setting[_]] = inConfig(Compile)(
+ Seq(
+ resourceGenerators += copyFileToMetaInf(resourceManaged, "LICENSE"),
+ resourceGenerators += copyFileToMetaInf(resourceManaged, "NOTICE")))
+
+ def copyFileToMetaInf(dir: SettingKey[File], fileName: String) =
Def.task[Seq[File]] {
+ val fromFile = (LocalRootProject / baseDirectory).value / fileName
+ val toFile = resourceManaged.value / "META-INF" / fileName
+ IO.copyFile(fromFile, toFile)
+ Seq(toFile)
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
