diff --git a/CHANGELOG.md b/CHANGELOG.md index 4816d89dd2cb332191014d7d52aa068ba5a7d326..f0904bed9de8d1176931e366fc7e978d66c7b186 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,15 +11,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +### Deprecated + +### Removed + +### Fixed + +### Security + +## [0.7.3] - 2022-05-03 +(Daniel Hornung) + +### Changed + * `misc/pam_authentication/ldap.conf` is not used for configuring the `ldap_authentication.sh` script anymore. Use `misc/pam_authentication/ldap.env` instead and view the documentation inside the file itself for more information. -### Deprecated - -### Removed - ### Fixed * `ldap_authentication.sh <username>` failed on every attempt when used in diff --git a/README_SETUP.md b/README_SETUP.md index 7817d67fd141ddd977ad1f7a5f02152aa0711a56..a264669cf08c61686a064d96f66c0548f94c2ce8 100644 --- a/README_SETUP.md +++ b/README_SETUP.md @@ -1,7 +1,7 @@ # Getting Started with the CaosDB Server Here, you find information on requirements, the installation, configuration and -more. Note, that building the CaosDB Server from the sources and maintaining +more. Note, that building the CaosDB Server from the sources and maintaining the server requires the knowledge/skill of an experienced Linux administrator. ## Requirements diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md index a31d483f803c55699cefd40a277832b1f6c12de8..b2c78172f7ed2955c5fe87f8c5d2ab277fc81b2c 100644 --- a/RELEASE_GUIDELINES.md +++ b/RELEASE_GUIDELINES.md @@ -18,18 +18,22 @@ guidelines of the CaosDB Project 2. Check all general prerequisites. -3. Update the version property in [pom.xml](./pom.xml) (probably this means to - remove the `-SNAPSHOT`) and in `src/doc/conf.py`. +3. Update the versions in: + * [pom.xml](./pom.xml) (probably this means to remove the `-SNAPSHOT`) + * `src/doc/conf.py` + * `CHANGELOG.md` -4. Merge the release branch into the main branch. +5. Merge the release branch into the main branch. -5. Tag the latest commit of the main branch with `v<VERSION>`. +6. Tag the latest commit of the main branch with `v<VERSION>`. -6. Delete the release branch. +7. Delete the release branch. -7. Merge the main branch back into the dev branch. +8. Merge the main branch back into the dev branch. -8. Update the version property in [pom.xml](./pom.xml) for the next - developlement round (with a `-SNAPSHOT` suffix). +9. Update the versions for the next developement round: + * [pom.xml](./pom.xml) with a `-SNAPSHOT` suffix + * `src/doc/conf.py` + * `CHANGELOG.md`: Re-add the `[Unreleased]` section. -9. Add a gitlab release in the respective repository. +10. Add a gitlab release in the respective repository. diff --git a/src/doc/conf.py b/src/doc/conf.py index 079eec42b21b3532e30c21ceaf8afe5a8ea7f35b..ba98f7e554816f858f5664c084c20bc1b33167de 100644 --- a/src/doc/conf.py +++ b/src/doc/conf.py @@ -21,7 +21,7 @@ import sphinx_rtd_theme # -- Project information ----------------------------------------------------- project = 'caosdb-server' -copyright = '2020, IndiScale GmbH' +copyright = '2022, IndiScale GmbH' author = 'Daniel Hornung' # The short X.Y version