(incubator-celeborn) branch main updated: [CELEBORN-1199][FOLLOWUP] Disabled the plugin `AddMetaInfLicenseFiles` for shaded clients

[chengpan]

This is an automated email from the ASF dual-hosted git repository.

chengpan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git


The following commit(s) were added to refs/heads/main by this push:
     new 55df09c14 [CELEBORN-1199][FOLLOWUP] Disabled the plugin 
`AddMetaInfLicenseFiles` for shaded clients
55df09c14 is described below

commit 55df09c14cbfbe010e7a87c2a82f6a1c47c8fd7c
Author: Fu Chen <cfmcgr...@gmail.com>
AuthorDate: Fri Dec 29 10:02:22 2023 +0800

    [CELEBORN-1199][FOLLOWUP] Disabled the plugin `AddMetaInfLicenseFiles` for 
shaded clients
    
    ### What changes were proposed in this pull request?
    
    As title
    
    ### Why are the changes needed?
    
    
https://github.com/apache/incubator-celeborn/pull/2189#issuecomment-1870940496
    
    ### Does this PR introduce _any_ user-facing change?
    
    No
    
    ### How was this patch tested?
    
    Manually tested
    
    Closes #2195 from cfmcgrady/license-followup.
    
    Authored-by: Fu Chen <cfmcgr...@gmail.com>
    Signed-off-by: Cheng Pan <cheng...@apache.org>
---
 project/AddMetaInfLicenseFiles.scala | 3 +++
 project/CelebornBuild.scala          | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/project/AddMetaInfLicenseFiles.scala 
b/project/AddMetaInfLicenseFiles.scala
index 6988ff853..c10e636b9 100644
--- a/project/AddMetaInfLicenseFiles.scala
+++ b/project/AddMetaInfLicenseFiles.scala
@@ -27,8 +27,11 @@ object AddMetaInfLicenseFiles extends AutoPlugin {
 
   override lazy val projectSettings = Seq(
     Compile / resourceGenerators += Def.task {
+      val log = streams.value.log
+      log.info(s"generate META-INF/LICENSE for project ${name.value}")
       val licenseFile = (Compile / resourceManaged).value / "META-INF" / 
"LICENSE"
       IO.write(licenseFile, license)
+      log.info(s"generate META-INF/NOTICE for project ${name.value}")
       val noticeFile = (Compile / resourceManaged).value / "META-INF" / 
"NOTICE"
       IO.write(noticeFile, notice)
       Seq(licenseFile, noticeFile)
diff --git a/project/CelebornBuild.scala b/project/CelebornBuild.scala
index 607185f6c..e329e7a9a 100644
--- a/project/CelebornBuild.scala
+++ b/project/CelebornBuild.scala
@@ -711,6 +711,7 @@ trait SparkClientProjects {
   def sparkClientShade: Project = {
     val p = Project(sparkClientShadedProjectName, 
file(sparkClientShadedProjectPath))
       .dependsOn(sparkClient)
+      .disablePlugins(AddMetaInfLicenseFiles)
       .settings (
         commonSettings,
         releaseSettings,
@@ -906,6 +907,7 @@ trait FlinkClientProjects {
   def flinkClientShade: Project = {
     Project(flinkClientShadedProjectName, file(flinkClientShadedProjectPath))
       .dependsOn(flinkClient)
+      .disablePlugins(AddMetaInfLicenseFiles)
       .settings (
         commonSettings,
         releaseSettings,
@@ -1007,6 +1009,7 @@ object MRClientProjects {
   def mrClientShade: Project = {
     Project("celeborn-client-mr-shaded", file("client-mr/mr-shaded"))
       .dependsOn(mrClient)
+      .disablePlugins(AddMetaInfLicenseFiles)
       .settings(
         commonSettings,
         releaseSettings,