Skip to content

Commit

Permalink
Files updated in release process
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaskrause committed Dec 12, 2021
1 parent 89cf9fd commit 6fe0597
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [4.6.1] - 2021-12-12

### Fixed

- Enforce upgrade of (unused) log4j dependency to 2.15.0.
Expand Down Expand Up @@ -1037,7 +1039,8 @@ https://github.com/korpling/ANNIS/issues?milestone=4&state=closed
- [#37](https://github.com/korpling/ANNIS/issues/37) Allow to migrate corpora in database initialization


[Unreleased]: https://github.com/korpling/ANNIS/compare/v4.6.0...HEAD
[Unreleased]: https://github.com/korpling/ANNIS/compare/v4.6.1...HEAD
[4.6.1]: https://github.com/korpling/ANNIS/compare/v4.6.0...v4.6.1
[4.6.0]: https://github.com/korpling/ANNIS/compare/v4.5.3...v4.6.0
[4.5.3]: https://github.com/korpling/ANNIS/compare/v4.5.2...v4.5.3
[4.5.2]: https://github.com/korpling/ANNIS/compare/v4.5.1...v4.5.2
Expand Down
14 changes: 8 additions & 6 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ authors:
affiliation: Ruhr-Universitaet Bochum
repository-code: https://github.com/korpling/ANNIS
license: Apache-2.0
version: 4.6.0
date-released: 2021-12-08
version: 4.6.1
date-released: 2021-12-12
references:
- type: article
title: 'ANNIS3: A new architecture for generic corpus query and visualization'
Expand Down Expand Up @@ -251,7 +251,7 @@ references:
repository-code: https://github.com/apache/httpcomponents-core/tree/4.4.14/httpcore
- type: software
title: Apache Log4j API
version: 2.14.1
version: 2.15.0
abbreviation: org.apache.logging.log4j:log4j-api
license: Apache-2.0
notes: More license information can be found in the THIRD-PARTY/Apache_Log4j_API
Expand All @@ -266,10 +266,11 @@ references:
- name: Bruce Brouwer
- name: Mikael Ståldal
- name: Carter Kozak
- name: Volkan Yazıcı
repository-code: https://gitbox.apache.org/repos/asf?p=logging-log4j2.git/log4j-api
- type: software
title: Apache Log4j to SLF4J Adapter
version: 2.14.1
version: 2.15.0
abbreviation: org.apache.logging.log4j:log4j-to-slf4j
license: Apache-2.0
notes: More license information can be found in the THIRD-PARTY/Apache_Log4j_to_SLF4J_Adapter
Expand All @@ -284,6 +285,7 @@ references:
- name: Bruce Brouwer
- name: Mikael Ståldal
- name: Carter Kozak
- name: Volkan Yazıcı
repository-code: https://gitbox.apache.org/repos/asf?p=logging-log4j2.git/log4j-to-slf4j
- type: software
title: Apache Tika core
Expand Down Expand Up @@ -1198,7 +1200,7 @@ references:
title: atmosphere-runtime
version: 2.4.30.vaadin4
abbreviation: com.vaadin.external.atmosphere:atmosphere-runtime
license: Apache-2.0
license-url: https://glassfish.dev.java.net/public/CDDLv1.0.html
notes: More license information can be found in the THIRD-PARTY/atmosphere_runtime
directory.
authors:
Expand Down Expand Up @@ -1756,7 +1758,7 @@ references:
title: vaadin-slf4j-jdk14
version: 1.6.1
abbreviation: com.vaadin.external.slf4j:vaadin-slf4j-jdk14
license: MIT
license-url: http://opensource.org/licenses/MIT
notes: More license information can be found in the THIRD-PARTY/vaadin_slf4j_jdk14
directory.
authors:
Expand Down
2 changes: 1 addition & 1 deletion THIRD-PARTY/Apache_Log4j_to_SLF4J_Adapter/DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ From: 'QOS.ch' (http://www.qos.ch)
License: MIT License (http://www.opensource.org/licenses/mit-license.php)

From: 'The Apache Software Foundation' (https://www.apache.org/)
- Apache Log4j API (https://logging.apache.org/log4j/2.x/log4j-api/) org.apache.logging.log4j:log4j-api:jar:2.14.1
- Apache Log4j API (https://logging.apache.org/log4j/2.x/log4j-api/) org.apache.logging.log4j:log4j-api:jar:2.15.0
License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt)


Expand Down

0 comments on commit 6fe0597

Please sign in to comment.