This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sis.git
commit 3841c7aeaedd57f595d27caae42ae6346aa09e2f Merge: 94acd4909e d44f96d192 Author: Martin Desruisseaux <[email protected]> AuthorDate: Wed Apr 6 15:23:39 2022 +0200 Merge branch 'geoapi-3.1' (fix wrong version numbers). application/sis-console/src/main/artifact/bin/sis | 2 +- application/sis-javafx/src/main/artifact/bin/sisfx | 2 +- application/sis-javafx/src/main/artifact/bin/sisfx.bat | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --cc application/sis-console/src/main/artifact/bin/sis index b0fd28f18a,d0560d9f74..8185731384 --- a/application/sis-console/src/main/artifact/bin/sis +++ b/application/sis-console/src/main/artifact/bin/sis @@@ -24,7 -24,7 +24,7 @@@ SIS_DATA="${SIS_DATA:-$BASE_DIR/data} export SIS_DATA # Execute SIS with any optional JAR that the user may put in the 'lib' directory. - java -classpath "$BASE_DIR/lib/sis-console-2.0-SNAPSHOT.jar" \ -java -classpath "$BASE_DIR/lib/sis-console-1.x-SNAPSHOT.jar" \ ++java -classpath "$BASE_DIR/lib/sis-console-1.2-SNAPSHOT.jar" \ -Djava.util.logging.config.file="$BASE_DIR/conf/logging.properties" \ -Dderby.stream.error.file="$BASE_DIR/log/derby.log" \ org.apache.sis.console.Command $SIS_OPTS "$@" diff --cc application/sis-javafx/src/main/artifact/bin/sisfx index daf89b2356,9046c03115..b6106919bc --- a/application/sis-javafx/src/main/artifact/bin/sisfx +++ b/application/sis-javafx/src/main/artifact/bin/sisfx @@@ -38,7 -38,7 +38,7 @@@ f java -splash:"$BASE_DIR/lib/logo.jpg" \ --add-modules javafx.graphics,javafx.controls,javafx.web \ --module-path "$PATH_TO_FX" \ - --class-path "$BASE_DIR/lib/sis-javafx-2.0-SNAPSHOT.jar" \ - --class-path "$BASE_DIR/lib/sis-javafx-1.x-SNAPSHOT.jar" \ ++ --class-path "$BASE_DIR/lib/sis-javafx-1.2-SNAPSHOT.jar" \ -Djava.util.logging.config.class="org.apache.sis.internal.setup.LoggingConfiguration" \ -Djava.util.logging.config.file="$BASE_DIR/conf/logging.properties" \ -Dderby.stream.error.file="$BASE_DIR/log/derby.log" \ diff --cc application/sis-javafx/src/main/artifact/bin/sisfx.bat index 04affb29d5,aa85ebac1b..28ce060e7a --- a/application/sis-javafx/src/main/artifact/bin/sisfx.bat +++ b/application/sis-javafx/src/main/artifact/bin/sisfx.bat @@@ -29,7 -29,7 +29,7 @@@ IF "%PATH_TO_FX%"=="" java -splash:"%BASE_DIR%\lib\logo.jpg"^ --add-modules javafx.graphics,javafx.controls,javafx.web^ --module-path "%PATH_TO_FX%"^ - --class-path "%BASE_DIR%\lib\sis-javafx-2.0-SNAPSHOT.jar"^ - --class-path "%BASE_DIR%\lib\sis-javafx-1.x-SNAPSHOT.jar"^ ++ --class-path "%BASE_DIR%\lib\sis-javafx-1.2-SNAPSHOT.jar"^ -Djava.util.logging.config.class=org.apache.sis.internal.setup.LoggingConfiguration^ -Djava.util.logging.config.file="%BASE_DIR%\conf\logging.properties"^ -Dderby.stream.error.file="%BASE_DIR%\log\derby.log"^
