Set org.spdx.useJARLicenseInfoOnly and use explicit commons-collectio…

…ns4 dependency (#640)
project-ncl · Jun 27, 2024 · eb2fe80 · eb2fe80
1 parent f03e889
commit eb2fe80
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 22 deletions.
diff --git a/pom.xml b/pom.xml
@@ -73,6 +73,7 @@
     <version.net.revelc.code.formatter.formatter-maven-plugin>2.23.0</version.net.revelc.code.formatter.formatter-maven-plugin>
     <version.net.revelc.code.impsort-maven-plugin>1.9.0</version.net.revelc.code.impsort-maven-plugin>
     <version.net.sourceforge.pmd>7.2.0</version.net.sourceforge.pmd>
+    <version.org.apache.commons.collections4>4.4</version.org.apache.commons.collections4>
     <version.org.apache.maven.plugins.maven-antrun-plugin>3.1.0</version.org.apache.maven.plugins.maven-antrun-plugin>
     <version.org.apache.maven.plugins.maven-checkstyle-plugin>3.4.0</version.org.apache.maven.plugins.maven-checkstyle-plugin>
     <version.org.apache.maven.plugins.maven-clean-plugin>3.4.0</version.org.apache.maven.plugins.maven-clean-plugin>
@@ -97,9 +98,10 @@
     <version.org.ec4j.maven.editorconfig-maven-plugin>0.1.0</version.org.ec4j.maven.editorconfig-maven-plugin>
     <version.org.infinispan>13.0.10.Final</version.org.infinispan>
     <version.org.jacoco>0.8.12</version.org.jacoco>
-    <version.org.jboss.pnc.build.finder>2.3.1</version.org.jboss.pnc.build.finder>
+    <version.org.jboss.pnc.build.finder>2.3.2-SNAPSHOT</version.org.jboss.pnc.build.finder>
     <version.org.jboss.pnc.pnc-api>3.0.0</version.org.jboss.pnc.pnc-api>
     <version.org.jboss.resteasy>6.2.9.Final</version.org.jboss.resteasy>
+    <version.org.junit-pioneer>2.2.0</version.org.junit-pioneer>
     <version.org.sonatype.plugins.nexus-staging-maven-plugin>1.7.0</version.org.sonatype.plugins.nexus-staging-maven-plugin>
     <version.pnc.quarkus-logging-kafka>1.0.6</version.pnc.quarkus-logging-kafka>
   </properties>
@@ -127,6 +129,11 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-collections4</artifactId>
+        <version>${version.org.apache.commons.collections4}</version>
+      </dependency>
       <dependency>
         <groupId>org.jboss.pnc.build.finder</groupId>
         <artifactId>core</artifactId>
@@ -136,6 +143,10 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -144,6 +155,12 @@
         <version>${version.com.github.tomakehurs-wiremock-jre8}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.junit-pioneer</groupId>
+        <artifactId>junit-pioneer</artifactId>
+        <version>${version.org.junit-pioneer}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -197,6 +214,10 @@
       <artifactId>javaee-api</artifactId>
       <version>8.0.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-client-hotrod</artifactId>
@@ -272,6 +293,11 @@
       <classifier>runtime</classifier>
       <scope>test</scope>
     </dependency>-->
+    <dependency>
+      <groupId>org.junit-pioneer</groupId>
+      <artifactId>junit-pioneer</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <repositories>
@@ -636,8 +662,8 @@ limitations under the License.]]></inlineHeader>
         <artifactId>quarkus-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <configuration>
-            <!-- needed to publish to maven central -->
-            <skipOriginalJarRename>true</skipOriginalJarRename>
+          <!-- needed to publish to maven central -->
+          <skipOriginalJarRename>true</skipOriginalJarRename>
         </configuration>
         <executions>
           <execution>
@@ -796,33 +822,33 @@ limitations under the License.]]></inlineHeader>
         <version>${version.org.sonatype.plugins.nexus-staging-maven-plugin}</version>
         <extensions>true</extensions>
         <configuration>
-            <serverId>ossrh</serverId>
-            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-            <autoReleaseAfterClose>false</autoReleaseAfterClose>
+          <serverId>ossrh</serverId>
+          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>false</autoReleaseAfterClose>
         </configuration>
       </plugin>
       <plugin>
-          <groupId>pl.project13.maven</groupId>
-          <artifactId>git-commit-id-plugin</artifactId>
-          <version>${version.git-commit-id-plugin}</version>
-          <configuration>
-              <!--
+        <groupId>pl.project13.maven</groupId>
+        <artifactId>git-commit-id-plugin</artifactId>
+        <version>${version.git-commit-id-plugin}</version>
+        <configuration>
+          <!--
                 If you'd like to tell the plugin where your .git directory is,
                 use this setting, otherwise we'll perform a search trying to
                 figure out the right directory. It's better to add it explicite IMHO.
               -->
-              <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+          <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
 
-              <!-- false is default here, it prints some more information during the build -->
-              <verbose>true</verbose>
-          </configuration>
-          <executions>
-              <execution>
-                  <goals>
-                      <goal>revision</goal>
-                  </goals>
-              </execution>
-          </executions>
+          <!-- false is default here, it prints some more information during the build -->
+          <verbose>true</verbose>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>revision</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>

diff --git a/src/test/java/org/jboss/pnc/deliverablesanalyzer/rest/AnalyzeResourceWithMockedBrewTest.java b/src/test/java/org/jboss/pnc/deliverablesanalyzer/rest/AnalyzeResourceWithMockedBrewTest.java
@@ -35,6 +35,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
+import org.junitpioneer.jupiter.SetSystemProperty;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
 
@@ -67,6 +68,7 @@ public AnalyzeResourceWithMockedBrewTest() throws URISyntaxException {
     }
 
     @Test
+    @SetSystemProperty(key = "org.spdx.useJARLicenseInfoOnly", value = "true")
     public void analyzeTestOKSimple() throws InterruptedException {
         // given
         // callback