Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OSGi example bundle fix #3

Merged
merged 1 commit into from
Jul 21, 2021
Merged

OSGi example bundle fix #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions examples/osgi-http-service/functional-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,19 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.http</artifactId>
<version>1.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
<scope>test</scope>
</dependency>


<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -200,6 +213,16 @@
<goals>
<goal>test</goal>
</goals>
<configuration>
<excludes>
<!--
excluded due to javax.servlet-api collision -
more than one version is required, so it is not possible to execute that test.
(since pax-exam version 4.13.4)
-->
<exclude>org.glassfish.jersey.examples.osgihttpservice.test.GrizzlyHttpServiceFelixTest</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
4 changes: 3 additions & 1 deletion ...st/java/org/glassfish/jersey/examples/osgihttpservice/test/JettyHttpServiceFelixTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -27,6 +27,8 @@ public class JettyHttpServiceFelixTest extends AbstractHttpServiceTest {
@Override
public List<Option> osgiRuntimeOptions() {
return Arrays.asList(CoreOptions.options(
mavenBundle().groupId("org.osgi").artifactId("org.osgi.service.http").versionAsInProject(),
mavenBundle().groupId("org.osgi").artifactId("org.osgi.service.cm").versionAsInProject(),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.eventadmin").versionAsInProject()
));
}
Expand Down