Merge branch 'release/v6.2' of https://github.com/ravendb/ravendb int…

…o v6.2

.github/workflows/FastTests.yml

@@ -3,11 +3,11 @@ name: tests/fast
 on:
   push:
     branches:
-        - v6.1
+        - v6.2
 
   pull_request:
     branches:
-        - v6.1
+        - v6.2
 
 env:
   DOTNET_VERSION: 8.0.400

.github/workflows/StudioTests.yml

@@ -3,11 +3,11 @@ name: tests/studio
 on:
   push:
     branches:
-        - v6.1
+        - v6.2
 
   pull_request:
     branches:
-        - v6.1
+        - v6.2
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/codeql-analysis.yml

@@ -2,7 +2,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ v5.4, v6.0, v6.1 ]
+    branches: [ v5.4, v6.0, v6.2 ]
   schedule:
     - cron: '26 4 * * 5'
 

.github/workflows/studioConventions.yml

@@ -3,11 +3,11 @@ name: Studio conventions
 on:
   push:
     branches:
-        - v6.1
+        - v6.2
 
   pull_request:
     branches:
-        - v6.1
+        - v6.2
 jobs:
   conventions:
     name: Studio Conventions

SECURITY.md

@@ -4,7 +4,7 @@
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 6.1.x   | :white_check_mark: |
+| 6.2.x   | :white_check_mark: |
 | 6.0.x   | :white_check_mark: |
 | 5.4.x   | :white_check_mark: |
 | 5.3.x   | :x:                |

docker/common.ps1

@@ -35,24 +35,24 @@ function GetUbuntuImageTags($repo, $version, $arch) {
     switch ($arch) {
         "x64" { 
             return @(
-#                "$($repo):ubuntu-latest",
-                "$($repo):6.1-ubuntu-latest",
+                "$($repo):ubuntu-latest-lts",
+                "$($repo):6.2-ubuntu-latest",
                 "$($repo):$($version)-ubuntu.22.04-x64"
             )
             break;
         }
         "arm32v7" {
             return @(
-#                "$($repo):ubuntu-arm32v7-latest",
-                "$($repo):6.1-ubuntu-arm32v7-latest",
+                "$($repo):ubuntu-arm32v7-latest-lts",
+                "$($repo):6.2-ubuntu-arm32v7-latest",
                 "$($repo):$($version)-ubuntu.22.04-arm32v7"
             )
             break;
         }
         "arm64v8" {
             return @(
-#                "$($repo):ubuntu-arm64v8-latest",
-                "$($repo):6.1-ubuntu-arm64v8-latest",
+                "$($repo):ubuntu-arm64v8-latest-lts",
+                "$($repo):6.2-ubuntu-arm64v8-latest",
                 "$($repo):$($version)-ubuntu.22.04-arm64v8"
                 )
                 break;
@@ -69,16 +69,16 @@ function GetWindowsImageTags($repo, $version, $WinVer) {
         "1809" {
             return @(
                 "$($repo):$($version)-windows-1809",
-#                "$($repo):windows-1809-latest",
-                "$($repo):6.1-windows-1809-latest"
+                "$($repo):windows-1809-latest-lts",
+                "$($repo):6.2-windows-1809-latest"
             )
             break;
         }
         "ltsc2022" {
              return @(
                 "$($repo):$($version)-windows-ltsc2022",
-#                "$($repo):windows-ltsc2022-latest",
-                "$($repo):6.1-windows-ltsc2022-latest"
+                "$($repo):windows-ltsc2022-latest-lts",
+                "$($repo):6.2-windows-ltsc2022-latest"
             )
             break;
         }
@@ -95,8 +95,8 @@ function GetManifestTags {
     )
 
     return @(
-#        "${repo}:latest",
-        "${repo}:6.1-latest"
+        "${repo}:latest-lts",
+        "${repo}:6.2-latest"
     )
 }
 
@@ -106,10 +106,10 @@ function GetImageTagsForManifest {
     )
 
     return @(
-        "${repo}:6.1-ubuntu-latest",
-        "${repo}:6.1-ubuntu-arm32v7-latest",
-        "${repo}:6.1-ubuntu-arm64v8-latest",
-        "${repo}:6.1-windows-1809-latest",
-        "${repo}:6.1-windows-ltsc2022-latest"
+        "${repo}:6.2-ubuntu-latest",
+        "${repo}:6.2-ubuntu-arm32v7-latest",
+        "${repo}:6.2-ubuntu-arm64v8-latest",
+        "${repo}:6.2-windows-1809-latest",
+        "${repo}:6.2-windows-ltsc2022-latest"
     )
 }

docker/compose/linux-cluster/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.1'
 services:
   raven1:
-    image: ravendb/ravendb-nightly:6.1-ubuntu-latest
+    image: ravendb/ravendb-nightly:6.2-ubuntu-latest
     container_name: raven1
     ports:
       - 8081:8080
@@ -16,7 +16,7 @@ services:
     env_file: ./license.env
 
   raven2:
-    image: ravendb/ravendb-nightly:6.0-ubuntu-latest
+    image: ravendb/ravendb-nightly:6.2-ubuntu-latest
     container_name: raven2
     ports:
       - 8082:8080
@@ -30,7 +30,7 @@ services:
     env_file: ./license.env
 
   raven3:
-    image: ravendb/ravendb-nightly:6.0-ubuntu-latest
+    image: ravendb/ravendb-nightly:6.2-ubuntu-latest
     container_name: raven3
     ports:
       - 8083:8080

docker/compose/win-cluster/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.1'
 services:
   raven1:
-    image: ravendb/ravendb-nightly:6.1-windows-nanoserver-latest
+    image: ravendb/ravendb-nightly:6.2-windows-nanoserver-latest
     container_name: raven1
     ports:
       - 8081:8080
@@ -15,7 +15,7 @@ services:
     env_file: ./license.env
 
   raven2:
-    image: ravendb/ravendb-nightly:6.0-windows-nanoserver-latest
+    image: ravendb/ravendb-nightly:6.2-windows-nanoserver-latest
     container_name: raven2
     ports:
       - 8082:8080
@@ -29,7 +29,7 @@ services:
     env_file: ./license.env
 
   raven3:
-    image: ravendb/ravendb-nightly:6.0-windows-nanoserver-latest
+    image: ravendb/ravendb-nightly:6.2-windows-nanoserver-latest
     container_name: raven3
     ports:
       - 8083:8080

docker/debug/build-ubuntu-debug.ps1

@@ -28,7 +28,7 @@ $dockerDir = [io.path]::combine($projectDir, "docker")
 $debugDockerDir = [io.path]::combine($projectDir, "docker", "debug")
 $debugDockerfileDir = [io.path]::combine($projectDir, "docker", "debug", "ravendb-linux-debug")
 
-$pkgFile = [io.path]::combine($projectDir, "artifacts", "RavenDB-6.1.0-custom-61-linux-x64.tar.bz2")
+$pkgFile = [io.path]::combine($projectDir, "artifacts", "RavenDB-6.2.0-custom-62-linux-x64.tar.bz2")
 
 if ($(Test-Path $pkgFile) -eq $False) {
 

docker/debug/ravendb-ubuntu-debug/Dockerfile

@@ -1,4 +1,4 @@
-FROM ravendb/ravendb:6.1-ubuntu-latest
+FROM ravendb/ravendb:6.2-ubuntu-latest
 
 EXPOSE 22 8080 38888
 

docker/manifest/manifest.yml

@@ -1,7 +1,7 @@
 image: ravendb/ravendb:latest
 manifests:
   -
-    image: ravendb/ravendb:6.1-ubuntu-latest
+    image: ravendb/ravendb:6.2-ubuntu-latest
     platform:
       architecture: amd64
       os: linux

docker/ravendb-ubuntu/run-raven.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# 5.x -> 6.1 migration assistance
+# 5.x -> 6.2 migration assistance
 /usr/lib/ravendb/scripts/link-legacy-datadir.sh 
 
 COMMAND="/usr/lib/ravendb/server/Raven.Server -c /etc/ravendb/settings.json"

docker/readme.md

@@ -8,7 +8,7 @@
     - based on Windows Nanoserver image (run using Windows containers). 
 
 ### What's new
-RavenDB `v6.1` docker image has been adjusted to run under **a non-root user**, providing far better security.
+RavenDB `v6.2` docker image has been adjusted to run under **a non-root user**, providing far better security.
 Containers are now using RavenDB *.deb package*. More information about how to deal with the breaking changes in the [**migration from 5.4 image**](#what-migration-process-from-54-image-looks-like) section.
 
 
@@ -61,9 +61,9 @@ Optionally *nightly* images can be found at [ravendb/ravendb-nightly](https://hu
 
 You can run RavenDB docker container manually by invoking `docker run`, yet if you don't feel that docker-savvy we recommend using our scripts:
 
-Run Ubuntu-based image: [run-linux.ps1](https://github.com/ravendb/ravendb/blob/v6.1/docker/run-linux.ps1)
+Run Ubuntu-based image: [run-linux.ps1](https://github.com/ravendb/ravendb/blob/v6.2/docker/run-linux.ps1)
 
-Run Windows-based image: [run-nanoserver.ps1](https://github.com/ravendb/ravendb/blob/v6.1/docker/run-nanoserver.ps1)
+Run Windows-based image: [run-nanoserver.ps1](https://github.com/ravendb/ravendb/blob/v6.2/docker/run-nanoserver.ps1)
 
 Above mentioned Powershell scripts are simplifying usage of our images allowing you to pass various switches and options to configure RavenDB inside the container:
 
@@ -123,9 +123,9 @@ to disable RavenDB Setup Wizard.
 
 Dockerfiles that are used to build the images and their assets can be found at the following locations:
 
-- [Ubuntu image](https://github.com/ravendb/ravendb/tree/v6.1/docker/ravendb-ubuntu)
+- [Ubuntu image](https://github.com/ravendb/ravendb/tree/v6.2/docker/ravendb-ubuntu)
 
-- [Windows image](https://github.com/ravendb/ravendb/tree/v6.1/docker/ravendb-nanoserver)
+- [Windows image](https://github.com/ravendb/ravendb/tree/v6.2/docker/ravendb-nanoserver)
 
 #### FAQ
 

docker/run-linux.ps1

@@ -200,9 +200,9 @@ $dockerArgs += '-p'
 $dockerArgs += "$($BindTcpPort):38888"
 
 if ($UseNightly) {
-    $RAVEN_IMAGE = 'ravendb/ravendb-nightly:6.1-ubuntu-latest'
+    $RAVEN_IMAGE = 'ravendb/ravendb-nightly:6.2-ubuntu-latest'
 } else {
-    $RAVEN_IMAGE = 'ravendb/ravendb:6.1-ubuntu-latest'
+    $RAVEN_IMAGE = 'ravendb/ravendb:6.2-ubuntu-latest'
 }
 
 $dockerArgs += $RAVEN_IMAGE

docker/run-nanoserver.ps1

@@ -140,9 +140,9 @@ $dockerArgs += '-p'
 $dockerArgs += "$($BindTcpPort):38888"
 
 if ($UseNightly) {
-    $RAVEN_IMAGE = 'ravendb/ravendb-nightly:6.1-windows-nanoserver-latest'
+    $RAVEN_IMAGE = 'ravendb/ravendb-nightly:6.2-windows-nanoserver-latest'
 } else {
-    $RAVEN_IMAGE = 'ravendb/ravendb:6.1-windows-nanoserver-latest'
+    $RAVEN_IMAGE = 'ravendb/ravendb:6.2-windows-nanoserver-latest'
 }
 
 $dockerArgs += $RAVEN_IMAGE

docs/readme.linux.txt

@@ -10,7 +10,7 @@ Type:
 * RavenDB as Daemon (systemd - applies to Ubuntu 16.04)
 Open bash terminal, and create file /etc/systemd/system/ravendb.service, using super user permissions, containing:
     [Unit]
-    Description=RavenDB v6.1
+    Description=RavenDB v6.2
     After=network.target
 
     [Service]
@@ -46,10 +46,10 @@ View its status using:
 
 * Setup
 Open browser, if not opened automatically, at url printed in "Server available on: <url>"
-Follow the web setup instructions at: https://ravendb.net/docs/article-page/6.1/csharp/start/installation/setup-wizard
+Follow the web setup instructions at: https://ravendb.net/docs/article-page/6.2/csharp/start/installation/setup-wizard
 
 * Upgrading to a New Version
-Follow the upgrade instructions available at: https://ravendb.net/docs/article-page/6.1/csharp/start/installation/upgrading-to-new-version
+Follow the upgrade instructions available at: https://ravendb.net/docs/article-page/6.2/csharp/start/installation/upgrading-to-new-version
 
 
 

docs/readme.windows.txt

@@ -25,8 +25,8 @@ To manage service you can use Stop-Service and Start-Service cmdlets (requires a
 
 * Setup
 Open browser, if not opened automatically, at url printed in "Server available on: <url>"
-Follow the web setup instructions at: https://ravendb.net/docs/article-page/6.1/csharp/start/installation/setup-wizard
+Follow the web setup instructions at: https://ravendb.net/docs/article-page/6.2/csharp/start/installation/setup-wizard
 
 * Upgrading to a New Version
-Follow the upgrade instructions available at: https://ravendb.net/docs/article-page/6.1/csharp/start/installation/upgrading-to-new-version
+Follow the upgrade instructions available at: https://ravendb.net/docs/article-page/6.2/csharp/start/installation/upgrading-to-new-version
 

readme.md

@@ -17,16 +17,16 @@ Request [your license](https://ravendb.net/free).
 Download [the latest version of RavenDB](https://ravendb.net/downloads).
 
 ## Getting Started
-Install and [set up your database](https://ravendb.net/docs/article-page/6.1/csharp/start/getting-started).
+Install and [set up your database](https://ravendb.net/docs/article-page/6.2/csharp/start/getting-started).
 
 ## Learn RavenDB Quickly
 [RavenDB Bootcamp](https://ravendb.net/learn/bootcamp) is a free, self-directed learning course. In just three units you will learn how to use RavenDB to create fully-functional, real-world programs with NoSQL Databases. If you are unfamiliar with NoSQL, it’s okay. We will provide you with all the information you need.
 
 ## Stay Updated on New Developments
-We keep adding new features to improve your RavenDB experience. Check out [our latest improvements](https://ravendb.net/docs/article-page/6.1/csharp/start/whats-new), updated weekly.
+We keep adding new features to improve your RavenDB experience. Check out [our latest improvements](https://ravendb.net/docs/article-page/6.2/csharp/start/whats-new), updated weekly.
 
 ## Documentation
-Access [full documentation](https://ravendb.net/docs/article-page/6.1/csharp) for RavenDB. Like our database, it is easy to use.
+Access [full documentation](https://ravendb.net/docs/article-page/6.2/csharp) for RavenDB. Like our database, it is easy to use.
 
 ## Where to Ask for Help
 If you have any questions, or need further assistance, you can [contact us directly](https://ravendb.net/contact).
@@ -42,7 +42,7 @@ Please check how to submit a Pull Request in our [contribution guidelines](./CON
 
 ## Setup & Run
 
-First please [review and set up prerequisites](https://ravendb.net/docs/article-page/6.1/csharp/start/getting-started#prerequisites).
+First please [review and set up prerequisites](https://ravendb.net/docs/article-page/6.2/csharp/start/getting-started#prerequisites).
 
 ### Launch RavenDB:
 Running locally:

scripts/certificates/powershell/dev-create-authenticated-cluster-with-subdomains.ps1

@@ -13,7 +13,7 @@
 param(
     [Parameter(Mandatory=$true)]
     $CertificatePassword = "test",
-    $serverDir = "C:\work\ravendb-v6.1",
+    $serverDir = "C:\work\ravendb-v6.2",
     $nodeCount = 5,
     $licensePath = "C:\work\license.json"
 )

scripts/certificates/powershell/dev-create-authenticated-cluster.ps1

@@ -2,7 +2,7 @@
 param(
     [Parameter(Mandatory=$true)]
     $CertificatePassword="test",
-    $serverDir = "C:\work\ravendb-v6.1",
+    $serverDir = "C:\work\ravendb-v6.2",
     $nodeCount = 5,
     $licensePath = "C:\work\license.json"
 )

scripts/raspberry-pi/setup.sh

@@ -5,7 +5,7 @@ PKG_INSTALLER="apt-get" # supports : sudo ${PKG_INSTALLER} install <pkgname>
 
 CHK_PKGS=( "bzip2" "libunwind8" "tar" "libcurl3" )
 DOTNET_DIR="dotnet"
-RAVENDB_DIR="ravendb.6.1"
+RAVENDB_DIR="ravendb.6.2"
 PROGS=( ${DOTNET_DIR} ${RAVENDB_DIR} )
 RDB_DAEMON="ravendbd"
 
@@ -366,7 +366,7 @@ function addToStartup () {
 	if [ $OP_SYSTEM_STARTUP == 1 ]
 	then
 		echoExecProgram "Add RavenDB daemon to startup"
-		sudo chmod +x ravendb.6.1/ravendb.watchdog.sh
+		sudo chmod +x ravendb.6.2/ravendb.watchdog.sh
 		ESCAPED_PWD=$(pwd | sed 's/\//\\\//g' | sed 's/\&/\\\&/g')
 		cat ${RAVENDB_DIR}/${RDB_DAEMON} | sed 's/RDB_DOTNET_PATH/'${ESCAPED_PWD}'\/'${DOTNET_DIR}'/g' | sed 's/RDB_RAVENDB_PATH/'${ESCAPED_PWD}'\/'${RAVENDB_DIR}'/g' | sed 's/RDB_USERNAME/'${USER}'/g' > ${RDB_DAEMON}.config
 		sudo mv ${RDB_DAEMON}.config /etc/init.d/${RDB_DAEMON} >& /dev/null

scripts/raspberry-pi/start.sh

@@ -5,14 +5,14 @@ then
 	exit 1
 fi
 
-if [ -f ravendb.6.1/Server/Raven.Server.dll ]
+if [ -f ravendb.6.2/Server/Raven.Server.dll ]
 then
-	dotnet/corerun ravendb.6.1/Server/Raven.Server.dll \
+	dotnet/corerun ravendb.6.2/Server/Raven.Server.dll \
 		 --Raven/RunAsService=true \
 		 --Raven/ServerUrl=http://0.0.0.0:8080 \
 		 --Raven/LogsDirectory=Logs \
 		 --Raven/DataDir=Databases \
-	 	 --Raven/StudioDirectory=ravendb.6.1/Server
+	 	 --Raven/StudioDirectory=ravendb.6.2/Server
 
 else
 	printf "\nRun setup.sh to install RavenDB first\n\n"