From 292b82cad7426a28c4e4360a73451f132adc94d4 Mon Sep 17 00:00:00 2001
From: Sebastian Ertner <sebastian.ertner@netresearch.de>
Date: Tue, 30 Nov 2021 12:24:25 +0100
Subject: [PATCH] DHLGW-1161: Release 2.3.0

---
 CHANGELOG.md  | 61 ++++++++++++++++++++++++++++++++++-----------------
 composer.json |  9 ++++----
 2 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69ffcd9..6260d40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,43 +5,64 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.3.0
+
+### Added
+
+- Select DHL Paket or Deutsche Post shipping products per order during the Create Shipments mass action.
+- Book the DHL Paket Europaket shipping product for EU shipments.
+
 ## 2.2.0
 
-### Changed
+### Added
 
-- Update DHL Parcel Germany carrier module to version 2.2.1
-- Update DHL Parcel Germany returns module to version 2.0.3
-- Update Deutsche Post Internetmarke module to version 2.0.3
-- Update Shipping UI module version 2.1.0
-- Deutsche Post Direkt ADDRESSFACTORY module version 1.2.0
-- Deutsche Post Direkt Autocomplete module version 1.2.0
+- Create return shipments in Magento Open Source admin panel.
 
 ## 2.1.0
 
+### Added
+
+- Magento 2.4.3 compatibility
+- Offer DHL Paket Premium service for cross-border shipments.
+- Print a logo image on DHL Paket shipping labels.
+- Consider area-based customs regulations when booking shipping labels (postal codes and ranges).
+
 ### Changed
 
-- Update DHL Parcel Germany carrier module to version 2.2.0
-- Update DHL Parcel Germany returns module to version 2.0.2
-- Update Deutsche Post Internetmarke module to version 2.0.2
-- Update Shipping UI module version 2.0.3
+- Print order number instead of billing number as customer reference on return shipment labels.
+
+### Fixed
+
+- Roll back multi-package Deutsche Post Internetmarke labels on error.
+- Prevent CSP violations when loading the location finder map in checkout.
+- Prevent empty country dropdown in location finder.
+- Display the Additional Fee (service charge) total in PDFs.
+- Support database table prefixes.
+- Prevent JS/Knockout error in checkout.
 
 ## 2.0.1
 
-### Changed
+### Fixed
 
-- Update Deutsche Post Internetmarke module to version 2.0.1
-- Update DHL Parcel Germany carrier module to version 2.0.1
-- Update DHL Parcel Germany returns module to version 2.0.1
+- Print country on Deutsche Post Internetmarke vouchers.
+- Adjust module dependencies.
 
 ## 2.0.0
 
+### Added
+
+- Perform post-processing on street splitting algorithm results.
+- Properly deduct stock from the correct MSI sources by installing the optional [Shipping Inventory module](https://github.com/netresearch/module-shipping-inventory)
+
 ### Changed
 
-- Update Deutsche Post Internetmarke module to version 2.0.0
-- Update DHL Parcel Germany carrier module to version 2.0.0
-- Update DHL Parcel Germany returns module to version 2.0.0
-- Shipping UI module version 2.0.1
-- Removed DHL UI module 
+- Move to carrier agnostic shipping framework for increased compatibility with other carriers.
+
+### Fixed
+
+- Prevent obsolete service surcharges caused by updated cart or address.
+- Allow special house number additions for addresses in Baden-Wuerttemberg
+- Prevent services being booked on carts that became virtual after cart item changes.
 
 ## 1.5.1
 
diff --git a/composer.json b/composer.json
index 0ae1870..aa5afec 100644
--- a/composer.json
+++ b/composer.json
@@ -2,14 +2,15 @@
     "name": "dhl/shipping-m2",
     "description": "DHL multi-division shipping extension for Magento 2",
     "type": "metapackage",
-    "version": "2.2.0",
+    "version": "2.3.0",
     "license": "OSL-3.0",
     "require": {
         "deutschepost/module-autocomplete-m2": "~1.2.0",
         "deutschepost/module-addressfactory-m2": "~1.2.0",
-        "deutschepost/module-internetmarke": "~2.0.3",
-        "dhl/module-carrier-paket": "~2.2.1",
+        "deutschepost/module-internetmarke": "~2.1.0",
+        "dhl/module-carrier-paket": "~2.3.0",
         "dhl/module-carrier-paket-returns": "~2.0.3",
-        "netresearch/module-shipping-ui": "~2.1.0"
+        "netresearch/module-interactive-batch-processing": "~1.0.0",
+        "netresearch/module-shipping-ui": "~2.1.1"
     }
 }