Merge branch 'release/v1.13.0'

retest · Mar 30, 2022 · 6820a23 · 6820a23
2 parents 6533d67 + 3436eec
commit 6820a23
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 25 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,10 +1,14 @@
-pull_request_rules:
-  - name: "rebase unreviewed non-release PRs"
+queue_rules:
+  - name: default
     conditions:
-      - "head~=^(?!(release|hotfix)).*$"
-      - "#approved-reviews-by=0"
+      - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
       - "-draft"
+
+pull_request_rules:
+  - name: "rebase non-release PRs"
+    conditions:
+      - "head~=^(?!(release|hotfix)).*$"
     actions:
       rebase:
 
@@ -13,37 +17,38 @@ pull_request_rules:
       - "head~=^(?!(release|hotfix)).*$"
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
+      - "#commits-behind=0"
       - "-draft"
       - "check-success=SonarCloud Code Analysis"
     actions:
-      merge:
-        strict: true
-        strict_method: rebase
-        method: merge
+      queue:
+        name: default
+        update_method: rebase
 
   - name: "merge non-release without-SonarCloud-but-from-dependabot PRs with strict rebase"
     conditions:
       - "head~=^(?!(release|hotfix)).*$"
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
+      - "#commits-behind=0"
       - "-draft"
       - "author=dependabot[bot]"
     actions:
-      merge:
-        strict: true
-        strict_method: rebase
-        method: merge
+      queue:
+        name: default
+        update_method: rebase
 
   - name: "merge release PRs with strict merge"
     conditions:
       - "head~=^(release|hotfix).*$"
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
+      - "#commits-behind=0"
       - "-draft"
     actions:
-      merge:
-        strict: true
-        method: merge
+      queue:
+        name: default
+        update_method: rebase
 
   - name: "delete PR branches after merge"
     conditions:

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>de.retest</groupId>
 	<artifactId>recheck-junit-4-extension</artifactId>
-	<version>1.12.0</version>
+	<version>1.13.0</version>
 
 	<name>recheck-junit-4-extension</name>
 	<description>JUnit 4 extension reducing boilerplate code in tests.</description>
@@ -80,7 +80,7 @@
 		<dependency>
 			<groupId>de.retest</groupId>
 			<artifactId>recheck</artifactId>
-			<version>1.12.0</version>
+			<version>1.13.0</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -89,14 +89,14 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.20.2</version>
+			<version>3.22.0</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>3.11.2</version>
+			<version>4.3.1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -105,7 +105,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<version>3.10.0</version>
 				<configuration>
 					<source>${java.version}</source>
 					<target>${java.version}</target>
@@ -122,7 +122,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.2.2</version>
 				<configuration>
 					<archive>
 						<manifest>
@@ -139,7 +139,7 @@
 			<plugin>
 				<groupId>com.amashchenko.maven.plugin</groupId>
 				<artifactId>gitflow-maven-plugin</artifactId>
-				<version>1.16.0</version>
+				<version>1.18.0</version>
 				<configuration>
 					<gitFlowConfig>
 						<productionBranch>main</productionBranch>
@@ -174,7 +174,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.3.2</version>
 				<executions>
 					<execution>
 						<id>bundle-javadoc</id>
@@ -193,7 +193,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.0.0-M3</version>
+				<version>3.0.0</version>
 				<executions>
 					<execution>
 						<id>enforce-maven</id>
@@ -214,7 +214,7 @@
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
 				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.8</version>
+				<version>1.6.12</version>
 				<extensions>true</extensions>
 				<configuration>
 					<nexusUrl>https://oss.sonatype.org/</nexusUrl>