Bump org.apache.aries.spifly.dynamic.bundle from 1.3.4 to 1.3.5 (#7877)

* Bump org.apache.aries.spifly.dynamic.bundle from 1.3.4 to 1.3.5

Bumps org.apache.aries.spifly.dynamic.bundle from 1.3.4 to 1.3.5.

---
updated-dependencies:
- dependency-name: org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump org.apache.aries.spifly.dynamic.bundle from 1.3.4 to 1.3.5 (#7878)

* Bump org.apache.aries.spifly.dynamic.bundle from 1.3.4 to 1.3.5
* Fixing dependency upper bounds
* Remove wrapping of conscrypt jar as it now has appropriate manifest.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
This commit is contained in:
dependabot[bot] 2022-05-05 15:21:25 -05:00 committed by GitHub
parent 92070e83dd
commit ebd82035fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 8 deletions

View File

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

View File

@ -45,7 +45,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
@ -89,11 +88,7 @@ public class TestJettyOSGiBootHTTP2Conscrypt
res.add(CoreOptions.systemProperty("jetty.alpn.protocols").value("h2,http/1.1"));
res.add(CoreOptions.systemProperty("jetty.sslContext.provider").value("Conscrypt"));
res.add(wrappedBundle(mavenBundle().groupId("org.conscrypt").artifactId("conscrypt-openjdk-uber").versionAsInProject())
.imports("javax.net.ssl,*")
.exports("org.conscrypt;version=" + System.getProperty("conscrypt-version"))
.instructions("Bundle-NativeCode=META-INF/native/libconscrypt_openjdk_jni-linux-x86_64.so")
.start());
res.add(mavenBundle().groupId("org.conscrypt").artifactId("conscrypt-openjdk-uber").versionAsInProject().start());
res.add(mavenBundle().groupId("org.eclipse.jetty.osgi").artifactId("jetty-osgi-alpn").versionAsInProject().noStart());
res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-conscrypt-server").versionAsInProject().start());
res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-server").versionAsInProject().start());

21
pom.xml
View File

@ -32,7 +32,7 @@
<asciidoctorj.version>2.5.3</asciidoctorj.version>
<asm.version>9.3</asm.version>
<awaitility.version>4.2.0</awaitility.version>
<bndlib.version>5.3.0</bndlib.version>
<bndlib.version>6.2.0</bndlib.version>
<build-support.version>1.5</build-support.version>
<checkstyle.version>10.2</checkstyle.version>
<commons-codec.version>1.15</commons-codec.version>
@ -113,6 +113,8 @@
<openpojo.version>0.9.1</openpojo.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.util.function.version>1.2.0</org.osgi.util.function.version>
<org.osgi.util.promise.version>1.2.0</org.osgi.util.promise.version>
<plexus-component-annotations.version>2.1.1</plexus-component-annotations.version>
<plexus-utils.version>3.4.1</plexus-utils.version>
<slf4j.version>2.0.0-alpha6</slf4j.version>
@ -1965,14 +1967,31 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<!-- older artifact location, some of our transitive deps still use this coordinate -->
<artifactId>org.osgi.core</artifactId>
<version>${org.osgi.core.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<!-- newer artifact location, some of our transitive deps use this up to date coordinate -->
<artifactId>osgi.core</artifactId>
<version>${org.osgi.core.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
<version>${org.osgi.annotation.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.function</artifactId>
<version>${org.osgi.util.function.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
<version>${org.osgi.util.promise.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>