[CELEBORN-1477][FOLLOWUP] Remove scala binary version from openapi-client artifactId

### What changes were proposed in this pull request?

1. remove scala binary version from the openapi-client artifactId.
2. skip openapi-client doc compile, it was missed in https://github.com/apache/celeborn/pull/2641

### Why are the changes needed?

Because the openapi-client is a pure java module.

### Does this PR introduce _any_ user-facing change?

No, it has not been released.

### How was this patch tested?
GA.

Closes #2861 from turboFei/remove_Scala.

Authored-by: Wang, Fei <fwang12@ebay.com>
Signed-off-by: mingji <fengmingxiao.fmx@alibaba-inc.com>
This commit is contained in:
Wang, Fei 2024-11-01 15:08:00 +08:00 committed by mingji
parent 41fdb8ade1
commit 7dc72b35e7
5 changed files with 10 additions and 6 deletions

View File

@ -128,7 +128,7 @@ upload_nexus_staging() {
echo "Deploying celeborn-client-mr-shaded_2.12"
${PROJECT_DIR}/build/sbt -Pmr "clean;celeborn-client-mr-shaded/publishSigned"
echo "Deploying celeborn-openapi-client_2.12"
echo "Deploying celeborn-openapi-client"
${PROJECT_DIR}/build/sbt "clean;celeborn-openapi-client/publishSigned"
echo "Deploying celeborn-spi"

View File

@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.apache.celeborn</groupId>
<artifactId>celeborn-openapi-client_${scala.binary.version}</artifactId>
<artifactId>celeborn-openapi-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

View File

@ -25,7 +25,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>celeborn-openapi-client_${scala.binary.version}</artifactId>
<artifactId>celeborn-openapi-client</artifactId>
<packaging>jar</packaging>
<name>Celeborn OpenAPI Client</name>

View File

@ -1434,7 +1434,7 @@ object CelebornOpenApi {
(assembly / test) := { },
(assembly / assemblyJarName) := {
s"${moduleName.value}_${scalaBinaryVersion.value}-${version.value}.${artifact.value.extension}"
s"${moduleName.value}-${version.value}.${artifact.value.extension}"
},
(assembly / logLevel) := Level.Info,
// Exclude `scala-library` from assembly.
@ -1481,7 +1481,11 @@ object CelebornOpenApi {
case _ => MergeStrategy.first
},
Compile / packageBin := assembly.value,
pomPostProcess := removeDependenciesTransformer
pomPostProcess := removeDependenciesTransformer,
Compile / doc := {
// skip due to doc generation failure for openapi modules, see CELEBORN-1477
target.value / "none"
}
)
}

View File

@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.apache.celeborn</groupId>
<artifactId>celeborn-openapi-client_${scala.binary.version}</artifactId>
<artifactId>celeborn-openapi-client</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>