1515ed38b2
### What changes were proposed in this pull request? We used `jersey2` library for celeborn-openapi-client before, and I found that there is dependencies lack issue for shaded celeborn-openapi-client. I tried to raise a [PR #2640] to fix it, but seems It is difficult to maintain the dependencies transition from jersey dependencies. And I received the suggestion from pan to migrate the library from jersey2 to `apache-httpclient`. FYI: for https://openapi-generator.tech/docs/generators/java/ <img width="500" alt="image" src="https://github.com/user-attachments/assets/d102a7c9-46cd-4fd7-a2a0-7396a815776d"> To leverage the latest openapi-generator plugin, I upgrade the openapi-generator version to latest 7.7.0 and it requires JDK11+. Due celeborn does not drop the Java8 support so far, so I include the generated code into repo and add user guide for re-generation. ### Why are the changes needed? To fix dependencies leak issue and maintain the dependencies easily. ### Does this PR introduce _any_ user-facing change? No, this SDK has not been released, so no user-facing change. ### How was this patch tested? Testing with sample maven project. pom.xml: ``` <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.example</groupId> <artifactId>test_openapi</artifactId> <version>1.0-SNAPSHOT</version> <properties> <maven.compiler.source>8</maven.compiler.source> <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <dependencies> <dependency> <groupId>org.apache.celeborn</groupId> <artifactId>celeborn-openapi-client_2.12</artifactId> <version>0.6.0-SNAPSHOT</version> </dependency> </dependencies> </project> ``` Testing code: ``` package org.example; import org.apache.celeborn.rest.v1.master.MasterApi; import org.apache.celeborn.rest.v1.master.WorkerApi; import org.apache.celeborn.rest.v1.master.invoker.ApiClient; public class Main { public static void main(String[] args) throws Exception { String cmUrl = "http://***:9098"; MasterApi masterApi = new MasterApi(new ApiClient().setBasePath(cmUrl)); System.out.println(masterApi.getMasterGroupInfo().getLeader().getAddress().split(":")[0]); WorkerApi workerApi = new WorkerApi(new ApiClient().setBasePath(cmUrl)); System.out.println(workerApi.getWorkers()); System.out.println(workerApi.getWorkerEvents()); } } ``` ``` java -Dfile.encoding=UTF-8 -classpath /Users/fwang12/todo/test_openapi/target/classes:/Users/fwang12/todo/celeborn/openapi/openapi-client/target/celeborn-openapi-client_2.12-0.6.0-SNAPSHOT.jar org.example.Main ``` <img width="1727" alt="image" src="https://github.com/user-attachments/assets/2da8b126-be96-4c37-9a33-ba196024f2ba"> Closes #2641 from turboFei/appache_httpclient. Lead-authored-by: Wang, Fei <fwang12@ebay.com> Co-authored-by: Fei Wang <cn.feiwang@gmail.com> Co-authored-by: Cheng Pan <pan3793@gmail.com> Signed-off-by: Shuang <lvshuang.xjs@alibaba-inc.com>
329 lines
14 KiB
XML
329 lines
14 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!--
|
|
~ Licensed to the Apache Software Foundation (ASF) under one or more
|
|
~ contributor license agreements. See the NOTICE file distributed with
|
|
~ this work for additional information regarding copyright ownership.
|
|
~ The ASF licenses this file to You 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 the License at
|
|
~
|
|
~ http://www.apache.org/licenses/LICENSE-2.0
|
|
~
|
|
~ Unless required by applicable law or agreed to in writing, software
|
|
~ distributed under the License is distributed on an "AS IS" BASIS,
|
|
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
~ See the License for the specific language governing permissions and
|
|
~ limitations under the License.
|
|
-->
|
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
<parent>
|
|
<groupId>org.apache.celeborn</groupId>
|
|
<artifactId>celeborn-parent_${scala.binary.version}</artifactId>
|
|
<version>${project.version}</version>
|
|
<relativePath>../../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
<artifactId>celeborn-openapi-client_${scala.binary.version}</artifactId>
|
|
<packaging>jar</packaging>
|
|
<name>Celeborn OpenAPI Client</name>
|
|
|
|
<dependencyManagement>
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
|
<artifactId>jackson-jaxrs-json-provider</artifactId>
|
|
<version>${jackson.version}</version>
|
|
<exclusions>
|
|
<exclusion>
|
|
<groupId>jakarta.activation</groupId>
|
|
<artifactId>jakarta.activation-api</artifactId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
</dependencies>
|
|
</dependencyManagement>
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-annotations</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-core</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-databind</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.fasterxml.jackson.datatype</groupId>
|
|
<artifactId>jackson-datatype-jsr310</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
|
<artifactId>jackson-jaxrs-json-provider</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.google.code.findbugs</groupId>
|
|
<artifactId>jsr305</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>jakarta.annotation</groupId>
|
|
<artifactId>jakarta.annotation-api</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.httpcomponents.client5</groupId>
|
|
<artifactId>httpclient5</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.httpcomponents.core5</groupId>
|
|
<artifactId>httpcore5</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.httpcomponents.core5</groupId>
|
|
<artifactId>httpcore5-h2</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.openapitools</groupId>
|
|
<artifactId>jackson-databind-nullable</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.slf4j</groupId>
|
|
<artifactId>slf4j-api</artifactId>
|
|
</dependency>
|
|
</dependencies>
|
|
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-shade-plugin</artifactId>
|
|
<configuration>
|
|
<relocations>
|
|
<relocation>
|
|
<pattern>org.openapitools</pattern>
|
|
<shadedPattern>${shading.prefix}.org.openapitools</shadedPattern>
|
|
</relocation>
|
|
<relocation>
|
|
<pattern>javax.annotation</pattern>
|
|
<shadedPattern>${shading.prefix}.javax.annotation</shadedPattern>
|
|
</relocation>
|
|
<relocation>
|
|
<pattern>com.fasterxml.jackson</pattern>
|
|
<shadedPattern>${shading.prefix}.com.fasterxml.jackson</shadedPattern>
|
|
</relocation>
|
|
<relocation>
|
|
<pattern>jakarta.validation</pattern>
|
|
<shadedPattern>${shading.prefix}.jakarta.validation</shadedPattern>
|
|
</relocation>
|
|
<relocation>
|
|
<pattern>javax.validation</pattern>
|
|
<shadedPattern>${shading.prefix}.javax.validation</shadedPattern>
|
|
</relocation>
|
|
<relocation>
|
|
<pattern>javax.ws.rs.ext</pattern>
|
|
<shadedPattern>${shading.prefix}.javax.ws.rs.ext</shadedPattern>
|
|
</relocation>
|
|
<relocation>
|
|
<pattern>org.apache.hc</pattern>
|
|
<shadedPattern>${shading.prefix}.org.apache.hc</shadedPattern>
|
|
</relocation>
|
|
<relocation>
|
|
<pattern>org.slf4j</pattern>
|
|
<shadedPattern>${shading.prefix}.org.slf4j</shadedPattern>
|
|
</relocation>
|
|
<relocation>
|
|
<pattern>META-INF/versions/11/com/fasterxml/jackson</pattern>
|
|
<shadedPattern>META-INF/versions/11/org/apache/celeborn/shaded/com/fasterxml/jackson</shadedPattern>
|
|
</relocation>
|
|
<relocation>
|
|
<pattern>META-INF/versions/17/com/fasterxml/jackson</pattern>
|
|
<shadedPattern>META-INF/versions/17/org/apache/celeborn/shaded/com/fasterxml/jackson</shadedPattern>
|
|
</relocation>
|
|
<relocation>
|
|
<pattern>META-INF/versions/19/com/fasterxml/jackson</pattern>
|
|
<shadedPattern>META-INF/versions/19/org/apache/celeborn/shaded/com/fasterxml/jackson</shadedPattern>
|
|
</relocation>
|
|
</relocations>
|
|
<artifactSet>
|
|
<includes>
|
|
<include>com.fasterxml.jackson.core:jackson-annotations</include>
|
|
<include>com.fasterxml.jackson.core:jackson-databind</include>
|
|
<include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310</include>
|
|
<include>org.apache.httpcomponents.client5:httpclient5</include>
|
|
<include>org.apache.httpcomponents.core5:httpcore5</include>
|
|
<include>org.apache.httpcomponents.core5:httpcore5-h2</include>
|
|
<include>com.fasterxml.jackson.core:jackson-core</include>
|
|
<include>com.google.code.findbugs:jsr305</include>
|
|
<include>jakarta.annotation:jakarta.annotation-api</include>
|
|
<include>org.openapitools:jackson-databind-nullable</include>
|
|
<include>org.slf4j:slf4j-api</include>
|
|
</includes>
|
|
</artifactSet>
|
|
<filters>
|
|
<filter>
|
|
<artifact>*:*</artifact>
|
|
<excludes>
|
|
<exclude>META-INF/*.SF</exclude>
|
|
<exclude>META-INF/*.DSA</exclude>
|
|
<exclude>META-INF/*.RSA</exclude>
|
|
<exclude>**/log4j.properties</exclude>
|
|
<exclude>META-INF/DEPENDENCIES</exclude>
|
|
<exclude>META-INF/*LICENSE*</exclude>
|
|
<exclude>META-INF/MANIFEST.MF</exclude>
|
|
<exclude>META-INF/*NOTICE*</exclude>
|
|
<exclude>META-INF/**/module-info.class</exclude>
|
|
<exclude>LICENSE.txt</exclude>
|
|
<exclude>NOTICE.txt</exclude>
|
|
<exclude>mozilla/*.txt</exclude>
|
|
</excludes>
|
|
</filter>
|
|
</filters>
|
|
<transformers>
|
|
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"></transformer>
|
|
</transformers>
|
|
</configuration>
|
|
</plugin>
|
|
<!--
|
|
This is to ensure references to shaded classes can be resolved in IDEs such as Intellij.
|
|
For reference: https://youtrack.jetbrains.com/issue/IDEA-126596
|
|
-->
|
|
<plugin>
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
<artifactId>build-helper-maven-plugin</artifactId>
|
|
<executions>
|
|
<execution>
|
|
<id>compile</id>
|
|
<goals>
|
|
<goal>attach-artifact</goal>
|
|
</goals>
|
|
<phase>package</phase>
|
|
<configuration>
|
|
<artifacts>
|
|
<artifact>
|
|
<file>${basedir}/target/${project.artifactId}-${project.version}.jar</file>
|
|
<type>jar</type>
|
|
<classifier>optional</classifier>
|
|
</artifact>
|
|
</artifacts>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
|
|
<profiles>
|
|
<profile>
|
|
<id>generate</id>
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.openapitools</groupId>
|
|
<artifactId>openapi-generator-maven-plugin</artifactId>
|
|
<!--
|
|
please keep the schema definitions consistent between master_rest_v1.yaml and worker_rest_v1.yaml
|
|
-->
|
|
<executions>
|
|
<execution>
|
|
<id>generate-java-master-rest-v1</id>
|
|
<goals>
|
|
<goal>generate</goal>
|
|
</goals>
|
|
<phase>generate-sources</phase>
|
|
<configuration>
|
|
<inputSpec>${project.basedir}/src/main/openapi3/master_rest_v1.yaml</inputSpec>
|
|
<output>${project.build.directory}/generated-sources/java</output>
|
|
<apiPackage>org.apache.celeborn.rest.v1.master</apiPackage>
|
|
<modelPackage>org.apache.celeborn.rest.v1.model</modelPackage>
|
|
<invokerPackage>org.apache.celeborn.rest.v1.master.invoker</invokerPackage>
|
|
<generatorName>java</generatorName>
|
|
<generateApiTests>false</generateApiTests>
|
|
<generateModelTests>false</generateModelTests>
|
|
<groupId>${groupId}</groupId>
|
|
<artifactId>${artifactId}</artifactId>
|
|
<artifactVersion>${project.version}</artifactVersion>
|
|
<addCompileSourceRoot>false</addCompileSourceRoot>
|
|
<templateDirectory>${project.basedir}/src/main/openapi3/templates</templateDirectory>
|
|
<cleanupOutput>true</cleanupOutput>
|
|
<configOptions>
|
|
<licenseName>Apache License 2.0</licenseName>
|
|
<groupId>${groupId}</groupId>
|
|
<artifactId>${artifactId}</artifactId>
|
|
<artifactVersion>${project.version}</artifactVersion>
|
|
<dateLibrary>java8</dateLibrary>
|
|
<useGzipFeature>true</useGzipFeature>
|
|
<library>apache-httpclient</library>
|
|
<hideGenerationTimestamp>true</hideGenerationTimestamp>
|
|
<supportUrlQuery>false</supportUrlQuery>
|
|
<annotationLibrary>none</annotationLibrary>
|
|
</configOptions>
|
|
</configuration>
|
|
</execution>
|
|
<execution>
|
|
<id>generate-java-worker-rest-v1</id>
|
|
<goals>
|
|
<goal>generate</goal>
|
|
</goals>
|
|
<phase>generate-sources</phase>
|
|
<configuration>
|
|
<inputSpec>${project.basedir}/src/main/openapi3/worker_rest_v1.yaml</inputSpec>
|
|
<output>${project.build.directory}/generated-sources/java</output>
|
|
<apiPackage>org.apache.celeborn.rest.v1.worker</apiPackage>
|
|
<modelPackage>org.apache.celeborn.rest.v1.model</modelPackage>
|
|
<invokerPackage>org.apache.celeborn.rest.v1.worker.invoker</invokerPackage>
|
|
<generatorName>java</generatorName>
|
|
<generateApiTests>false</generateApiTests>
|
|
<generateModelTests>false</generateModelTests>
|
|
<groupId>${groupId}</groupId>
|
|
<artifactId>${artifactId}</artifactId>
|
|
<artifactVersion>${project.version}</artifactVersion>
|
|
<addCompileSourceRoot>false</addCompileSourceRoot>
|
|
<templateDirectory>${project.basedir}/src/main/openapi3/templates</templateDirectory>
|
|
<configOptions>
|
|
<licenseName>Apache License 2.0</licenseName>
|
|
<groupId>${groupId}</groupId>
|
|
<artifactId>${artifactId}</artifactId>
|
|
<artifactVersion>${project.version}</artifactVersion>
|
|
<dateLibrary>java8</dateLibrary>
|
|
<useGzipFeature>true</useGzipFeature>
|
|
<library>apache-httpclient</library>
|
|
<hideGenerationTimestamp>true</hideGenerationTimestamp>
|
|
<supportUrlQuery>false</supportUrlQuery>
|
|
<annotationLibrary>none</annotationLibrary>
|
|
</configOptions>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-resources-plugin</artifactId>
|
|
<executions>
|
|
<execution>
|
|
<id>copy-resources</id>
|
|
<goals>
|
|
<goal>copy-resources</goal>
|
|
</goals>
|
|
<phase>generate-resources</phase>
|
|
<configuration>
|
|
<outputDirectory>${project.basedir}/src/main/java</outputDirectory>
|
|
<overwrite>true</overwrite>
|
|
<resources>
|
|
<resource>
|
|
<directory>${project.basedir}/target/generated-sources/java/src/main/java</directory>
|
|
</resource>
|
|
</resources>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
</profile>
|
|
</profiles>
|
|
</project>
|