diff options
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 1 | ||||
| -rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 1 | ||||
| -rw-r--r-- | dist/vespa.spec | 9 | ||||
| -rwxr-xr-x | standalone-container/src/main/sh/standalone-container.sh | 1 |
4 files changed, 12 insertions, 0 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index 317af4b2fea..b3b449fb5a1 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -171,6 +171,7 @@ vespa-run-as-vespa-user vespa-runserver -s configserver -r 30 -p $pidfile -- \ -XX:-OmitStackTraceInFastThrow \ -XX:MaxJavaStackTraceDepth=1000000 \ $jvmargs \ + --illegal-access=warn \ --add-opens=java.base/java.io=ALL-UNNAMED \ --add-opens=java.base/java.lang=ALL-UNNAMED \ --add-opens=java.base/java.net=ALL-UNNAMED \ diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh index 8c122d3170e..730dd350ca7 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -260,6 +260,7 @@ exec $numactlcmd $envcmd java \ -XX:HeapDumpPath="${VESPA_HOME}/var/crash" \ -XX:ErrorFile="${VESPA_HOME}/var/crash/hs_err_pid%p.log" \ -XX:+ExitOnOutOfMemoryError \ + --illegal-access=warn \ --add-opens=java.base/java.io=ALL-UNNAMED \ --add-opens=java.base/java.lang=ALL-UNNAMED \ --add-opens=java.base/java.net=ALL-UNNAMED \ diff --git a/dist/vespa.spec b/dist/vespa.spec index fcfe13fedd4..92713517988 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -489,6 +489,15 @@ nearest neighbor search used for low-level benchmarking. %setup -c -D -T %else %setup -q +echo '%{version}' > VERSION +case '%{version}' in + *.0) + : + ;; + *) + sed -i -e 's,<version>[0-9].*-SNAPSHOT</version>,<version>%{version}</version>,' $(find . -name pom.xml -print) + ;; +esac %endif %build diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh index 9e888bdfea2..9f862d2b14a 100755 --- a/standalone-container/src/main/sh/standalone-container.sh +++ b/standalone-container/src/main/sh/standalone-container.sh @@ -163,6 +163,7 @@ StartCommand() { -XX:+HeapDumpOnOutOfMemoryError \ -XX:HeapDumpPath="$VESPA_HOME/var/crash" \ -XX:+ExitOnOutOfMemoryError \ + --illegal-access=warn \ --add-opens=java.base/java.io=ALL-UNNAMED \ --add-opens=java.base/java.lang=ALL-UNNAMED \ --add-opens=java.base/java.net=ALL-UNNAMED \ |