From 659a0f73c63363223a2ace86aa113cca28404dee Mon Sep 17 00:00:00 2001
From: Patrick East <east.patrick@gmail.com>
Date: Mon, 16 Mar 2020 18:50:54 -0700
Subject: [PATCH] Prepare for v0.18.0 release

Signed-off-by: Patrick East <east.patrick@gmail.com>
---
 CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++--
 Makefile     |  2 +-
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 899ec97afb..2d8db10be2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,14 +3,47 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
-## Unreleased
+## 0.18.0
+
+### Features
+
+- Add `opa bench` and `opa test --bench` sub commands for benchmarking policy evaluation. ([#1424](https://github.com/open-policy-agent/opa/issues/1424))
+- Permit verifying JWT's with a public key
+- `http.send` improvements:
+  - Allow for skipping TLS verification via `tls_insecure_skip_verify` option
+  - Add `Host` header support
+
+### New Built-in Functions
+
+- Bitwise operators ([#1919](https://github.com/open-policy-agent/opa/issues/1919))
+  - `bits.or`
+  - `bits.and`
+  - `bits.negate`
+  - `bits.xor`
+  - `bits.lsh`
+  - `bits.rsh`
+- `json.remove` which works similar to `object.remove` but supports a JSON pointer path.
+
+### Fixes
+- docs: Render tutorials as list ([#2071](https://github.com/open-policy-agent/opa/issues/2071))
+- ast: Fix type check for objects with non-json keys ([#2183](https://github.com/open-policy-agent/opa/issues/2183))
+- ast: Return an error when parsing an empty module ([#2054](https://github.com/open-policy-agent/opa/issues/2054))
+- docs: Fix broken PAM module link ([#2113](https://github.com/open-policy-agent/opa/issues/2113))
+- docs: Fix code fence in kubernetes-primer.md ([#2177](https://github.com/open-policy-agent/opa/issues/2177))
+- topdown: Invoke iterator when evaluating negation ([#2142](https://github.com/open-policy-agent/opa/issues/2142))
+- Correct checkptr errors found with Go 1.14
+- `opa parse`: fix panic when parsing invalid JSON
 
 ### Compatibility Notes
 
 - The `ast.ParseModule` helper will now return an error if an empty module is provided.
   Previously it would return a `nil` error and `nil` module. ([#2054](https://github.com/open-policy-agent/opa/issues/2054))
 - The `cmd` and `tester` packages in OPA will now require Go 1.13+ to compile. Most library users should be unaffected.
-  
+
+### Miscellaneous
+
+- bundle: Dedicate `policy.wasm` for the compiled policy.
+
 ## 0.17.3
 
 ### Fixes
diff --git a/Makefile b/Makefile
index 28d2f24ced..f4bd2b7678 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by an Apache2
 # license that can be found in the LICENSE file.
 
-VERSION := 0.18.0-dev
+VERSION := 0.18.0
 
 # Force modules on and to use the vendor directory.
 GO := GO111MODULE=on GOFLAGS=-mod=vendor go