Merge branch 'master' into dependabot/maven/org.slf4j-slf4j-api-1.7.30

Author: csviri

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
         java: [8, 11]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@v1
+      - uses: actions/cache@v2
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

operator-framework/src/test/java/com/github/containersolutions/operator/EventSchedulerTest.java

@@ -66,9 +66,7 @@ public void eventsAreNotExecutedConcurrentlyForSameResource() throws Interrupted
                 .matches(list -> eventProcessingList.get(0).getCustomResource().getMetadata().getResourceVersion().equals("1") &&
                                 eventProcessingList.get(1).getCustomResource().getMetadata().getResourceVersion().equals("2"),
                         "Events processed in correct order")
-                .matches(list ->
-                                eventProcessingList.get(0).getEndTime().isBefore(eventProcessingList.get(1).startTime),
-                        "Start time of event 2 is after end time of event 1");
+                .matches(list -> eventExecutedBefore(0, 1));
     }
 
     @Test

pom.xml

@@ -51,7 +51,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.8.1</version>
+                <version>3.10</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -72,13 +72,13 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>3.0.0</version>
+                <version>3.3.3</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
-                <version>5.2.5.RELEASE</version>
+                <version>5.2.7.RELEASE</version>
                 <scope>compile</scope>
             </dependency>
         </dependencies>

samples/mysql-schema/pom.xml

@@ -58,7 +58,7 @@
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>1.4.12</version>
+                <version>1.4.13</version>
                 <configuration>
                     <repository>${docker-registry}/mysql-schema-operator</repository>
                     <tag>${project.version}</tag>

samples/webserver/pom.xml

@@ -53,7 +53,7 @@
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>1.4.12</version>
+                <version>1.4.13</version>
                 <configuration>
                     <repository>webserver-operator</repository>
                     <tag>latest</tag>