Merge pull request #163

Prepare repository for August Release

CHANGELOG.md

@@ -10,7 +10,7 @@ Every entry has a category for which we use the following visual abbreviations:
 - 🧬 Experimental Features
 - 🐞 Bug Fixes
 
-## Unreleased
+## [2021.08.26]
 
 - ⚡️ The `threatbus-zmq-app` package has been renamed to `threatbus-zmq`, to
   address some limitations in the configuration framework.
@@ -19,6 +19,9 @@ Every entry has a category for which we use the following visual abbreviations:
 - 🐞 Fixed config validation for the 'apps.misp.api' setting.
   [#161](https://github.com/tenzir/threatbus/pull/161)
 
+- ⚠️ `vast-threatbus` now depends on version 3.0 of `stix2` package.
+  [#162](https://github.com/tenzir/threatbus/pull/162)
+
 ## [2021.07.29]
 
 - 🐞 Threatbus now only attempts to load plugins that are explicitly
@@ -250,3 +253,4 @@ Every entry has a category for which we use the following visual abbreviations:
 [2021.05.27]: https://github.com/tenzir/threatbus/releases/tag/2021.05.27
 [2021.06.24]: https://github.com/tenzir/threatbus/releases/tag/2021.06.24
 [2021.07.29]: https://github.com/tenzir/threatbus/releases/tag/2021.07.29
+[2021.08.26]: https://github.com/tenzir/threatbus/releases/tag/2021.08.26

apps/stix-shifter/CHANGELOG.md

@@ -11,6 +11,11 @@ Every entry has a category for which we use the following visual abbreviations:
 - ⚡️ Breaking Changes
 - 🐞 Bug Fixes
 
+## [2021.08.26]
+
+- ⚠️ `stix-shifter-threatbus` now depends on version 3.0 of `stix2` package.
+  [#162](https://github.com/tenzir/threatbus/pull/162)
+
 ## [2021.07.29]
 
 - ⚠️ The Dockerfile of `stix-shifter-threatbus` has moved to the repository
@@ -69,3 +74,4 @@ Every entry has a category for which we use the following visual abbreviations:
 [2021.05.27]: https://github.com/tenzir/threatbus/releases/tag/2021.05.27
 [2021.06.24]: https://github.com/tenzir/threatbus/releases/tag/2021.06.24
 [2021.07.29]: https://github.com/tenzir/threatbus/releases/tag/2021.07.29
+[2021.08.26]: https://github.com/tenzir/threatbus/releases/tag/2021.08.26

apps/stix-shifter/setup.py

@@ -54,5 +54,5 @@
     python_requires=">=3.7",
     setup_requires=["setuptools", "wheel"],
     url="https://github.com/tenzir/threatbus",
-    version="2021.07.29",
+    version="2021.08.26",
 )

apps/suricata/CHANGELOG.md

@@ -11,6 +11,11 @@ Every entry has a category for which we use the following visual abbreviations:
 - ⚡️ Breaking Changes
 - 🐞 Bug Fixes
 
+## [2021.08.26]
+
+- ⚠️ `suricata-threatbus` now depends on version 3.0 of `stix2` package.
+  [#162](https://github.com/tenzir/threatbus/pull/162)
+
 ## [2021.07.29]
 
 - ⚠️ The Dockerfile of `suricata-threatbus` has moved to the repository toplevel
@@ -52,3 +57,4 @@ Every entry has a category for which we use the following visual abbreviations:
 
 [2021.06.24]: https://github.com/tenzir/threatbus/releases/tag/2021.06.24
 [2021.07.29]: https://github.com/tenzir/threatbus/releases/tag/2021.07.29
+[2021.08.26]: https://github.com/tenzir/threatbus/releases/tag/2021.08.26

apps/suricata/setup.py

@@ -53,5 +53,5 @@
     python_requires=">=3.7",
     setup_requires=["setuptools", "wheel"],
     url="https://github.com/tenzir/threatbus",
-    version="2021.07.29",
+    version="2021.08.26",
 )

apps/vast/CHANGELOG.md

@@ -10,7 +10,7 @@ Every entry has a category for which we use the following visual abbreviations:
 - ⚡️ Breaking Changes
 - 🐞 Bug Fixes
 
-## Unreleased
+## [2021.08.26]
 
 - ⚡️ We renamed PyVAST Threat Bus to VAST Threat Bus for clarity. The PyPI
   package name and the binary name change from `pyvast-threatbus` to
@@ -20,6 +20,9 @@ Every entry has a category for which we use the following visual abbreviations:
 - 🎁 Live matching with VAST works again!
   [#156](https://github.com/tenzir/threatbus/pull/156)
 
+- ⚠️ `vast-threatbus` now depends on version 3.0 of `stix2` package.
+  [#162](https://github.com/tenzir/threatbus/pull/162)
+
 ## [2021.07.29]
 
 - ⚠️ The metric for indicator query time now only reflects the actual time spent
@@ -205,3 +208,4 @@ Every entry has a category for which we use the following visual abbreviations:
 [2021.05.27]: https://github.com/tenzir/threatbus/releases/tag/2021.05.27
 [2021.06.24]: https://github.com/tenzir/threatbus/releases/tag/2021.06.24
 [2021.07.29]: https://github.com/tenzir/threatbus/releases/tag/2021.07.29
+[2021.08.26]: https://github.com/tenzir/threatbus/releases/tag/2021.08.26

apps/vast/setup.py

@@ -52,5 +52,5 @@
     python_requires=">=3.7",
     setup_requires=["setuptools", "wheel"],
     url="https://github.com/tenzir/threatbus",
-    version="2021.07.29",
+    version="2021.08.26",
 )

apps/zmq-app-template/setup.py

@@ -49,5 +49,5 @@
     python_requires=">=3.7",
     setup_requires=["setuptools", "wheel"],
     url="https://github.com/tenzir/threatbus",
-    version="2021.07.29",
+    version="2021.08.26",
 )

docker/vast-threatbus/Dockerfile

@@ -1,7 +1,7 @@
 # The used version here always refers to the latest released VAST version.
 # Use `latest` to get the most recent version of VAST as it is available on the
 # Git master branch at https://github.com/tenzir/vast.
-ARG VAST_VERSION=2021.07.29
+ARG VAST_VERSION=2021.08.26
 
 FROM tenzir/vast:$VAST_VERSION
 USER root

plugins/apps/threatbus_cif3/setup.py

@@ -49,5 +49,5 @@
     packages=["threatbus_cif3"],
     python_requires=">=3.6",
     url="https://github.com/tenzir/threatbus",
-    version="2021.07.29",
+    version="2021.08.26",
 )

plugins/apps/threatbus_misp/setup.py

@@ -49,5 +49,5 @@
     packages=["threatbus_misp"],
     python_requires=">=3.7",
     url="https://github.com/tenzir/threatbus",
-    version="2021.07.29",
+    version="2021.08.26",
 )

plugins/apps/threatbus_zeek/setup.py

@@ -50,5 +50,5 @@
     python_requires=">=3.7",
     setup_requires=["setuptools", "wheel"],
     url="https://github.com/tenzir/threatbus",
-    version="2021.07.29",
+    version="2021.08.26",
 )

plugins/apps/threatbus_zmq/setup.py

@@ -47,5 +47,5 @@
     packages=["threatbus_zmq"],
     python_requires=">=3.7",
     url="https://github.com/tenzir/threatbus",
-    version="2021.07.29",
+    version="2021.08.26",
 )

plugins/backbones/file_benchmark/setup.py

@@ -34,5 +34,5 @@
     packages=["file_benchmark"],
     python_requires=">=3.7",
     url="https://github.com/tenzir/threatbus",
-    version="2021.07.29",
+    version="2021.08.26",
 )

plugins/backbones/threatbus_inmem/setup.py

@@ -41,5 +41,5 @@
     packages=["threatbus_inmem"],
     python_requires=">=3.7",
     url="https://github.com/tenzir/threatbus",
-    version="2021.07.29",
+    version="2021.08.26",
 )

plugins/backbones/threatbus_rabbitmq/setup.py

@@ -46,5 +46,5 @@
     packages=["threatbus_rabbitmq"],
     python_requires=">=3.7",
     url="https://github.com/tenzir/threatbus",
-    version="2021.07.29",
+    version="2021.08.26",
 )

requirements.txt

@@ -1,7 +1,7 @@
 black>=19.10b
 coloredlogs>=10.0
 dynaconf>=3.1.4
-pluggy>=0.13
+pluggy>=0.13,<1.0
 python-dateutil>=2.8.1
 stix2-patterns == 1.3.0
 stix2>=3.0

setup.py

@@ -29,7 +29,7 @@
         "black>=19.10b",
         "coloredlogs>=10.0",
         "dynaconf>=3.1.4",
-        "pluggy>=0.13",
+        "pluggy>=0.13,<1.0",
         "python-dateutil>=2.8.1",
         "stix2-patterns == 1.3.0",
         "stix2>=2.1,<3.0",
@@ -49,5 +49,5 @@
     python_requires=">=3.7",
     setup_requires=["setuptools", "wheel"],
     url="https://github.com/tenzir/threatbus",
-    version="2021.07.29",
+    version="2021.08.26",
 )