Merge branch 'release/v1.13.0'

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

CHANGELOG.md

@@ -25,13 +25,46 @@ Table of Contents
 
 ### Breaking Changes
 
+### Bug Fixes
+
+### New Features
+
+### Improvements
+
+
+--------------------------------------------------------------------------------
+
+[1.13.0] (2022-03-07)
+---------------------
+
+### Bug Fixes
+
+* Add path info to filter, after they where missing in last release because of `FileSystemAlreadyExistsException` fix.
+* Fix some cases where applying deleted elements would not remove them from the Golden Master.
+* Fix duplicate uploads to rehub for one test report.
+
+### New Features
+
+* Support multiple values, like in `grid-template-columns` in PixelDiffFilter.
+
+### Improvements
+
+* Better logging and fix small code smells to improve stability and performance.
+* Update dependencies to fix bugs and security issues.
+
+
+[1.12.0] (2021-06-24)
+---------------------
+
+### Breaking Changes
+
 * Since 01.12.2020 this project is owned and developed by [UBS Hainer GmbH](https://ubs-hainer.com/).
 * Update the storage library used for reports (kryo 4 -> 5), it's possible that older test reports can't longer be read.
 
 ### Bug Fixes
 
 * Fix a rare `java.nio.file.FileSystemAlreadyExistsException` when accessing filters concurrently.
-* Fix 1-click-maintenance not respecting the key of the `AttributeDifference`. 
+* Fix 1-click-maintenance not respecting the key of the `AttributeDifference`.
 * Updated and now configurable URLs for rehub backend services
 
 ### New Features
@@ -49,9 +82,6 @@ Table of Contents
 * Project discovery and initialization is now done within `RecheckOptionsBuilder#build` instead of `RecheckImpl#new` to allow earlier access to project variables (e.g. retest.properties). Projects (i.e. `.retest` folders) should still be detected correctly.
 
 
---------------------------------------------------------------------------------
-
-
 [1.11.2] (2020-07-01)
 ---------------------
 

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>de.retest</groupId>
 	<artifactId>recheck</artifactId>
-	<version>1.12.0</version>
+	<version>1.13.0</version>
 
 	<name>recheck</name>
 	<description>Replace traditional assertions with a single check.</description>
@@ -46,7 +46,7 @@
 		<project.resources.sourceEncoding>UTF-8</project.resources.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.surefire.and.failsafe.version>3.0.0-M5</maven.surefire.and.failsafe.version>
-		<logback.version>1.2.3</logback.version>
+		<logback.version>1.2.11</logback.version>
 		<eclipse.persistence.version>2.5.2</eclipse.persistence.version>
 	</properties>
 
@@ -76,7 +76,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.30</version>
+			<version>1.7.36</version>
 		</dependency>
 
 		<dependency>
@@ -88,31 +88,31 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.20</version>
+			<version>1.18.22</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>30.1.1-jre</version>
+			<version>31.1-jre</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.esotericsoftware.kryo</groupId>
 			<artifactId>kryo5</artifactId>
-			<version>5.1.1</version>
+			<version>5.3.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.lz4</groupId>
 			<artifactId>lz4-java</artifactId>
-			<version>1.7.1</version>
+			<version>1.8.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.9.0</version>
+			<version>2.11.0</version>
 		</dependency>
 
 		<dependency>
@@ -124,19 +124,19 @@
 		<dependency>
 			<groupId>com.konghq</groupId>
 			<artifactId>unirest-java</artifactId>
-			<version>3.11.11</version>
+			<version>3.13.6</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.auth0</groupId>
 			<artifactId>jwks-rsa</artifactId>
-			<version>0.18.0</version>
+			<version>0.20.2</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.auth0</groupId>
 			<artifactId>java-jwt</artifactId>
-			<version>3.16.0</version>
+			<version>3.18.3</version>
 		</dependency>
 
 		<dependency>
@@ -148,7 +148,7 @@
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>org.eclipse.persistence.moxy</artifactId>
-			<version>3.0.1</version>
+			<version>3.0.2</version>
 		</dependency>
 
 		<!-- required by eclipse moxy -->
@@ -172,7 +172,7 @@
 		<dependency>
 			<groupId>org.mozilla</groupId>
 			<artifactId>rhino</artifactId>
-			<version>1.7.13</version>
+			<version>1.7.14</version>
 		</dependency>
 
 		<dependency>
@@ -186,7 +186,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.7.2</version>
+			<version>5.8.2</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -207,7 +207,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>3.10.0</version>
+			<version>4.3.1</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -235,14 +235,14 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.19.0</version>
+			<version>3.22.0</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>com.approvaltests</groupId>
 			<artifactId>approvaltests</artifactId>
-			<version>11.6.0</version>
+			<version>13.2.1</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -256,7 +256,7 @@
 		<dependency>
 			<groupId>org.junit-pioneer</groupId>
 			<artifactId>junit-pioneer</artifactId>
-			<version>1.4.2</version>
+			<version>1.6.1</version>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
@@ -269,14 +269,14 @@
 		<dependency>
 			<groupId>io.github.netmikey.logunit</groupId>
 			<artifactId>logunit-core</artifactId>
-			<version>1.1.0</version>
+			<version>1.1.3</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>io.github.netmikey.logunit</groupId>
 			<artifactId>logunit-logback</artifactId>
-			<version>1.1.0</version>
+			<version>1.1.3</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -286,7 +286,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>
@@ -334,7 +334,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>
@@ -351,7 +351,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>
@@ -386,7 +386,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>
@@ -423,7 +423,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>
@@ -444,7 +444,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>

src/main/java/de/retest/recheck/auth/RetestAuthentication.java

@@ -113,9 +113,11 @@ private void login() {
 			builder.addParameter( OAUTH_SCOPE, OAUTH_SCOPE_OFFLINE_ACCESS );
 
 			final URI loginUri = URI.create( builder.build().toString() );
+			log.info( "Show web login: {}", loginUri );
 			handler.showWebLoginUri( loginUri );
 
 			callback.join();
+			log.info( "Web login performed." );
 
 			if ( loginSuccessful( state, callback.result ) ) {
 				final TokenBundle bundle = accessCodeToToken( callback.result.getCode(), redirectUri );
@@ -255,7 +257,7 @@ static KeycloakResult getRequestParameters( final String request ) {
 				.build();
 	}
 
-	private class CallbackListener extends Thread {
+	private static class CallbackListener extends Thread {
 
 		private final ServerSocket server;
 		private KeycloakResult result;

src/main/java/de/retest/recheck/ignore/Filter.java

@@ -107,6 +107,6 @@ default boolean matches( final Element element, final AttributeDifference attrib
 	 */
 	// TODO Remove for a 2.0 release
 	@Deprecated
-	public static final Filter FILTER_NOTHING = NEVER_MATCH;
+	Filter FILTER_NOTHING = NEVER_MATCH;
 
 }

src/main/java/de/retest/recheck/ignore/FilterAllAttributes.java

@@ -11,8 +11,7 @@ public boolean matches( final Element element ) {
 	}
 
 	@Override
-	public boolean matches( final Element element,
-			final AttributeDifference attributeDifference ) {
+	public boolean matches( final Element element, final AttributeDifference attributeDifference ) {
 		return true;
 	}