From 38667f13302eaa1bd4257d6dae476405ec1e9037 Mon Sep 17 00:00:00 2001
From: demirkayaender <80807029+demirkayaender@users.noreply.github.com>
Date: Wed, 1 Sep 2021 10:28:42 -0700
Subject: [PATCH] Release v3.3.0 (#633)

---
 CHANGELOG.md                                  | 22 +++++++++++--------
 build.gradle                                  |  2 +-
 .../cadence/serviceclient/ClientOptions.java  |  2 +-
 .../AdminJwtAuthorizationProviderTest.java    | 15 +++++++++++++
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea6de39d0..0b9cf10f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.3.0
+### Added
+- Added feature flags to ship breaking changes without impacting old behavior.
+
 ## 3.2.0
 ### Added
 - Add Health check API to worker and service interface.
@@ -41,23 +45,23 @@
 - Fix race condition during serialization.
 
 ## 2.7.8
-- Fix get raw history 
-- Improve signal processing error and log 
-- Fix replay error when querying workflow that contains activity retry 
+- Fix get raw history
+- Improve signal processing error and log
+- Fix replay error when querying workflow that contains activity retry
 
 ## 2.7.6
-- Fix getVersion override when added new version 
-- Add async signal to untypedstub 
+- Fix getVersion override when added new version
+- Add async signal to untypedstub
 - Fix RetryOptions.addDoNotRetry
 - Add missing metrics from go client
 - Fix a bug in setting retry expiration while getting history
-- Fix start async return 
+- Fix start async return
 
 ## 2.7.5
 - Added supports contextPropagators for localActivity
 
 ## v2.7.4
-- Fix prometheus reporting issue 
+- Fix prometheus reporting issue
 - Fix Promise.allOf should not block on empty input
 - Misc: Added project directory to sourceItems path
 - Add async start to untype stub
@@ -81,7 +85,7 @@
 - Fix various bugs around test workflow service and test mutable state implementation
 - Use thrift IDLs from uber/cadence-idl repo as a submodule
 - Various dependency updates including Docker base image and Gradle wrapper
-- Miscellaneous bug fixes 
+- Miscellaneous bug fixes
 
 ## v2.6.3
 - Add Upsert Search Attributes
@@ -166,7 +170,7 @@ queries did not used cached workflows.
 ## v2.1.2
 - Requires minimum server release v0.4.0
 - Introduced WorkerFactory and FactoryOptions
-- Added sticky workflow execution, which is caching of a workflow object between decisions. It is enabled by default, 
+- Added sticky workflow execution, which is caching of a workflow object between decisions. It is enabled by default,
 to disable use FactoryOptions.disableStickyExecution property.
 - Updated Thrift to expose new types of service exceptions: ServiceBusyError, DomainNotActiveError, LimitExceededError
 - Added metric for corrupted signal as well as metrics related to caching and evictions.
diff --git a/build.gradle b/build.gradle
index 9c1df4105..0da67abcd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,7 @@ googleJavaFormat {
 }
 
 group = 'com.uber.cadence'
-version = '3.2.0'
+version = '3.3.0'
 
 description = '''Uber Cadence Java Client'''
 
diff --git a/src/main/java/com/uber/cadence/serviceclient/ClientOptions.java b/src/main/java/com/uber/cadence/serviceclient/ClientOptions.java
index f64804220..5d06277d5 100644
--- a/src/main/java/com/uber/cadence/serviceclient/ClientOptions.java
+++ b/src/main/java/com/uber/cadence/serviceclient/ClientOptions.java
@@ -193,7 +193,7 @@ public Map<String, String> getHeaders() {
   public IAuthorizationProvider getAuthProvider() {
     return authProvider;
   }
-  
+
   public FeatureFlags getFeatureFlags() {
     return this.featureFlags;
   }
diff --git a/src/test/java/com/uber/cadence/serviceclient/auth/AdminJwtAuthorizationProviderTest.java b/src/test/java/com/uber/cadence/serviceclient/auth/AdminJwtAuthorizationProviderTest.java
index 9ea1b8591..5b34a6b33 100644
--- a/src/test/java/com/uber/cadence/serviceclient/auth/AdminJwtAuthorizationProviderTest.java
+++ b/src/test/java/com/uber/cadence/serviceclient/auth/AdminJwtAuthorizationProviderTest.java
@@ -1,3 +1,18 @@
+/*
+ *  Modifications Copyright (c) 2017-2021 Uber Technologies Inc.
+ *  Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"). You may not
+ *  use this file except in compliance with the License. A copy of the License is
+ *  located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ *  or in the "license" file accompanying this file. This file is distributed on
+ *  an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *  express or implied. See the License for the specific language governing
+ *  permissions and limitations under the License.
+ */
 package com.uber.cadence.serviceclient.auth;
 
 import static org.junit.Assert.*;