Skip to content
Snippets Groups Projects
Verified Commit 277356ac authored by Daniel Hornung's avatar Daniel Hornung
Browse files

Merge branch 'main' into dev, version bump to 0.8.0-SNAPSHOT

parents 78a43324 fbb60711
No related branches found
No related tags found
1 merge request!66REL: prepare release 0.8.0
Pipeline #23004 passed
...@@ -11,15 +11,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -11,15 +11,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ### 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 * `misc/pam_authentication/ldap.conf` is not used for configuring the
`ldap_authentication.sh` script anymore. `ldap_authentication.sh` script anymore.
Use `misc/pam_authentication/ldap.env` instead and view the documentation Use `misc/pam_authentication/ldap.env` instead and view the documentation
inside the file itself for more information. inside the file itself for more information.
### Deprecated
### Removed
### Fixed ### Fixed
* `ldap_authentication.sh <username>` failed on every attempt when used in * `ldap_authentication.sh <username>` failed on every attempt when used in
......
# Getting Started with the CaosDB Server # Getting Started with the CaosDB Server
Here, you find information on requirements, the installation, configuration and 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. the server requires the knowledge/skill of an experienced Linux administrator.
## Requirements ## Requirements
......
...@@ -18,18 +18,22 @@ guidelines of the CaosDB Project ...@@ -18,18 +18,22 @@ guidelines of the CaosDB Project
2. Check all general prerequisites. 2. Check all general prerequisites.
3. Update the version property in [pom.xml](./pom.xml) (probably this means to 3. Update the versions in:
remove the `-SNAPSHOT`) and in `src/doc/conf.py`. * [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 9. Update the versions for the next developement round:
developlement round (with a `-SNAPSHOT` suffix). * [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.
...@@ -21,7 +21,7 @@ import sphinx_rtd_theme ...@@ -21,7 +21,7 @@ import sphinx_rtd_theme
# -- Project information ----------------------------------------------------- # -- Project information -----------------------------------------------------
project = 'caosdb-server' project = 'caosdb-server'
copyright = '2020, IndiScale GmbH' copyright = '2022, IndiScale GmbH'
author = 'Daniel Hornung' author = 'Daniel Hornung'
# The short X.Y version # The short X.Y version
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment