From 14bde438dddb1efba18d113f9db3a056804f7166 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <wagner@cert.at>
Date: Wed, 22 May 2019 14:54:33 +0200
Subject: [PATCH] REL: Major version 2.0.0

---
 CHANGELOG.md       | 19 ++++++++++++-------
 NEWS.md            | 16 ++--------------
 debian/changelog   |  6 ++++++
 intelmq/version.py |  2 +-
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cc137567..27a75486e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,11 @@
 CHANGELOG
 ==========
 
-1.2.0 (unreleased)
+2.0.0 (2019-05-22)
 ------------------
 
+See also the changelog for 2.0.0.beta1 below.
+
 ### Configurations
 - Defaults: New parameters `statistics_host`, `statistics_port`, `statistics_databasae`, `statistics_password` for statistics redis database (#1402).
 
@@ -28,10 +30,10 @@ CHANGELOG
 - Applied isort to all core files and core-related test files, sorting the imports there (every thing except bots and bots' tests).
 
 ### Harmonization
+- See the Core section for the changes in the allowed values for `classification.type`.
 
 ### Bots
 - Use the new RSIT types in several types, see above
-#### Collectors
 
 #### Parsers
 - `intelmq.bots.parsers.spamhaus.parser_cert`: Added support for `extortion` events.
@@ -43,8 +45,6 @@ CHANGELOG
 - `intelmq.bots.outputs.elasticsearch.output`: Support for TLS added (#1406).
 - `intelmq.bots.outputs.tcp.output`: Support non-intelmq counterparts again. New parameter `counterpart_is_intelmq`, see NEWS.md for more information (#1385).
 
-### Documentation
-
 ### Packaging
 - Update IntelMQ path fix patch after `INTELMQ_PATHS_NO_OPT` introduction, provide `INTELMQ_PATHS_OPT` environment variable for packaged instances.
 
@@ -58,12 +58,17 @@ CHANGELOG
 - intelmqdump: Fix creation of pipeline object by providing a logger.
 - intelmqctl: Disable multithreading for interactive runs / the bot debugger (#1403).
 
-### Contrib
-
 ### Known issues
+- tests: capture logging with context manager (#1342)
+- pymongo 3.0 deprecates used insert method  (#1063)
+- pymongo >= 3.5: authentication changes  (#1062)
+- Bots started with IntelMQ-Manager stop when the webserver is restarted. (#952)
+- n6 parser: mapping is modified within each run (#905)
+- reverse DNS: Only first record is used (#877)
+- Corrupt dump files when interrupted during writing (#870)
 
 
-1.2.0.beta1 (2019-04-10)
+2.0.0.beta1 (2019-04-10)
 ------------------------
 There are some features considered as beta and marked as such in the documentation, do not use them in production yet.
 
diff --git a/NEWS.md b/NEWS.md
index 4209efbdf..2781c0289 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,12 +3,10 @@ NEWS
 
 See the changelog for a full list of changes.
 
-2.0.0 Major release (unreleased)
+2.0.0 Major release (2019-05-22)
 --------------------------------
 
-### Requirements
-
-### Tools
+See also the news for 2.0.0.beta1 below.
 
 ### Harmonization
 The allowed values for the `classification.type` field have been updated to the RSIT mapping. These values have changed and are automatically mapped:
@@ -28,8 +26,6 @@ Four new values have been introduced to configure the statistics database. Add t
 #### TCP Output
 Version 1.1.2 broke the compatibility of the TCP Output with third-party counterparts like filebeat, but is more stable for a TCP Collector counterpart. A new parameter `counterpart_is_intelmq` has been introduced, it's default is `false` for backwards compatibility. If you use a TCP collector, set this to `true`, otherwise to `false`.
 
-### Libraries
-
 ### Postgres databases
 The following statements optionally update existing data.
 Please check if you did use these feed names and eventually adapt them for your setup!
@@ -51,19 +47,11 @@ UPDATE events
    WHERE "classification.type" = 'malware configuration';
 ```
 
-In the section for 1.1.0 there was this command:
-```
-
-
 2.0.0.beta1 release (2019-04-10)
 -------------------------------
 
 There are some features considered as beta and marked as such in the documentation, do not use them in production yet.
 
-### Tools
-
-### Harmonization
-
 ### Configuration
 The bot `intelmq.bots.experts.ripencc_abuse_contact.expert` has been renamed to `intelmq.bots.experts.ripe.expert`, the compatibility shim will be removed in version 3.0. Adapt your `runtime.conf` accordingly.
 
diff --git a/debian/changelog b/debian/changelog
index 09aa441b5..ef3cbad55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+intelmq (2.0.0-1) stable; urgency=medium
+
+  * Update to 2.0.0.
+
+ -- Sebastian Wagner <wagner@cert.at>  Wed, 22 May 2019 14:00:27 +0200
+
 intelmq (2.0.0~beta2-1) unstable; urgency=low
 
   * Update to version 2.0.0 beta 2
diff --git a/intelmq/version.py b/intelmq/version.py
index 9d9ebc032..abc8881e9 100644
--- a/intelmq/version.py
+++ b/intelmq/version.py
@@ -1,2 +1,2 @@
-__version_info__ = ('2', '0', '0', 'beta2')
+__version_info__ = ('2', '0', '0')
 __version__ = '.'.join(__version_info__)