Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.osgi-org.osgi.util.promise-1.3.0' into fix/10.0.x/dependency-rollup-2024-jan

# Conflicts:
#	pom.xml
This commit is contained in:
Joakim Erdfelt 2024-01-01 11:33:38 -06:00
commit fb36831f71
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
1 changed files with 1 additions and 1 deletions

View File

@ -112,7 +112,7 @@
<org.osgi.annotation.version>8.1.0</org.osgi.annotation.version> <org.osgi.annotation.version>8.1.0</org.osgi.annotation.version>
<org.osgi.core.version>6.0.0</org.osgi.core.version> <org.osgi.core.version>6.0.0</org.osgi.core.version>
<org.osgi.util.function.version>1.2.0</org.osgi.util.function.version> <org.osgi.util.function.version>1.2.0</org.osgi.util.function.version>
<org.osgi.util.promise.version>1.2.0</org.osgi.util.promise.version> <org.osgi.util.promise.version>1.3.0</org.osgi.util.promise.version>
<plexus-component-annotations.version>2.2.0</plexus-component-annotations.version> <plexus-component-annotations.version>2.2.0</plexus-component-annotations.version>
<plexus-utils.version>4.0.0</plexus-utils.version> <plexus-utils.version>4.0.0</plexus-utils.version>
<plexus-xml.version>4.0.3</plexus-xml.version> <plexus-xml.version>4.0.3</plexus-xml.version>