Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Jan Bartel 2021-09-13 10:16:39 +10:00
parent 7235418937 be27be49d2
commit 0a27d7aee3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-osgi/test-jetty-osgi/pom.xml
View File

@ -216,7 +216,7 @@
<dependency> <dependency>
<groupId>org.apache.aries.spifly</groupId> <groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId> <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
<version>1.3.3</version> <version>1.3.4</version>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>

2
pom.xml
View File

@ -41,7 +41,7 @@
<alpn.agent.version>2.0.10</alpn.agent.version> <alpn.agent.version>2.0.10</alpn.agent.version>
<hazelcast.version>4.2.2</hazelcast.version> <hazelcast.version>4.2.2</hazelcast.version>
<conscrypt.version>2.5.1</conscrypt.version> <conscrypt.version>2.5.1</conscrypt.version>
<asm.version>9.1</asm.version> <asm.version>9.2</asm.version>
<jmh.version>1.33</jmh.version> <jmh.version>1.33</jmh.version>
<jmhjar.name>benchmarks</jmhjar.name> <jmhjar.name>benchmarks</jmhjar.name>
<tycho-version>2.1.0</tycho-version> <tycho-version>2.1.0</tycho-version>