Merge branch 'jenkinsci:main' into feature/ignore-sarif-suppressions

jenkinsci · Nov 27, 2024 · b601e95 · b601e95
2 parents 0b8d218 + eb9872a
commit b601e95
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/SUPPORTED-FORMATS.md b/SUPPORTED-FORMATS.md
@@ -1,4 +1,4 @@
-<!--- DO NOT EDIT -- Generated at 2024-11-19T21:47:53.662921218 - Run the `main` method of `ParserRegistry` to regenerate after changing parsers -- DO NOT EDIT --->
+<!--- DO NOT EDIT -- Generated at 2024-11-27T13:40:12.801998925 - Run the `main` method of `ParserRegistry` to regenerate after changing parsers -- DO NOT EDIT --->
 # Supported Report Formats
 
 The static analysis model supports the following report formats.

diff --git a/pom.xml b/pom.xml
@@ -292,22 +292,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.owasp</groupId>
-        <artifactId>dependency-check-maven</artifactId>
-        <version>11.1.0</version>
-        <configuration>
-          <nvdApiServerId>nvd.nist.gov</nvdApiServerId>
-          <format>JSON</format>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.sonatype.plugins</groupId>
         <artifactId>nexus-staging-maven-plugin</artifactId>

diff --git a/src/test/java/edu/hm/hafner/analysis/parser/AntJavacParserTest.java b/src/test/java/edu/hm/hafner/analysis/parser/AntJavacParserTest.java
@@ -19,6 +19,8 @@
  * Tests the class {@link AntJavacParser}.
  */
 class AntJavacParserTest extends AbstractParserTest {
+    private static final int ALLOWED_TIMEOUT_IN_SECONDS = 5;
+
     AntJavacParserTest() {
         super("ant-javac.txt");
     }
@@ -37,7 +39,7 @@ void issue67521IgnoreJavaDocWarnings() {
      */
     @Test
     void issue55805() {
-        assertTimeoutPreemptively(Duration.ofSeconds(1), () -> parse("issue55805.txt"));
+        assertTimeoutPreemptively(Duration.ofSeconds(ALLOWED_TIMEOUT_IN_SECONDS), () -> parse("issue55805.txt"));
     }
 
     /**