From: Julien HENRY <julien.henry@sonarsource.com>
Date: Fri, 27 Sep 2024 09:33:45 +0000 (+0200)
Subject: SCANCLI-157 Fix Bouncycastle issue on FIPS environments
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fheads%2Fjh%2Ffix_fips;p=sonar-scanner-cli.git

SCANCLI-157 Fix Bouncycastle issue on FIPS environments
---

diff --git a/pom.xml b/pom.xml
index 9df7eb8..38cfcb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>org.sonarsource.scanner.lib</groupId>
       <artifactId>sonar-scanner-java-library</artifactId>
-      <version>3.1.0.234</version>
+      <version>3.1.1.250</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -162,6 +162,15 @@
             <configuration>
               <createDependencyReducedPom>true</createDependencyReducedPom>
               <minimizeJar>true</minimizeJar>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <manifestEntries>
+                    <!-- Required for Bouncycastle -->
+                    <Multi-Release>true</Multi-Release>
+                  </manifestEntries>
+                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+              </transformers>
               <filters>
                 <filter>
                   <artifact>*:*</artifact>
@@ -171,7 +180,6 @@
                     <exclude>META-INF/*.RSA</exclude>
                     <exclude>META-INF/LICENSE.txt</exclude>
                     <exclude>META-INF/NOTICE.txt</exclude>
-                    <exclude>META-INF/MANIFEST.MF</exclude>
                     <exclude>**/module-info.class</exclude>
                   </excludes>
                 </filter>