Merge branch 'release/v1.13.0'

Author: rebazer

.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:

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>de.retest</groupId>
 	<artifactId>recheck.cli</artifactId>
-	<version>1.12.0</version>
+	<version>1.13.0</version>
 
 	<name>recheck.cli</name>
 	<description>Command-line interface for recheck</description>
@@ -46,8 +46,8 @@
 		<project.resources.sourceEncoding>UTF-8</project.resources.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.surefire.and.failsafe.version>2.22.2</maven.surefire.and.failsafe.version>
-		<junit.jupiter.version>5.7.2</junit.jupiter.version>
-		<junit.vintage.version>5.7.2</junit.vintage.version>
+		<junit.jupiter.version>5.8.2</junit.jupiter.version>
+		<junit.vintage.version>5.8.2</junit.vintage.version>
 	</properties>
 
 	<distributionManagement>
@@ -76,25 +76,25 @@
 		<dependency>
 			<groupId>de.retest</groupId>
 			<artifactId>recheck</artifactId>
-			<version>1.12.0</version>
+			<version>1.13.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>info.picocli</groupId>
 			<artifactId>picocli</artifactId>
-			<version>4.6.1</version>
+			<version>4.6.3</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.fusesource.jansi</groupId>
 			<artifactId>jansi</artifactId>
-			<version>2.3.3</version>
+			<version>2.4.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.2.3</version>
+			<version>1.2.11</version>
 		</dependency>
 
 		<!-- test dependencies -->
@@ -123,7 +123,7 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.20.2</version>
+			<version>3.22.0</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -145,7 +145,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>
@@ -189,7 +189,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>