From a668709d266b20b9dfa15ba33aba62be131cc9f8 Mon Sep 17 00:00:00 2001
From: Nikola Ivanovski <nikola.ivanovski@dnhsoft.com>
Date: Mon, 14 Oct 2024 15:49:03 +0300
Subject: [PATCH] Release v2.1.0

---
 .github/workflows/trigger.yaml | 4 +++-
 CHANGELOG.md                   | 4 ++--
 README.md                      | 3 ++-
 composer.json                  | 3 +++
 metadata.php                   | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/trigger.yaml b/.github/workflows/trigger.yaml
index db37b31..1e7d16a 100644
--- a/.github/workflows/trigger.yaml
+++ b/.github/workflows/trigger.yaml
@@ -3,7 +3,9 @@ name: Auto trigger on push or pull requests
 
 on:
   pull_request: {}
-  push: {}
+  push:
+    branches:
+      - 'b-7.2.x*'
 
 jobs:
   php82_mysql80:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 303bb05..8892e0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2.1.0] - Unreleased
+## [2.1.0] - 2024-10-14
 
 ### Changed
 - Upgrade phpunit to 11.x
@@ -51,6 +51,6 @@ Module extracted from wysiwyg module, and used by it now
 - Thumbnails are generated on demand and the type of thumbnail file is matching the original image type
 - Alternative image directory setting renamed to fit its functionality: Alternative image URL
 
-[2.1.0]: https://github.com/OXID-eSales/media-library-module/compare/b-7.1.x..b-7.2.x
+[2.1.0]: https://github.com/OXID-eSales/media-library-module/compare/v2.0.0..v2.1.0
 [2.0.0]: https://github.com/OXID-eSales/media-library-module/compare/v1.0.0..v2.0.0
 [1.0.0]: https://github.com/OXID-eSales/media-library-module/compare/f18ab07..v1.0.0
diff --git a/README.md b/README.md
index 4b57bca..b453264 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Media Library Module for OXID eShop
 
-[![Development](https://github.com/OXID-eSales/media-library-module/actions/workflows/trigger.yaml/badge.svg?branch=b-7.1.x)](https://github.com/OXID-eSales/media-library-module/actions/workflows/trigger.yaml)
+[![Development](https://github.com/OXID-eSales/media-library-module/actions/workflows/trigger.yaml/badge.svg?branch=b-7.2.x)](https://github.com/OXID-eSales/media-library-module/actions/workflows/trigger.yaml)
 [![Latest Version](https://img.shields.io/packagist/v/OXID-eSales/media-library-module?logo=composer&label=latest&include_prereleases&color=orange)](https://packagist.org/packages/oxid-esales/media-library-module)
 [![PHP Version](https://img.shields.io/packagist/php-v/oxid-esales/media-library-module)](https://github.com/oxid-esales/media-library-module)
 
@@ -13,6 +13,7 @@ Module provides basic media files management.
 ## Compatibility
 
 ### Versions
+* v2.1.x is compatible with eShop compilation 7.2.x and higher
 * v2.0.x is compatible with eShop compilation 7.1.x and higher
 * v1.0.x is compatible with eShop compilation 7.1.x and higher
 
diff --git a/composer.json b/composer.json
index 6488a9c..9d56714 100644
--- a/composer.json
+++ b/composer.json
@@ -46,6 +46,9 @@
       "OxidEsales\\MediaLibrary\\Tests\\": "./tests"
     }
   },
+  "conflict": {
+    "oxid-esales/oxideshop-ce": "<7.2"
+  },
   "scripts": {
     "phpcs": "phpcs --standard=tests/phpcs.xml  --report=full",
     "phpcs-report": "phpcs --standard=tests/phpcs.xml --report=json --report-file=phpcs.report.json",
diff --git a/metadata.php b/metadata.php
index 699f658..0cd3ccf 100755
--- a/metadata.php
+++ b/metadata.php
@@ -22,7 +22,7 @@
         'en' => '',
     ],
     'thumbnail'   => 'logo.png',
-    'version'     => '2.0.0',
+    'version'     => '2.1.0',
     'author'      => 'OXID eSales AG & digidesk - media solutions',
     'url'         => 'https://www.oxid-esales.com',
     'email'       => 'info@oxid-esales.com',