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

Issue #5675 Update some osgi test dependencies #5676

Merged
merged 8 commits into from Dec 2, 2020
Merged

Issue #5675 Update some osgi test dependencies #5676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bdb4dd4
Issue #5675 Update some osgi test dependencies
janbartel Nov 16, 2020
c8af99e
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-56…
janbartel Nov 17, 2020
f911dbc
Issue #5675 update osgi platform version
janbartel Nov 23, 2020
e730c27
Issue 5675 Also update osgi services to newest version.
janbartel Nov 24, 2020
4aac7f0
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-56…
janbartel Nov 25, 2020
e45ab8a
Issue #5675 Make property for osgi utils.
janbartel Nov 25, 2020
21893bf
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-56…
janbartel Nov 30, 2020
7ad620a
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-56…
janbartel Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions jetty-osgi/jetty-osgi-boot-jsp/pom.xml
View file
Open in desktop
Expand Up @@ -23,11 +23,11 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
</dependency>
<!-- Servlet Deps -->
Expand Down
2 changes: 1 addition & 1 deletion jetty-osgi/jetty-osgi-boot-warurl/pom.xml
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
<artifactId>jetty-util</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
</dependencies>
Expand Down
7 changes: 4 additions & 3 deletions jetty-osgi/jetty-osgi-boot/pom.xml
View file
Open in desktop
Expand Up @@ -29,11 +29,11 @@
<artifactId>jetty-jmx</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
</dependency>
</dependencies>
Expand Down Expand Up @@ -81,7 +81,8 @@
javax.transaction.xa;version="1.1.0";resolution:=optional,
org.objectweb.asm;version="$(version;=;${asm.version})";resolution:=optional,
org.osgi.framework,
org.osgi.service.cm;version="1.2.0",
org.osgi.service.cm;version="1.4.0",
org.osgi.service.event;version="1.4.0",
joakime marked this conversation as resolved.
Show resolved Hide resolved
org.osgi.service.packageadmin,
org.osgi.service.startlevel;version="1.0.0",
org.osgi.service.url;version="1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion jetty-osgi/jetty-osgi-httpservice/pom.xml
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
<artifactId>servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<scope>provided</scope>
</dependency>
Expand Down
9 changes: 5 additions & 4 deletions jetty-osgi/pom.xml
View file
Open in desktop
Expand Up @@ -12,8 +12,9 @@
<packaging>pom</packaging>

<properties>
<osgi-version>3.6.0.v20100517</osgi-version>
<osgi-services-version>3.2.100.v20100503</osgi-services-version>
<osgi-version>3.16.0</osgi-version>
<osgi-services-version>3.9.0</osgi-services-version>
<osgi-util-version>3.5.300</osgi-util-version>
<equinox-http-servlet-version>1.0.0-v20070606</equinox-http-servlet-version>
</properties>

Expand Down Expand Up @@ -134,7 +135,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
<version>${osgi-services-version}</version>
<exclusions>
Expand All @@ -151,7 +152,7 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${osgi-version}</version>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions jetty-osgi/test-jetty-osgi-context/pom.xml
View file
Open in desktop
Expand Up @@ -18,12 +18,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
<scope>provided</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions jetty-osgi/test-jetty-osgi-server/pom.xml
View file
Open in desktop
Expand Up @@ -18,12 +18,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
<scope>provided</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions jetty-osgi/test-jetty-osgi-webapp/pom.xml
View file
Open in desktop
Expand Up @@ -18,12 +18,12 @@
<artifactId>jetty-webapp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
<scope>provided</scope>
</dependency>
Expand Down
78 changes: 66 additions & 12 deletions jetty-osgi/test-jetty-osgi/pom.xml
View file
Open in desktop
Expand Up @@ -14,7 +14,10 @@
<jetty-orbit-url>https://download.eclipse.org/jetty/orbit/</jetty-orbit-url>
<assembly-directory>target/distribution</assembly-directory>
<exam.version>4.13.1</exam.version>
<url.version>2.6.1</url.version>
<url.version>2.6.2</url.version>
<bnd.version>5.2.0</bnd.version>
<swissbox.version>1.8.3</swissbox.version>
<tinybundles.version>3.0.0</tinybundles.version>
<injection.bundle.version>1.2</injection.bundle.version>
</properties>
<dependencies>
Expand All @@ -37,17 +40,38 @@
<artifactId>pax-exam-container-forked</artifactId>
<version>${exam.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bndlib</artifactId>
</exclusion>
<exclusion>
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
<version>${tinybundles.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.swissbox</groupId>
<artifactId>pax-swissbox-framework</artifactId>
<version>1.8.3</version>
<version>${swissbox.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.ops4j.base</groupId>
<artifactId>ops4j-base-monitors</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.ops4j.pax.swissbox</groupId>
<artifactId>pax-swissbox-tracker</artifactId>
<version>1.8.3</version>
<version>${swissbox.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -71,13 +95,19 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
<version>2.6.1</version>
<version>${url.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bndlib</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bndlib</artifactId>
<version>2.4.0</version>
<artifactId>biz.aQute.bndlib</artifactId>
<version>${bnd.version}</version>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
Expand All @@ -88,13 +118,19 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.16.0</version>
<version>${osgi-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
<version>3.9.0</version>
<version>${osgi-services-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.util</artifactId>
<version>${osgi-util-version}</version>
<scope>test</scope>
</dependency>

Expand All @@ -106,11 +142,11 @@
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
</exclusion>
</exclusions>
Expand All @@ -122,11 +158,11 @@
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.osgi</groupId>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
</exclusion>
</exclusions>
Expand Down Expand Up @@ -432,6 +468,24 @@
<artifactId>asm-commons</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<scope>test</scope>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<scope>test</scope>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<scope>test</scope>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-client</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions ...t-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiAnnotationParser.java
View file
Open in desktop
Expand Up @@ -25,14 +25,12 @@
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.concurrent.ConcurrentHashMap;
import javax.inject.Inject;

import aQute.bnd.osgi.Constants;
import org.eclipse.jetty.annotations.ClassInheritanceHandler;
import org.eclipse.jetty.osgi.annotations.AnnotationParser;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
Expand All @@ -46,6 +44,8 @@

import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;


/**
* TestJettyOSGiAnnotationParser
*
Expand All @@ -64,8 +64,8 @@ public static Option[] configure()
options.add(TestOSGiUtil.optionalRemoteDebug());
options.add(CoreOptions.junitBundles());
options.addAll(TestOSGiUtil.coreJettyDependencies());
options.add(mavenBundle().groupId("biz.aQute.bnd").artifactId("bndlib").versionAsInProject().start());
options.add(mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").version("2.1.1").start());
options.add(mavenBundle().groupId("biz.aQute.bnd").artifactId("biz.aQute.bndlib").version("3.5.0").start());
joakime marked this conversation as resolved.
Show resolved Hide resolved
options.add(mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").versionAsInProject().start());
return options.toArray(new Option[options.size()]);
}

Expand Down
1 change: 0 additions & 1 deletion ...etty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
View file
Open in desktop
Expand Up @@ -18,7 +18,6 @@

package org.eclipse.jetty.osgi.test;

import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
Expand Down
5 changes: 3 additions & 2 deletions ...y-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
View file
Open in desktop
Expand Up @@ -93,8 +93,9 @@ public static List<Option> annotationDependencies()
public static List<Option> extraDependencies()
{
List<Option> res = new ArrayList<>();
res.add(mavenBundle().groupId("biz.aQute.bnd").artifactId("bndlib").versionAsInProject().start());
res.add(mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").version("2.1.1").start());
//Need an earlier version of bndlib because of tinybundles
res.add(mavenBundle().groupId("biz.aQute.bnd").artifactId("biz.aQute.bndlib").version("3.5.0").start());
joakime marked this conversation as resolved.
Show resolved Hide resolved
res.add(mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").versionAsInProject().start());
return res;
}

Expand Down
6 changes: 3 additions & 3 deletions ...jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiClasspathResources.java
View file
Open in desktop
Expand Up @@ -41,7 +41,6 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;

Expand Down Expand Up @@ -70,8 +69,9 @@ public static Option[] configure()
"com.sun.org.apache.xpath.internal.jaxp", "com.sun.org.apache.xpath.internal.objects"));

options.addAll(TestOSGiUtil.coreJettyDependencies());
options.add(mavenBundle().groupId("biz.aQute.bnd").artifactId("bndlib").versionAsInProject().start());
options.add(mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").version("2.1.1").start());
//Note: we have to back down the version of bnd used here because tinybundles expects only this version
options.add(mavenBundle().groupId("biz.aQute.bnd").artifactId("biz.aQute.bndlib").version("3.5.0").start());
joakime marked this conversation as resolved.
Show resolved Hide resolved
options.add(mavenBundle().groupId("org.ops4j.pax.tinybundles").artifactId("tinybundles").versionAsInProject().start());
options.add(mavenBundle().groupId("org.eclipse.jetty.osgi").artifactId("test-jetty-osgi-webapp-resources").type("war").versionAsInProject());
options.add(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(LOG_LEVEL));
options.add(systemProperty("org.eclipse.jetty.LEVEL").value(LOG_LEVEL));
Expand Down
2 changes: 2 additions & 0 deletions jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
View file
Open in desktop
Expand Up @@ -123,6 +123,8 @@ public static List<Option> coreJettyDependencies()
{
res.add(systemProperty("org.ops4j.pax.url.mvn.settings").value(System.getProperty("settingsFilePath")));
}
res.add(mavenBundle().groupId("org.eclipse.platform").artifactId("org.eclipse.osgi.util").versionAsInProject());
res.add(mavenBundle().groupId("org.eclipse.platform").artifactId("org.eclipse.osgi.services").versionAsInProject());
res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm").versionAsInProject().start());
res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm-commons").versionAsInProject().start());
res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm-tree").versionAsInProject().start());
Expand Down