NIFI-14052 Removed non-deterministic build properties (#9558)

- Removed Maven and Java Home properties from Runtime Manifest build
- Removed Built-By and Build-Os-Version properties from Runtime Manifest
- Disabled JAXB episode file generation
- Enabled output sorting for Swagger specification

Signed-off-by: Lucas Ottersbach <ottersbach@apache.org>
This commit is contained in:
David Handermann 2024-11-30 13:47:20 -06:00 committed by GitHub
parent 2199d64298
commit de9042bb19
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 19 additions and 8 deletions

View File

@ -17,15 +17,11 @@
Build-Branch:${buildBranch}
Build-Timestamp:${timestamp}
Built-By:${user.name}
MiNiFi-Version:${project.version}
Build-Revision:${buildRevision}
Maven-Home:${maven.home}
Maven-Version:${maven.version}
Created-By:${maven.build.version}
Build-Java-Home:${java.home}
Build-Jdk:${java.version}
Build-Jdk-Vendor:${java.vendor}
Build-Arch:${os.arch}
Build-Os:${os.name}
Build-Os-Version:${os.version}

View File

@ -112,6 +112,7 @@
<outputPath>${restApiDirectory}</outputPath>
<outputFileName>swagger</outputFileName>
<outputFormat>JSONANDYAML</outputFormat>
<sortOutput>true</sortOutput>
<prettyPrint>true</prettyPrint>
<defaultResponseCode>200</defaultResponseCode>
<configurationFilePath>${project.build.outputDirectory}/openapi.yaml</configurationFilePath>

View File

@ -17,13 +17,9 @@ Project-Version:${project.version}
Build-Branch:${buildBranch}
Build-Revision:${buildRevision}
Build-Timestamp:${maven.build.timestamp}
Built-By:${user.name}
Maven-Home:${maven.home}
Maven-Version:${maven.version}
Created-By:${maven.build.version}
Build-Java-Home:${java.home}
Build-Jdk:${java.version}
Build-Jdk-Vendor:${java.vendor}
Build-Arch:${os.arch}
Build-Os:${os.name}
Build-Os-Version:${os.version}

View File

@ -96,6 +96,7 @@
<outputPath>${api.docs.dir}</outputPath>
<outputFileName>swagger</outputFileName>
<outputFormat>JSONANDYAML</outputFormat>
<sortOutput>true</sortOutput>
<prettyPrint>true</prettyPrint>
<defaultResponseCode>200</defaultResponseCode>
<configurationFilePath>${project.build.outputDirectory}/openapi.yaml</configurationFilePath>

17
pom.xml
View File

@ -815,6 +815,8 @@
<artifactId>hisrc-higherjaxb40-maven-plugin</artifactId>
<configuration>
<noFileHeader>true</noFileHeader>
<!-- Disable episode file generation with non-reproducible timestamps -->
<episode>false</episode>
</configuration>
</plugin>
<plugin>
@ -1009,6 +1011,21 @@
</properties>
</profile>
<!-- Set reproducible build properties for Apache Releases -->
<profile>
<id>apache-release</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
<maven.buildNumber.skip>true</maven.buildNumber.skip>
<buildTag>rel/nifi-${project.version}</buildTag>
<buildRevision>1</buildRevision>
<buildBranch>main</buildBranch>
<maven.build.timestamp>${project.build.outputTimestamp}</maven.build.timestamp>
</properties>
</profile>
<profile>
<!-- Performs execution of Integration Tests using the Maven
FailSafe Plugin. The view of integration tests in this context are those