Merge pull request #136 from TWestling/master

Updating dependencies to mongojack 4.0.1 and jackson2-api 2.11.0.
jenkinsci · Dec 17, 2020 · e9243e0 · e9243e0
2 parents d077550 + f3180b0
commit e9243e0
Show file tree

Hide file tree

Showing 31 changed files with 179 additions and 3,905 deletions.
diff --git a/pom.xml b/pom.xml
@@ -75,8 +75,28 @@
             <url>https://repo.jenkins-ci.org/public</url>
         </pluginRepository>
     </pluginRepositories>
-
     <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>1.7.26</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>1.7.26</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.7.26</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.26</version>
+        </dependency>
         <dependency>
             <groupId>com.sonyericsson.hudson.plugins.gerrit</groupId>
             <artifactId>gerrit-trigger</artifactId>
@@ -157,13 +177,13 @@
         </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>
-            <artifactId>mongo-java-driver</artifactId>
-            <version>3.8.2</version>
+            <artifactId>mongodb-driver-sync</artifactId>
+            <version>4.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.mongojack</groupId>
             <artifactId>mongojack</artifactId>
-            <version>2.9.4</version>
+            <version>4.0.1</version>
             <exclusions>
                 <!-- jackson deps come from jackson2-api plugin instead -->
                 <exclusion>
@@ -179,7 +199,12 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>jackson2-api</artifactId>
-            <version>2.10.2</version>
+            <version>2.11.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/src/main/java/com/sonyericsson/jenkins/plugins/bfa/BfaGraphAction.java b/src/main/java/com/sonyericsson/jenkins/plugins/bfa/BfaGraphAction.java
diff --git a/src/main/java/com/sonyericsson/jenkins/plugins/bfa/BuildFailureScanner.java b/src/main/java/com/sonyericsson/jenkins/plugins/bfa/BuildFailureScanner.java
@@ -25,8 +25,6 @@
 
 package com.sonyericsson.jenkins.plugins.bfa;
 
-import com.sonyericsson.jenkins.plugins.bfa.graphs.ComputerGraphAction;
-import com.sonyericsson.jenkins.plugins.bfa.graphs.ProjectGraphAction;
 import com.sonyericsson.jenkins.plugins.bfa.model.FailureCause;
 import com.sonyericsson.jenkins.plugins.bfa.model.FailureCauseBuildAction;
 import com.sonyericsson.jenkins.plugins.bfa.model.FailureCauseDisplayData;
@@ -165,10 +163,7 @@ public static void scanIfNotScanned(final Run build, final PrintStream scanLog)
 
                 if (PluginImpl.needToAnalyze(build.getResult())) {
                     scan(build, scanLog);
-                    ProjectGraphAction.invalidateProjectGraphCache(build.getParent());
-                    if (build instanceof AbstractBuild) {
-                        ComputerGraphAction.invalidateNodeGraphCache(((AbstractBuild)build).getBuiltOn());
-                    }
+
                 } else if (PluginImpl.getInstance().getKnowledgeBase().isSuccessfulLogging()) {
                     final List<FoundFailureCause> emptyCauseList
                         = Collections.synchronizedList(new LinkedList<FoundFailureCause>());