From c8dd26e23fea84ef0a92b585a43735abc4363ac7 Mon Sep 17 00:00:00 2001 From: Kexin Xie Date: Thu, 7 Apr 2022 15:23:53 -0700 Subject: [PATCH] Add missing headers --- build.sbt | 10 +--------- .../com/salesforce/mce/orchard/io/aws/Client.scala | 7 +++++++ .../mce/orchard/io/aws/ProviderSettings.scala | 7 +++++++ .../mce/orchard/io/aws/activity/Ec2Activity.scala | 7 +++++++ .../mce/orchard/io/aws/activity/EmrActivity.scala | 7 +++++++ .../orchard/io/aws/activity/ShellCommandActivity.scala | 7 +++++++ .../orchard/io/aws/activity/ShellScriptActivity.scala | 7 +++++++ .../mce/orchard/io/aws/resource/Ec2Resource.scala | 7 +++++++ .../mce/orchard/io/aws/resource/EmrResource.scala | 7 +++++++ version.sbt | 2 +- 10 files changed, 58 insertions(+), 10 deletions(-) diff --git a/build.sbt b/build.sbt index 3b82f0d..f638422 100644 --- a/build.sbt +++ b/build.sbt @@ -38,7 +38,7 @@ lazy val root = (project in file(".")). // Add your dependencies here ) ). - aggregate(orchardCore, orchardWS, orchardTR) + aggregate(orchardCore, orchardWS, orchardProviderAWS) lazy val orchardCore = (project in file("orchard-core")). settings(commonSettings: _*). @@ -79,11 +79,3 @@ lazy val orchardProviderAWS = (project in file("orchard-provider-aws")). ) ). dependsOn(orchardCore) - -lazy val orchardTR = (project in file ("orchard-tr")). - settings(commonSettings: _*). - settings( - name := "orchard-tr", - libraryDependencies ++= Seq( - ) - ) diff --git a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/Client.scala b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/Client.scala index 12d5975..0e7e3bb 100644 --- a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/Client.scala +++ b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/Client.scala @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2022, salesforce.com, inc. + * All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause + * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause + */ + package com.salesforce.mce.orchard.io.aws import software.amazon.awssdk.services.ec2.Ec2Client diff --git a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/ProviderSettings.scala b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/ProviderSettings.scala index a1cd98d..658ded8 100644 --- a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/ProviderSettings.scala +++ b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/ProviderSettings.scala @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2022, salesforce.com, inc. + * All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause + * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause + */ + package com.salesforce.mce.orchard.io.aws import com.typesafe.config.Config diff --git a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/Ec2Activity.scala b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/Ec2Activity.scala index 32e9e78..3efe488 100644 --- a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/Ec2Activity.scala +++ b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/Ec2Activity.scala @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2022, salesforce.com, inc. + * All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause + * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause + */ + package com.salesforce.mce.orchard.io.aws.activity import scala.jdk.CollectionConverters.CollectionHasAsScala diff --git a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/EmrActivity.scala b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/EmrActivity.scala index 13384d4..808d237 100644 --- a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/EmrActivity.scala +++ b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/EmrActivity.scala @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2022, salesforce.com, inc. + * All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause + * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause + */ + package com.salesforce.mce.orchard.io.aws.activity import scala.jdk.CollectionConverters._ diff --git a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/ShellCommandActivity.scala b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/ShellCommandActivity.scala index d547239..bd504de 100644 --- a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/ShellCommandActivity.scala +++ b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/ShellCommandActivity.scala @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2022, salesforce.com, inc. + * All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause + * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause + */ + package com.salesforce.mce.orchard.io.aws.activity import java.time.{LocalDateTime, ZoneOffset} diff --git a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/ShellScriptActivity.scala b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/ShellScriptActivity.scala index 620e853..aecf7dd 100644 --- a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/ShellScriptActivity.scala +++ b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/activity/ShellScriptActivity.scala @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2022, salesforce.com, inc. + * All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause + * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause + */ + package com.salesforce.mce.orchard.io.aws.activity import java.time.{LocalDateTime, ZoneOffset} diff --git a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/resource/Ec2Resource.scala b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/resource/Ec2Resource.scala index 18c9f9a..a71e4df 100644 --- a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/resource/Ec2Resource.scala +++ b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/resource/Ec2Resource.scala @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2022, salesforce.com, inc. + * All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause + * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause + */ + package com.salesforce.mce.orchard.io.aws.resource import scala.jdk.CollectionConverters.CollectionHasAsScala diff --git a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/resource/EmrResource.scala b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/resource/EmrResource.scala index 6f66645..2c1cdef 100644 --- a/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/resource/EmrResource.scala +++ b/orchard-provider-aws/src/main/scala/com/salesforce/mce/orchard/io/aws/resource/EmrResource.scala @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2022, salesforce.com, inc. + * All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause + * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause + */ + package com.salesforce.mce.orchard.io.aws.resource import scala.util.Try diff --git a/version.sbt b/version.sbt index f04273c..2d03e09 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.3.0" +ThisBuild / version := "0.3.1"