Skip to content

Commit 0d91fac

Browse files
slessardSteve Lessard
andauthored
Change the artifactId when building FIPS-compliant netty-tcnative-boringssl-static (#945)
Change the artifactId when building FIPS-compliant netty-tcnative-boringssl-static Motivation: netty-tcnative-boringssl when compiled for default mode or FIPS mode result in the same artifactId, same classifier, same version number and yet have a very significant different feature. It is not possible to store both builds in a repository such as Artifactory. To resolve this issue I made it so FIPS-mode builds get a different artifactId. Default mode build artifactId: netty-tcnative-boringssl-stati FIPS mode build artifactId: netty-tcnative-boringssl-static-fips Modifications: based on the active maven profile... - Change the artifactId - Add a field to the jar's manifest to state whether it was built with FIPS support Result: When built with the fips-boringssl-static profile the jar file names will now be netty-tcnative-boringssl-static-fips-2.0.75.Final-SNAPSHOT*.jar Co-authored-by: Steve Lessard <steve.lessard@oracle.com>
1 parent 7f8dc19 commit 0d91fac

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

‎boringssl-static/pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<artifactId>netty-tcnative-parent</artifactId>
2222
<version>2.0.75.Final-SNAPSHOT</version>
2323
</parent>
24-
<artifactId>netty-tcnative-boringssl-static</artifactId>
24+
<artifactId>${project.artifactId}</artifactId>
2525
<packaging>jar</packaging>
2626

2727
<name>Netty/TomcatNative [BoringSSL - Static]</name>
@@ -99,6 +99,7 @@
9999
<!-- 10.13 is the minimum required by BoringSSL -->
100100
<macOsxDeploymentTarget>MACOSX_DEPLOYMENT_TARGET=10.13</macOsxDeploymentTarget>
101101
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13</cmakeOsxDeploymentTarget>
102+
<project.artifactId>netty-tcnative-boringssl-static</project.artifactId>
102103
</properties>
103104

104105
<dependencies>
@@ -124,6 +125,7 @@
124125
<msvcSslLibDirs>${boringsslBuildDir}</msvcSslLibDirs>
125126
<msvcSslLibs>ssl.lib;crypto.lib</msvcSslLibs>
126127
<jniArch>${os.detected.arch}</jniArch>
128+
<project.artifactId>netty-tcnative-boringssl-static-fips</project.artifactId>
127129
</properties>
128130

129131
<build>
@@ -177,6 +179,7 @@
177179
<Apr-Version>${aprVersion}</Apr-Version>
178180
<BoringSSL-Revision>${boringsslBuildNumber}</BoringSSL-Revision>
179181
<BoringSSL-Branch>${boringsslBranch}</BoringSSL-Branch>
182+
<BoringSSL-FIPS-Compliant>true</BoringSSL-FIPS-Compliant>
180183
</instructions>
181184
</configuration>
182185
</plugin>
@@ -444,6 +447,7 @@
444447
<Apr-Version>${aprVersion}</Apr-Version>
445448
<BoringSSL-Revision>${boringsslCommitSha}</BoringSSL-Revision>
446449
<BoringSSL-Branch>${boringsslBranch}</BoringSSL-Branch>
450+
<BoringSSL-FIPS-Compliant>false</BoringSSL-FIPS-Compliant>
447451
</instructions>
448452
</configuration>
449453
</plugin>

0 commit comments

Comments
 (0)