Merge remote-tracking branch 'origin/master' into release/v0.6.0

Author: Levi Jamt

Jenkinsfile

@@ -57,7 +57,7 @@ pipeline {
                             steps {
                                 dir ('src/cse-server-go/dist/bin') {
                                     sh 'cp -rf ../../cse-server-go.exe .'
-                                    sh 'curl https://github.com/NTNU-IHB/FMU-proxy/releases/download/v0.5.4/fmu-proxy.jar -o fmu-proxy.jar -L'
+                                    sh 'curl https://github.com/NTNU-IHB/FMU-proxy/releases/download/v0.6.1/fmu-proxy.jar -o fmu-proxy.jar -L'
                                 }
                                 dir ('src/cse-server-go/dist') {
                                     sh 'cp -rf ../run-windows.cmd .'
@@ -147,7 +147,7 @@ pipeline {
                             steps {
                                 dir ('src/cse-server-go/dist/bin') {
                                     sh 'cp -rf ../../cse-server-go .'
-                                    sh 'curl https://github.com/NTNU-IHB/FMU-proxy/releases/download/v0.5.4/fmu-proxy.jar -o fmu-proxy.jar -L'
+                                    sh 'curl https://github.com/NTNU-IHB/FMU-proxy/releases/download/v0.6.1/fmu-proxy.jar -o fmu-proxy.jar -L'
                                 }
                                 dir ('src/cse-server-go/dist') {
                                     sh 'cp ../run-linux .'