diff options
| author | Jan Bartel | 2015-09-16 09:13:47 +0000 |
|---|---|---|
| committer | Jan Bartel | 2015-09-16 09:13:47 +0000 |
| commit | 03a601f2b246a278961203a4b183100156d44dc1 (patch) | |
| tree | cfee35a61e487eb0a5a3eddfe599bffb2bfd5fbe /jetty-osgi/test-jetty-osgi | |
| parent | edce119c0e8a9ca050cfc5fc7cca728586dbdb59 (diff) | |
| download | org.eclipse.jetty.project-03a601f2b246a278961203a4b183100156d44dc1.tar.gz org.eclipse.jetty.project-03a601f2b246a278961203a4b183100156d44dc1.tar.xz org.eclipse.jetty.project-03a601f2b246a278961203a4b183100156d44dc1.zip | |
477385 Make jetty osgi manifests only resolve jetty packages against a single distro version
Diffstat (limited to 'jetty-osgi/test-jetty-osgi')
| -rw-r--r-- | jetty-osgi/test-jetty-osgi/pom.xml | 1 | ||||
| -rw-r--r-- | jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 8d2304d1a5..4dbb0398d7 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -255,6 +255,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java index 19db6154cc..79d418bad2 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java @@ -96,10 +96,10 @@ public class TestJettyOSGiBootCore res.add(mavenBundle().groupId( "org.apache.geronimo.specs" ).artifactId( "geronimo-jta_1.1_spec" ).version("1.1.1").noStart()); res.add(mavenBundle().groupId( "org.eclipse.jetty.orbit" ).artifactId( "javax.mail.glassfish" ).version( "1.4.1.v201005082020" ).noStart()); + res.add(mavenBundle().groupId( "org.eclipse.jetty" ).artifactId( "jetty-util" ).versionAsInProject().noStart()); res.add(mavenBundle().groupId( "org.eclipse.jetty" ).artifactId( "jetty-deploy" ).versionAsInProject().noStart()); res.add(mavenBundle().groupId( "org.eclipse.jetty" ).artifactId( "jetty-server" ).versionAsInProject().noStart()); res.add(mavenBundle().groupId( "org.eclipse.jetty" ).artifactId( "jetty-servlet" ).versionAsInProject().noStart()); - res.add(mavenBundle().groupId( "org.eclipse.jetty" ).artifactId( "jetty-util" ).versionAsInProject().noStart()); res.add(mavenBundle().groupId( "org.eclipse.jetty" ).artifactId( "jetty-http" ).versionAsInProject().noStart()); res.add(mavenBundle().groupId( "org.eclipse.jetty" ).artifactId( "jetty-xml" ).versionAsInProject().noStart()); res.add(mavenBundle().groupId( "org.eclipse.jetty" ).artifactId( "jetty-webapp" ).versionAsInProject().noStart()); |