From 4251d965a02a2d77110c9d53768134714ba7a4c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 02:07:41 +0000
Subject: [PATCH 1/2] Bump org.eclipse.osgi.util from 3.6.100 to 3.7.1

Bumps [org.eclipse.osgi.util](https://github.com/eclipse-equinox/equinox.binaries) from 3.6.100 to 3.7.1.
- [Release notes](https://github.com/eclipse-equinox/equinox.binaries/releases)
- [Commits](https://github.com/eclipse-equinox/equinox.binaries/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi.util
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 jetty-osgi/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index a4c1333349c8..c843fdb3b46c 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -14,7 +14,7 @@
   <properties>
     <osgi-version>3.17.200</osgi-version>
     <osgi-services-version>3.10.200</osgi-services-version>
-    <osgi-util-version>3.6.100</osgi-util-version>
+    <osgi-util-version>3.7.1</osgi-util-version>
     <equinox-http-servlet-version>1.0.0-v20070606</equinox-http-servlet-version>
     <jacoco.skip>true</jacoco.skip>
   </properties>

From 764499a828989c7fc92314d062303e309437d3a9 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Thu, 7 Jul 2022 08:11:40 +1000
Subject: [PATCH 2/2] Add other dependencies introduced by
 org.eclipse.osgi.util upgrade

---
 jetty-osgi/pom.xml                            |  5 ++++
 jetty-osgi/test-jetty-osgi/pom.xml            | 30 +++++++++++++++++++
 .../eclipse/jetty/osgi/test/TestOSGiUtil.java |  5 ++++
 3 files changed, 40 insertions(+)

diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index c843fdb3b46c..f734131ba7d5 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -15,6 +15,11 @@
     <osgi-version>3.17.200</osgi-version>
     <osgi-services-version>3.10.200</osgi-services-version>
     <osgi-util-version>3.7.1</osgi-util-version>
+    <osgi-util-function-version>1.2.0</osgi-util-function-version>
+    <osgi-util-promise-version>1.2.0</osgi-util-promise-version>
+    <osgi-util-measurement-version>1.0.2</osgi-util-measurement-version>
+    <osgi-util-position-version>1.0.1</osgi-util-position-version>
+    <osgi-util-xml-version>1.0.2</osgi-util-xml-version>
     <equinox-http-servlet-version>1.0.0-v20070606</equinox-http-servlet-version>
     <jacoco.skip>true</jacoco.skip>
   </properties>
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 437843594a53..de642d78faf8 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -129,6 +129,36 @@
       <version>${osgi-util-version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.util.function</artifactId>
+      <version>${osgi-util-function-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.util.promise</artifactId>
+      <version>${osgi-util-promise-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.util.measurement</artifactId>
+      <version>${osgi-util-measurement-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.util.position</artifactId>
+      <version>${osgi-util-position-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.util.xml</artifactId>
+      <version>${osgi-util-xml-version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>jakarta.inject</groupId>
       <artifactId>jakarta.inject-api</artifactId>
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
index cee9f535723a..b92535da49b7 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
@@ -164,6 +164,11 @@ public static void coreJettyDependencies(List<Option> res)
         */
         res.add(mavenBundle().groupId("org.eclipse.jetty.toolchain").artifactId("jetty-servlet-api").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.platform").artifactId("org.eclipse.osgi.util").versionAsInProject());
+        res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.function").versionAsInProject());
+        res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.promise").versionAsInProject());
+        res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.measurement").versionAsInProject());
+        res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.position").versionAsInProject());
+        res.add(mavenBundle().groupId("org.osgi").artifactId("org.osgi.util.xml").versionAsInProject());
         res.add(mavenBundle().groupId("org.eclipse.platform").artifactId("org.eclipse.osgi.services").versionAsInProject());
         res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm-commons").versionAsInProject().start());