Skip to content

Commit

Permalink
upgrade all possible jars #2542
Browse files Browse the repository at this point in the history
  • Loading branch information
@ptrthomas
ptrthomas committed Apr 11, 2024
1 parent 7982299 commit 0edf6e7
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 23 deletions.
18 changes: 9 additions & 9 deletions karate-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>com.linecorp.armeria</groupId>
<artifactId>armeria</artifactId>
<version>1.27.0</version>
<version>1.27.3</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand All @@ -64,25 +64,25 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.0</version>
<version>1.16.1</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.4.14</version>
<version>1.5.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<!-- this is tied to logback-classic -->
<version>2.0.7</version>
<version>2.0.12</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<!-- this is tied to logback-classic -->
<version>2.0.7</version>
<version>2.0.12</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
Expand All @@ -97,7 +97,7 @@
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.5.0</version>
<version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
Expand All @@ -107,7 +107,7 @@
<dependency>
<groupId>de.siegmar</groupId>
<artifactId>fastcsv</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>info.picocli</groupId>
Expand All @@ -117,12 +117,12 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.165</version>
<version>4.8.170</version>
</dependency>
<dependency>
<groupId>io.github.t12y</groupId>
<artifactId>resemble</artifactId>
<version>1.0.2</version>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>io.github.t12y</groupId>
Expand Down
14 changes: 8 additions & 6 deletions karate-core/src/main/java/com/intuit/karate/ImageComparison.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
package com.intuit.karate;

import io.github.t12y.resemble.Resemble;
import io.github.t12y.resemble.Result;
import io.github.t12y.ssim.models.MSSIMMatrix;
import io.github.t12y.ssim.models.Matrix;
import io.github.t12y.ssim.models.Options;
Expand All @@ -33,10 +34,11 @@
import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
import javax.imageio.stream.ImageInputStream;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.awt.Image;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.List;
import java.util.*;

import static io.github.t12y.ssim.SSIM.ssim;
Expand Down Expand Up @@ -152,7 +154,7 @@ private void configure(Map<String, Object> defaultOptions) {
}

public static Map<String, Object> compare(byte[] baselineImg, byte[] latestImg, Map<String, Object> options,
Map<String, Object> defaultOptions) throws MismatchException {
Map<String, Object> defaultOptions) throws MismatchException {

boolean allowScaling = toBool(defaultOptions.get("allowScaling"));
ImageComparison imageComparison = new ImageComparison(baselineImg, latestImg, options, allowScaling);
Expand Down Expand Up @@ -212,9 +214,9 @@ private Map<String, Object> checkMismatch(double mismatchPercentage) {
}

private double execResemble() {
double mismatchPercentage = Resemble.analyzeImages(baselinePixels, latestPixels, resembleOptions());
result.put("resembleMismatchPercentage", mismatchPercentage);
return mismatchPercentage;
Result resembleResult = Resemble.analyzeImages(baselinePixels, latestPixels, resembleOptions());
result.put("resembleMismatchPercentage", resembleResult.mismatchedPercent);
return resembleResult.mismatchedPercent;
}

private double execSSIM() {
Expand Down Expand Up @@ -408,5 +410,5 @@ public MismatchException(String msg, Map<String, Object> data) {
this.data = data;
}
}

}
16 changes: 8 additions & 8 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<licenses>
<license>
<name>MIT License</name>
<url>http://www.opensource.org/licenses/mit-license.php</url>
<url>https://www.opensource.org/licenses/mit-license.php</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand All @@ -34,10 +34,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>17</java.version>
<maven.compiler.version>3.11.0</maven.compiler.version>
<maven.surefire.version>3.1.2</maven.surefire.version>
<maven.shade.version>3.5.0</maven.shade.version>
<junit5.version>5.10.1</junit5.version>
<maven.compiler.version>3.13.0</maven.compiler.version>
<maven.surefire.version>3.2.5</maven.surefire.version>
<maven.shade.version>3.5.2</maven.shade.version>
<junit5.version>5.10.2</junit5.version>
<nexus.staging.plugin.version>1.6.13</nexus.staging.plugin.version>
<spring.version>5.3.19</spring.version>
<spring.boot.version>2.6.6</spring.boot.version>
Expand Down Expand Up @@ -101,7 +101,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>8.3.1</version>
<version>9.1.0</version>
<configuration>
<skipProvidedScope>true</skipProvidedScope>
</configuration>
Expand All @@ -126,7 +126,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>3.6.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -142,7 +142,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.2</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down

0 comments on commit 0edf6e7

Please sign in to comment.