From 8c186a2e7558148b9ccb19427b1a0666f25f8691 Mon Sep 17 00:00:00 2001
From: fstrba <>
Date: Nov 02 2024 23:26:59 +0000
Subject: Update glassfish-websocket-api to version 1.1 / rev 4 via SR 1220160


https://build.opensuse.org/request/show/1220160
by user fstrba + dimstar_suse
Avoid conflict of providers

---

diff --git a/.files b/.files
index 3c58927..c18b662 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 3969404..85791ec 100644
--- a/.rev
+++ b/.rev
@@ -23,4 +23,12 @@
     <comment>Reproducible builds improvement</comment>
     <requestid>1109952</requestid>
   </revision>
+  <revision rev="4" vrev="4">
+    <srcmd5>d5b90b20141b9650deae9798df63b282</srcmd5>
+    <version>1.1</version>
+    <time>1730560319</time>
+    <user>dimstar_suse</user>
+    <comment>Avoid conflict of providers</comment>
+    <requestid>1220160</requestid>
+  </revision>
 </revisionlist>
diff --git a/glassfish-websocket-api.changes b/glassfish-websocket-api.changes
index 143ca9b..a9dd106 100644
--- a/glassfish-websocket-api.changes
+++ b/glassfish-websocket-api.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Sat Nov  2 08:25:18 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Conflict with the other provider of
+  javax.websocket:javax.websocket-api to avoid duplicate artifact
+
+-------------------------------------------------------------------
 Sat Sep  9 13:37:48 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 
 - Reproducible builds: use SOURCE_DATE_EPOCH for timestamp
diff --git a/glassfish-websocket-api.spec b/glassfish-websocket-api.spec
index 344f2b2..fff825a 100644
--- a/glassfish-websocket-api.spec
+++ b/glassfish-websocket-api.spec
@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package glassfish-websocket-api
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,6 +32,7 @@ BuildRequires:  xz
 BuildRequires:  mvn(net.java:jvnet-parent:pom:)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.glassfish.build:spec-version-maven-plugin)
+Conflicts:      jboss-websocket-1.0-api
 BuildArch:      noarch
 
 %description