Prepare release 4.13.2

otto-de · Jan 18, 2025 · f79d7cc · f79d7cc
1 parent 86d91a1
commit f79d7cc
Show file tree

Hide file tree

Showing 9 changed files with 153 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ bin
 /lambda/dockerstuff.sh
 /lambda/src/main/resources/settings.properties
 .DS_Store
+/web/unknown
diff --git a/HISTORY.md b/HISTORY.md
diff --git a/README.md b/README.md
@@ -90,10 +90,10 @@ Let's assume, this is part of a continuous integration pipeline:
 
 ## Browser Compatibility
 
-JLineup 4.13 was tested successfully with
+JLineup 4.13.2 was tested successfully with
 
-* Chrome 128.x
-* Firefox 130.x
+* Chrome 131.x
+* Firefox 134.x
 
 Chrome or Firefox have to be installed on the system if you want to use one of them.
 

diff --git a/cli/graalvm/build-native-image.sh b/cli/graalvm/build-native-image.sh
@@ -64,7 +64,7 @@ cd cli
 `#--static` \
 `#-H:+TraceSecurityServices` \
 `#-H:+TraceClassInitialization` \
--jar build/libs/jlineup-cli-4.13.0-all.jar
+-jar build/libs/jlineup-cli-4.13.2-all.jar
 
 echo ""
 echo "DONE BUILDING NATIVE IMAGE"
@@ -76,13 +76,13 @@ echo ""
 echo "STARTING TEST RUN"
 echo ""
 
-mv jlineup-cli-4.13.0-all build/libs/jlineup-cli-4.13.0-all
+mv jlineup-cli-4.13.2-all build/libs/jlineup-cli-4.13.2-all
 rm ~/.m2/repository/webdriver -rf
-./build/libs/jlineup-cli-4.13.0-all -Dwdm.architecture=X64 --config graalvm/lineup_chrome_headless.json --step before
+./build/libs/jlineup-cli-4.13.2-all -Dwdm.architecture=X64 --config graalvm/lineup_chrome_headless.json --step before
 
 set +e
 
-./build/libs/jlineup-cli-4.13.0-all -Dwdm.architecture=X64 --config graalvm/lineup_chrome_headless.json --step after
+./build/libs/jlineup-cli-4.13.2-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
@@ -45,10 +45,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.13.0-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.13.0-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.13.0-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.13.0-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.13.0-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.13.2-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.13.2-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.13.2-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.13.2-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.13.2-all.jar --url www.otto.de --step before || true
 
 #-J-Djava.security.properties=graalvm/java.security.overrides \
diff --git a/cli/src/main/java/de/otto/jlineup/cli/JLineup.java b/cli/src/main/java/de/otto/jlineup/cli/JLineup.java
@@ -113,6 +113,22 @@ public CommandLine.Model.CommandSpec transform(CommandLine.Model.CommandSpec com
                     })
                     .build());
 
+            commandSpec.addOption(CommandLine.Model.OptionSpec.builder("--" + GlobalOption.JLINEUP_CHROME_VERSION.kebabCaseNameWithoutJLineupPrefix())
+                    .order(202).description("The version of the Chrome browser to use. If not set, the installed or default version is used.")
+                    .parameterConsumer((stack, argSpec, commandSpec1) -> {
+                        String value = stack.pop();
+                        GlobalOptions.setOption(GlobalOption.JLINEUP_CHROME_VERSION, value);
+                    })
+                    .build());
+
+            commandSpec.addOption(CommandLine.Model.OptionSpec.builder("--" + GlobalOption.JLINEUP_FIREFOX_VERSION.kebabCaseNameWithoutJLineupPrefix())
+                    .order(203).description("The version of the Firefox browser to use. If not set, the installed or default version is used.")
+                    .parameterConsumer((stack, argSpec, commandSpec1) -> {
+                        String value = stack.pop();
+                        GlobalOptions.setOption(GlobalOption.JLINEUP_FIREFOX_VERSION, value);
+                    })
+                    .build());
+
             try {
                 Class<?> lambdaBrowserClass = Class.forName("de.otto.jlineup.lambda.LambdaBrowser", false, CloudBrowserFactory.class.getClassLoader());
                 LOG.debug("LambdaBrowser '{}' reachable, adding lambda options to command spec.", lambdaBrowserClass.getCanonicalName());

diff --git 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.13.0/jlineup-cli-4.13.0.jar -O jlineup.jar`
+`wget https://repo1.maven.org/maven2/de/otto/jlineup-cli/4.13.2/jlineup-cli-4.13.2.jar -O jlineup.jar`
 
 Now you have a `jlineup.jar` in your current directory.
 

diff --git a/docs/WEB.md b/docs/WEB.md
@@ -8,7 +8,7 @@ interface to take JLineup jobs. JLineup WEB requires at least Java 17.
 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.13.0/jlineup-web-4.13.0.jar -O jlineup-web.jar`
+`wget https://repo1.maven.org/maven2/de/otto/jlineup-web/4.13.2/jlineup-web-4.13.2.jar -O jlineup-web.jar`
 
 Now you have a `jlineup-web.jar` in your current directory.
 

diff --git 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 chromium-browser firefox libjpeg-progs \
-    && wget -U "jlineup-docker" -O jlineup-web.jar https://repo1.maven.org/maven2/de/otto/jlineup-web/4.13.0/jlineup-web-4.13.0.jar
+    && wget -U "jlineup-docker" -O jlineup-web.jar https://repo1.maven.org/maven2/de/otto/jlineup-web/4.13.2/jlineup-web-4.13.2.jar
 ADD docker/application.yml application.yml
 RUN apt-get remove --auto-remove perl -yf && apt-get purge --auto-remove perl -yf
 EXPOSE 8080