diff --git a/HISTORY.md b/HISTORY.md index 0607194d..99648907 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,8 @@ # JLineup Release History +## Release 4.3.4 - 2021-08-26 +* Fix rounding bug in maxDiff configuration (https://github.com/otto-de/jlineup/issues/82) + ## Release 4.3.3 - 2021-07-08 * Dependency updates diff --git a/README.md b/README.md index 2684c33b..d118dc67 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ JLineup CLI comes as executable Java Archive. Java 8 or higher has to be availab Open a terminal and download it like this: - wget https://repo1.maven.org/maven2/de/otto/jlineup-cli/4.3.3/jlineup-cli-4.3.3.jar -O jlineup.jar + wget https://repo1.maven.org/maven2/de/otto/jlineup-cli/4.3.4/jlineup-cli-4.3.4.jar -O jlineup.jar Then type @@ -77,10 +77,10 @@ Let's assume, this is part of a continuous integration pipeline: ## Browser Compatibility -JLineup 4.3.3 was tested successfully with +JLineup 4.3.4 was tested successfully with -* Chrome 89.x -* Firefox 86.x +* Chrome 92.x +* Firefox 91.x * PhantomJS 2.1.1 (auto-downloaded by JLineup if not installed) Chrome or Firefox have to be installed on the system if you want to use one of them. diff --git a/build.gradle b/build.gradle index 1cc46ea9..6e154d34 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { springBootVersion = '2.5.4' - springVersion = '5.3.8.RELEASE' + springVersion = '5.3.9.RELEASE' } repositories { mavenCentral() @@ -23,7 +23,7 @@ plugins { //\ ///\ ////\ -def jlineup_version = "4.3.4-SNAPSHOT" +def jlineup_version = "4.3.4" ///// //// /// diff --git a/cli/graalvm/build-native-image.sh b/cli/graalvm/build-native-image.sh index c7212d90..fdb43d34 100755 --- a/cli/graalvm/build-native-image.sh +++ b/cli/graalvm/build-native-image.sh @@ -59,7 +59,7 @@ cd cli `#--static` \ `#-H:+TraceSecurityServices` \ `#-H:+TraceClassInitialization` \ --jar build/libs/jlineup-cli-4.3.3-all.jar +-jar build/libs/jlineup-cli-4.3.4-all.jar echo "" echo "DONE BUILDING NATIVE IMAGE" @@ -71,13 +71,13 @@ echo "" echo "STARTING TEST RUN" echo "" -mv jlineup-cli-4.3.3-all build/libs/jlineup-cli-4.3.3-all +mv jlineup-cli-4.3.4-all build/libs/jlineup-cli-4.3.4-all rm ~/.m2/repository/webdriver -rf -./build/libs/jlineup-cli-4.3.3-all -Dwdm.architecture=X64 --config graalvm/lineup_chrome_headless.json --step before +./build/libs/jlineup-cli-4.3.4-all -Dwdm.architecture=X64 --config graalvm/lineup_chrome_headless.json --step before set +e -./build/libs/jlineup-cli-4.3.3-all -Dwdm.architecture=X64 --config graalvm/lineup_chrome_headless.json --step after +./build/libs/jlineup-cli-4.3.4-all -Dwdm.architecture=X64 --config graalvm/lineup_chrome_headless.json --step after set -e diff --git a/cli/graalvm/prepare-native-image-build.sh b/cli/graalvm/prepare-native-image-build.sh index 299c2d5d..86e3576f 100755 --- a/cli/graalvm/prepare-native-image-build.sh +++ b/cli/graalvm/prepare-native-image-build.sh @@ -38,10 +38,10 @@ echo "" echo "$JAVA_HOME" cd cli -"${GRAAL_HOME}"/bin/java -agentlib:native-image-agent=config-output-dir=graalvm -jar build/libs/jlineup-cli-4.3.3-all.jar --config graalvm/lineup_chrome_headless.json --step before || true -"${GRAAL_HOME}"/bin/java -agentlib:native-image-agent=config-merge-dir=graalvm -jar build/libs/jlineup-cli-4.3.3-all.jar --config graalvm/lineup_chrome_headless.json --step after || true -"${GRAAL_HOME}"/bin/java -agentlib:native-image-agent=config-merge-dir=graalvm -jar build/libs/jlineup-cli-4.3.3-all.jar --config graalvm/lineup_firefox_headless.json --step before || true -"${GRAAL_HOME}"/bin/java -agentlib:native-image-agent=config-merge-dir=graalvm -jar build/libs/jlineup-cli-4.3.3-all.jar --config graalvm/lineup_chrome.json --step before || true -"${GRAAL_HOME}"/bin/java -agentlib:native-image-agent=config-merge-dir=graalvm -jar build/libs/jlineup-cli-4.3.3-all.jar --url www.otto.de --step before || true +"${GRAAL_HOME}"/bin/java -agentlib:native-image-agent=config-output-dir=graalvm -jar build/libs/jlineup-cli-4.3.4-all.jar --config graalvm/lineup_chrome_headless.json --step before || true +"${GRAAL_HOME}"/bin/java -agentlib:native-image-agent=config-merge-dir=graalvm -jar build/libs/jlineup-cli-4.3.4-all.jar --config graalvm/lineup_chrome_headless.json --step after || true +"${GRAAL_HOME}"/bin/java -agentlib:native-image-agent=config-merge-dir=graalvm -jar build/libs/jlineup-cli-4.3.4-all.jar --config graalvm/lineup_firefox_headless.json --step before || true +"${GRAAL_HOME}"/bin/java -agentlib:native-image-agent=config-merge-dir=graalvm -jar build/libs/jlineup-cli-4.3.4-all.jar --config graalvm/lineup_chrome.json --step before || true +"${GRAAL_HOME}"/bin/java -agentlib:native-image-agent=config-merge-dir=graalvm -jar build/libs/jlineup-cli-4.3.4-all.jar --url www.otto.de --step before || true #-J-Djava.security.properties=graalvm/java.security.overrides \ diff --git a/docs/CLI.md b/docs/CLI.md index 66bb02bf..cbd991ea 100644 --- a/docs/CLI.md +++ b/docs/CLI.md @@ -11,7 +11,7 @@ support. It may also work under MacOS or Windows, but we don't test this. You can simply download the CLI version by getting the jlineup-cli.jar from Maven Central in a terminal window: -`wget https://repo1.maven.org/maven2/de/otto/jlineup-cli/4.3.3/jlineup-cli-4.3.3.jar -O jlineup.jar` +`wget https://repo1.maven.org/maven2/de/otto/jlineup-cli/4.3.4/jlineup-cli-4.3.4.jar -O jlineup.jar` Now you have a `jlineup.jar` in your current directory. diff --git a/docs/WEB.md b/docs/WEB.md index c9777700..353690f4 100644 --- a/docs/WEB.md +++ b/docs/WEB.md @@ -8,7 +8,7 @@ interface to take JLineup jobs. JLineup WEB requires at least Java 11. You can simply download the web version by getting the jlineup-web.jar from Maven Central in a terminal window: -`wget https://repo1.maven.org/maven2/de/otto/jlineup-web/4.3.3/jlineup-web-4.3.3.jar -O jlineup-web.jar` +`wget https://repo1.maven.org/maven2/de/otto/jlineup-web/4.3.4/jlineup-web-4.3.4.jar -O jlineup-web.jar` Now you have a `jlineup-web.jar` in your current directory. diff --git a/web/Dockerfile b/web/Dockerfile index 9b56d403..2520eeb1 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update \ && apt-get upgrade -y \ && apt-get install -y wget \ && apt-get install -yf default-jre-headless chromium firefox-esr libjpeg-progs \ - && wget -U "jlineup-docker" -O jlineup-web.jar https://repo1.maven.org/maven2/de/otto/jlineup-web/4.3.3/jlineup-web-4.3.3.jar + && wget -U "jlineup-docker" -O jlineup-web.jar https://repo1.maven.org/maven2/de/otto/jlineup-web/4.3.4/jlineup-web-4.3.4.jar ADD docker/application.yml application.yml RUN apt-get remove --auto-remove perl -yf && apt-get purge --auto-remove perl -yf EXPOSE 8080