Fix the initialization of ScriptExpressionFactory

There was a cycle in Spring beans that was not completely visible
to Spring, because of the use of static ModelCommonBeans.get()
hack used right in the bean constructor.

The ScriptExpressionFactory construction is now done purely by Spring.

This should fix occasional Jenkins build failures.

model/model-common/src/main/java/com/evolveum/midpoint/model/common/ModelCommonBeans.java

@@ -49,6 +49,7 @@ public void init() {
         instance = this;
     }
 
+    /** BEWARE! Do not use in constructors of Spring beans! */
     public static ModelCommonBeans get() {
         return instance;
     }

model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionFactory.java

@@ -65,12 +65,13 @@ public ScriptExpressionFactory(
             @NotNull PrismContext prismContext,
             @NotNull Collection<FunctionLibraryBinding> builtInLibraryBindings,
             @NotNull Collection<ScriptEvaluator> evaluators,
-            @NotNull ObjectResolver objectResolver) {
+            @NotNull ObjectResolver objectResolver,
+            @NotNull FunctionLibraryManager functionLibraryManager) {
         this.prismContext = prismContext;
         this.builtInLibraryBindings = Collections.unmodifiableCollection(builtInLibraryBindings);
         registerEvaluators(evaluators);
         this.objectResolver = objectResolver;
-        this.functionLibraryManager = ModelCommonBeans.get().functionLibraryManager; // TODO initialize via spring?
+        this.functionLibraryManager = functionLibraryManager;
     }
 
     @VisibleForTesting

model/model-impl/src/main/resources/ctx-model.xml

@@ -96,6 +96,7 @@
             </list>
         </constructor-arg>
         <constructor-arg name="objectResolver" ref="modelObjectResolver"/>
+        <constructor-arg name="functionLibraryManager" ref="functionLibraryManager"/>
     </bean>
 
     <bean id="functionExpressionEvaluatorFactory"