Skip to content

[INLONG-11861][CI] Compile dataproxy-sdk fail when there is no .git dictionary in the base path #11862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gosonzhang merged 4 commits into from
May 13, 2025
Merged

[INLONG-11861][CI] Compile dataproxy-sdk fail when there is no .git dictionary in the base path #11862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
132151e
[INLONG-11861][CI] Compile dataproxy-sdk fail when there is no .git d…
May 12, 2025
f517d4a
[INLONG-11861][CI] Compile dataproxy-sdk fail when there is no .git d…
May 13, 2025
d45c892
[INLONG-11861][CI] Compile dataproxy-sdk fail when there is no .git d…
May 13, 2025
e45f675
[INLONG-11861][CI] Compile dataproxy-sdk fail when there is no .git d…
May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .licenserc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,7 @@ header:
- '**/tubemq-client-go/go.sum'
- '**/dataproxy-sdk-golang/go.sum'

# dataproxy sdk version
- '**/resources/sdk.version'

comment: on-failure
35 changes: 13 additions & 22 deletions inlong-sdk/dataproxy-sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,20 @@
</dependencies>

<build>
<resources>
<resource>
<filtering>true</filtering>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down Expand Up @@ -174,28 +187,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
<version>4.9.9</version>
<configuration>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
<includeOnlyProperties>
<includeOnlyProperty>^git.build.(version)$</includeOnlyProperty>
</includeOnlyProperties>
<commitIdGenerationMode>full</commitIdGenerationMode>
</configuration>
<executions>
<execution>
<id>get-the-git-infos</id>
<goals>
<goal>revision</goal>
</goals>
<phase>initialize</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
16 changes: 12 additions & 4 deletions inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/utils/ProxyUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,19 @@ public static String getJarVersion() {
if (sdkVersion != null) {
return sdkVersion;
}
Properties properties = new Properties();
try (InputStream is = ProxyUtils.class.getResourceAsStream("/git.properties")) {
properties.load(is);
sdkVersion = properties.getProperty("git.build.version");
try (InputStream is = ProxyUtils.class.getClassLoader().getResourceAsStream("sdk.version")) {
Copy link
Member

@featzhang featzhang May 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

src/main/resources false src/main/resources-filtered true

https://maven.apache.org/plugins/maven-resources-plugin/examples/filter.html

Using Maven resource filtering seems to be a good solution, which does not rely on git.

if (is == null) {
sdkVersion = "unknown";
if (exceptCounter.shouldPrint()) {
logger.error("Missing sdk.version file!");
}
} else {
Properties properties = new Properties();
properties.load(is);
sdkVersion = properties.getProperty("version");
}
} catch (Throwable ex) {
sdkVersion = "unknown";
if (exceptCounter.shouldPrint()) {
logger.error("DataProxy-SDK get version failure", ex);
}
Expand Down
1 change: 1 addition & 0 deletions inlong-sdk/dataproxy-sdk/src/main/resources/sdk.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version=${project.version}
2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,6 +1490,8 @@
<exclude>**/dataproxy-sdk-golang/go.sum</exclude>
<!-- Docker build-->
<exclude>**/docker/docker-compose/**/**</exclude>
<!-- dataproxy sdk version -->
<exclude>**/resources/sdk.version</exclude>

</excludes>
</configuration>
Expand Down
Loading