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

Jump to bottom

Update hk2 osgi-resource-locator to latest 1.0.3 version #4079

Merged
merged 1 commit into from
Apr 11, 2019
Merged

Update hk2 osgi-resource-locator to latest 1.0.3 version #4079

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
10 changes: 6 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,7 +1439,7 @@
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>osgi-resource-locator</artifactId>
<version>1.0.1</version>
<version>1.0.3</version>
</dependency>
<dependency>
<groupId>org.glassfish.main.hk2</groupId>
Expand Down Expand Up @@ -1675,7 +1675,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${osgi.version}</version>
<version>${osgi.compendium.version}</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -1891,7 +1891,8 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>4.2.1</version>
<!--5.2.0+ does not work with moxy osgi functional tests-->
<version>5.0.1</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -2026,7 +2027,8 @@
<mustache.version>0.8.17</mustache.version>
<netty.version>4.1.5.Final</netty.version>
<opentracing.version>0.30.0</opentracing.version>
<osgi.version>4.2.0</osgi.version>
<osgi.version>6.0.0</osgi.version>
<osgi.compendium.version>5.0.0</osgi.compendium.version>
<pax.exam.version>4.9.1</pax.exam.version>
<pax.web.version>0.7.4</pax.web.version><!-- TODO: UPGRADE! -->
<paxexam.mvn.plugin.version>1.2.4</paxexam.mvn.plugin.version>
Expand Down
7 changes: 5 additions & 2 deletions .../osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonJettisonTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -26,6 +26,7 @@

import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.Configuration;
import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackage;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemPackage;

Expand All @@ -40,11 +41,13 @@ public static Option[] configuration() {

options.addAll(Helper.getCommonOsgiOptions());
options.addAll(Helper.expandedList(
bootDelegationPackage("javax.xml.bind"),
bootDelegationPackage("javax.xml.bind.*"),
// jersey-json dependencies
mavenBundle().groupId("org.glassfish.jersey.media").artifactId("jersey-media-json-jettison").versionAsInProject(),
mavenBundle().groupId("org.codehaus.jettison").artifactId("jettison").versionAsInProject(),
//SUN JAXB IMPL OSGI
mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject().versionAsInProject(),
mavenBundle().groupId("com.sun.xml.bind").artifactId("jaxb-osgi").versionAsInProject(),
systemPackage("com.sun.source.tree"),
systemPackage("com.sun.source.util")
));
Expand Down
5 changes: 4 additions & 1 deletion ...functional/src/test/java/org/glassfish/jersey/osgi/test/basic/WebResourceFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -48,6 +48,7 @@
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
import static org.junit.Assert.assertEquals;
import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackage;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemPackage;

Expand All @@ -69,6 +70,8 @@ public static Option[] configuration() {
List<Option> options = Helper.getCommonOsgiOptions();

options.addAll(Helper.expandedList(
bootDelegationPackage("javax.xml.bind"),
bootDelegationPackage("javax.xml.bind.*"),
// jersey-multipart dependencies
mavenBundle().groupId("org.glassfish.jersey.ext").artifactId("jersey-proxy-client").versionAsInProject(),
//SUN JAXB IMPL OSGI
Expand Down