Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Oct 10, 2023 · 388e120 · 388e120
2 parents 53c763d + 12ec3a6
commit 388e120
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/...artz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java b/...artz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
@@ -49,6 +49,11 @@
 /**
  * Responsible for keeping the cluster consistent.
  *
+ * @DependsOn was added to ensure that this bean is initialized after {@link NodeRegistrar}.
+ * Without it there were NPEs during initialization under some circumstances (on jenkins in tests).
+ * Problem is caused by spring bean circular dependencies and @PostConstruct methods using autowired
+ * fields that aren't always initialized at the time of execution.
+ *
  * TODO finish review of this class
  */
 @DependsOn("nodeRegistrar")

diff --git a/...uartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java b/...uartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java
@@ -70,6 +70,11 @@
 /**
  * Takes care about registration of the local node in repository.
  *
+ * @DependsOn was added to ensure that this bean is initialized after {@link NodeRegistrar}.
+ * Without it there were NPEs during initialization under some circumstances (on jenkins in tests).
+ * Problem is caused by spring bean circular dependencies and @PostConstruct methods using autowired
+ * fields that aren't always initialized at the time of execution.
+ *
  * TODO finish review of this class
  */
 @DependsOn("taskManagerConfiguration")

diff --git a/tools/ninja/pom.xml b/tools/ninja/pom.xml
@@ -198,6 +198,11 @@
             <groupId>jakarta.xml.ws</groupId>
             <artifactId>jakarta.xml.ws-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
         <!-- LOGGING -->
 
@@ -253,11 +258,6 @@
             <artifactId>ojdbc11</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.ws.rs</groupId>
-            <artifactId>jakarta.ws.rs-api</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>