From c46d0646a59f5a2f70bd0cfc0f20793e7c46935a Mon Sep 17 00:00:00 2001
From: "descope-release-bot[bot]"
 <139235589+descope-release-bot[bot]@users.noreply.github.com>
Date: Thu, 13 Aug 2026 22:38:39 +0000
Subject: [PATCH] chore(main): release java-sdk 1.5.0

---
 .release-please-manifest.json     | 2 +-
 CHANGELOG.md                      | 7 +++++++
 examples/check-pwd-policy/pom.xml | 2 +-
 examples/management-cli/pom.xml   | 2 +-
 pom.xml                           | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 73d3293b..6180eb92 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "1.4.0"
+    ".": "1.5.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cfc395e..5bebaa8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.5.0](https://github.com/descope/descope-java/compare/java-sdk-1.4.0...java-sdk-1.5.0) (2026-08-13)
+
+
+### Features
+
+* **mgmt:** add failOnConflict parameter to updateEmail/updatePhone ([#360](https://github.com/descope/descope-java/issues/360)) ([65e4209](https://github.com/descope/descope-java/commit/65e4209d5e1e3af2c0973808596eaf286c096893))
+
 ## [1.4.0](https://github.com/descope/descope-java/compare/java-sdk-1.3.0...java-sdk-1.4.0) (2026-08-11)
 
 
diff --git a/examples/check-pwd-policy/pom.xml b/examples/check-pwd-policy/pom.xml
index f26a2cd7..1ec29185 100644
--- a/examples/check-pwd-policy/pom.xml
+++ b/examples/check-pwd-policy/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.descope</groupId>
     <artifactId>check-pwd-policy</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
 
     <properties>
         <maven.compiler.release>17</maven.compiler.release>
diff --git a/examples/management-cli/pom.xml b/examples/management-cli/pom.xml
index f7bb768b..de55722d 100644
--- a/examples/management-cli/pom.xml
+++ b/examples/management-cli/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.descope</groupId>
     <artifactId>management-cli</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
diff --git a/pom.xml b/pom.xml
index 81acad37..63bf945e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <groupId>com.descope</groupId>
     <artifactId>java-sdk</artifactId>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Java library used to integrate with Descope.</description>
     <url>https://github.com/descope/descope-java</url>