From aee1557f4f4788f5a590921c3bef206fd298e09c Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sat, 5 Aug 2023 09:25:39 +0100 Subject: [PATCH 1/3] add license headers --- .../lease/kubernetes/KubernetesApiIntegrationTest.scala | 9 +++++++++ .../lease/kubernetes/LeaseContentionSpec.scala | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/lease-kubernetes/src/it/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesApiIntegrationTest.scala b/lease-kubernetes/src/it/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesApiIntegrationTest.scala index 98c0473d..6ae33a55 100644 --- a/lease-kubernetes/src/it/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesApiIntegrationTest.scala +++ b/lease-kubernetes/src/it/scala/org/apache/pekko/coordination/lease/kubernetes/KubernetesApiIntegrationTest.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, which was derived from Akka. + */ + package org.apache.pekko.coordination.lease.kubernetes import org.apache.pekko diff --git a/lease-kubernetes/src/it/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseContentionSpec.scala b/lease-kubernetes/src/it/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseContentionSpec.scala index 6811ff8c..5f794e57 100644 --- a/lease-kubernetes/src/it/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseContentionSpec.scala +++ b/lease-kubernetes/src/it/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseContentionSpec.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, which was derived from Akka. + */ + package org.apache.pekko.coordination.lease.kubernetes import java.util.concurrent.Executors From beffb0ccd71531364c18f8ab71881b2707d1f108 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sat, 5 Aug 2023 09:37:05 +0100 Subject: [PATCH 2/3] more headers (and sbt 1.9.3) --- integration-test/aws-api-ec2/project/plugins.sbt | 9 +++++++++ integration-test/dns-api-mesos/project/build.properties | 2 +- integration-test/dns-api-mesos/project/plugins.sbt | 9 +++++++++ .../kubernetes-api-java/project/build.properties | 2 +- integration-test/kubernetes-api/project/build.properties | 2 +- integration-test/kubernetes-dns/project/build.properties | 2 +- .../marathon-api-docker/project/build.properties | 2 +- integration-test/marathon-api-docker/project/plugins.sbt | 9 +++++++++ integration-test/marathon-api/project/build.properties | 2 +- integration-test/marathon-api/project/plugins.sbt | 9 +++++++++ 10 files changed, 42 insertions(+), 6 deletions(-) diff --git a/integration-test/aws-api-ec2/project/plugins.sbt b/integration-test/aws-api-ec2/project/plugins.sbt index aec5d8d5..681004c4 100644 --- a/integration-test/aws-api-ec2/project/plugins.sbt +++ b/integration-test/aws-api-ec2/project/plugins.sbt @@ -1 +1,10 @@ +/* + * 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. + */ + addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.2") diff --git a/integration-test/dns-api-mesos/project/build.properties b/integration-test/dns-api-mesos/project/build.properties index 406a7d25..e2e1cd84 100644 --- a/integration-test/dns-api-mesos/project/build.properties +++ b/integration-test/dns-api-mesos/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.16 \ No newline at end of file +sbt.version=1.9.3 \ No newline at end of file diff --git a/integration-test/dns-api-mesos/project/plugins.sbt b/integration-test/dns-api-mesos/project/plugins.sbt index f5c1302f..6ac7405a 100644 --- a/integration-test/dns-api-mesos/project/plugins.sbt +++ b/integration-test/dns-api-mesos/project/plugins.sbt @@ -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, which was derived from Akka. + */ + addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.2") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "2.0.0") diff --git a/integration-test/kubernetes-api-java/project/build.properties b/integration-test/kubernetes-api-java/project/build.properties index 8b697bbb..52413ab7 100644 --- a/integration-test/kubernetes-api-java/project/build.properties +++ b/integration-test/kubernetes-api-java/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.0 +sbt.version=1.9.3 diff --git a/integration-test/kubernetes-api/project/build.properties b/integration-test/kubernetes-api/project/build.properties index 8b697bbb..52413ab7 100644 --- a/integration-test/kubernetes-api/project/build.properties +++ b/integration-test/kubernetes-api/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.0 +sbt.version=1.9.3 diff --git a/integration-test/kubernetes-dns/project/build.properties b/integration-test/kubernetes-dns/project/build.properties index 8b697bbb..52413ab7 100644 --- a/integration-test/kubernetes-dns/project/build.properties +++ b/integration-test/kubernetes-dns/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.0 +sbt.version=1.9.3 diff --git a/integration-test/marathon-api-docker/project/build.properties b/integration-test/marathon-api-docker/project/build.properties index 406a7d25..e2e1cd84 100644 --- a/integration-test/marathon-api-docker/project/build.properties +++ b/integration-test/marathon-api-docker/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.16 \ No newline at end of file +sbt.version=1.9.3 \ No newline at end of file diff --git a/integration-test/marathon-api-docker/project/plugins.sbt b/integration-test/marathon-api-docker/project/plugins.sbt index aec5d8d5..681004c4 100644 --- a/integration-test/marathon-api-docker/project/plugins.sbt +++ b/integration-test/marathon-api-docker/project/plugins.sbt @@ -1 +1,10 @@ +/* + * 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. + */ + addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.2") diff --git a/integration-test/marathon-api/project/build.properties b/integration-test/marathon-api/project/build.properties index 406a7d25..e2e1cd84 100644 --- a/integration-test/marathon-api/project/build.properties +++ b/integration-test/marathon-api/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.16 \ No newline at end of file +sbt.version=1.9.3 \ No newline at end of file diff --git a/integration-test/marathon-api/project/plugins.sbt b/integration-test/marathon-api/project/plugins.sbt index aec5d8d5..681004c4 100644 --- a/integration-test/marathon-api/project/plugins.sbt +++ b/integration-test/marathon-api/project/plugins.sbt @@ -1 +1,10 @@ +/* + * 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. + */ + addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.2") From 17fae77958ee9eecd0195176476e7481f21c45f0 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sat, 5 Aug 2023 09:39:52 +0100 Subject: [PATCH 3/3] new lines --- integration-test/dns-api-mesos/project/build.properties | 2 +- integration-test/marathon-api-docker/project/build.properties | 2 +- integration-test/marathon-api/project/build.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-test/dns-api-mesos/project/build.properties b/integration-test/dns-api-mesos/project/build.properties index e2e1cd84..52413ab7 100644 --- a/integration-test/dns-api-mesos/project/build.properties +++ b/integration-test/dns-api-mesos/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.3 \ No newline at end of file +sbt.version=1.9.3 diff --git a/integration-test/marathon-api-docker/project/build.properties b/integration-test/marathon-api-docker/project/build.properties index e2e1cd84..52413ab7 100644 --- a/integration-test/marathon-api-docker/project/build.properties +++ b/integration-test/marathon-api-docker/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.3 \ No newline at end of file +sbt.version=1.9.3 diff --git a/integration-test/marathon-api/project/build.properties b/integration-test/marathon-api/project/build.properties index e2e1cd84..52413ab7 100644 --- a/integration-test/marathon-api/project/build.properties +++ b/integration-test/marathon-api/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.3 \ No newline at end of file +sbt.version=1.9.3