diff options
Diffstat (limited to 'jdisc_core_test')
38 files changed, 91 insertions, 77 deletions
diff --git a/jdisc_core_test/integration_test/pom.xml b/jdisc_core_test/integration_test/pom.xml index e31fa122232..b1cebcdfcc6 100644 --- a/jdisc_core_test/integration_test/pom.xml +++ b/jdisc_core_test/integration_test/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>integration-test-parent</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>integration_test</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>jar</packaging> <name>${project.artifactId}</name> <dependencies> @@ -243,8 +243,11 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <!-- Allow installing fragment bundles, see felix.framework:ExtensionManager.addExtensionBundle --> + <!-- java.lang + java.net are opened to avoid "WARNING: Illegal reflective access ... "--> + <!-- jdk.internal.loader is opened to allow installing extension bundles, see felix.framework:ExtensionManager.addExtensionBundle --> <argLine> + --add-opens=java.base/java.lang=ALL-UNNAMED + --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED </argLine> </configuration> diff --git a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/BundleActivatorIntegrationTest.java b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/BundleActivatorIntegrationTest.java index 03e56d7c26d..9450d2f26c1 100644 --- a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/BundleActivatorIntegrationTest.java +++ b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/application/BundleActivatorIntegrationTest.java @@ -7,6 +7,7 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -25,8 +26,12 @@ public class BundleActivatorIntegrationTest { Class<?> serviceClass = bundle.loadClass("com.yahoo.jdisc.bundle.my_act.MyService"); assertNotNull(serviceClass); BundleContext ctx = osgi.bundleContext(); - ServiceReference<?> serviceRef = ctx.getServiceReference(serviceClass.getName()); + + ServiceReference<?>[] serviceRefs = bundle.getRegisteredServices(); + assertEquals(1, serviceRefs.length); + ServiceReference<?> serviceRef = serviceRefs[0]; assertNotNull(serviceRef); + Object service = ctx.getService(serviceRef); assertNotNull(service); assertTrue(serviceClass.isInstance(service)); @@ -37,11 +42,16 @@ public class BundleActivatorIntegrationTest { public void requireThatApplicationBundleActivatorHasAccessToCurrentContainer() throws Exception { TestDriver driver = TestDriver.newApplicationBundleInstance("app-g-act.jar", false); OsgiFramework osgi = driver.osgiFramework(); - Class<?> serviceClass = osgi.bundles().get(1).loadClass("com.yahoo.jdisc.bundle.g_act.MyService"); + Bundle bundle = osgi.bundles().get(1); + Class<?> serviceClass = bundle.loadClass("com.yahoo.jdisc.bundle.g_act.MyService"); assertNotNull(serviceClass); BundleContext ctx = osgi.bundleContext(); - ServiceReference<?> serviceRef = ctx.getServiceReference(serviceClass.getName()); + + ServiceReference<?>[] serviceRefs = bundle.getRegisteredServices(); + assertEquals(1, serviceRefs.length); + ServiceReference<?> serviceRef = serviceRefs[0]; assertNotNull(serviceRef); + Object service = ctx.getService(serviceRef); assertNotNull(service); assertTrue(serviceClass.isInstance(service)); diff --git a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/ExportPackagesIntegrationTest.java b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/ExportPackagesIntegrationTest.java index c965bec8544..d2c1d3b5140 100644 --- a/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/ExportPackagesIntegrationTest.java +++ b/jdisc_core_test/integration_test/src/test/java/com/yahoo/jdisc/core/ExportPackagesIntegrationTest.java @@ -2,6 +2,7 @@ package com.yahoo.jdisc.core; import com.yahoo.jdisc.test.TestDriver; +import org.junit.Ignore; import org.junit.Test; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; @@ -17,6 +18,7 @@ import static org.junit.Assert.assertTrue; */ public class ExportPackagesIntegrationTest { + @Ignore // jdisc_core.jar cannot be installed as a bundle since Felix 6.0, due to exporting java.* packages. @Test public void requireThatManifestContainsExportPackage() throws BundleException { FelixFramework felix = TestDriver.newOsgiFramework(); diff --git a/jdisc_core_test/pom.xml b/jdisc_core_test/pom.xml index a0c2780570b..6fa2dd27b83 100644 --- a/jdisc_core_test/pom.xml +++ b/jdisc_core_test/pom.xml @@ -8,12 +8,12 @@ <parent> <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>integration-test-parent</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>pom</packaging> <name>${project.artifactId}</name> <modules> diff --git a/jdisc_core_test/test_bundles/app-a/pom.xml b/jdisc_core_test/test_bundles/app-a/pom.xml index 767ffb32784..a6f43e8a8a2 100644 --- a/jdisc_core_test/test_bundles/app-a/pom.xml +++ b/jdisc_core_test/test_bundles/app-a/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>app-a</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/app-b-priv/pom.xml b/jdisc_core_test/test_bundles/app-b-priv/pom.xml index b54a1fd56d8..94ead0ea2ec 100644 --- a/jdisc_core_test/test_bundles/app-b-priv/pom.xml +++ b/jdisc_core_test/test_bundles/app-b-priv/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>app-b-priv</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/app-ca/pom.xml b/jdisc_core_test/test_bundles/app-ca/pom.xml index 5b655dd003e..c77b75ae5cf 100644 --- a/jdisc_core_test/test_bundles/app-ca/pom.xml +++ b/jdisc_core_test/test_bundles/app-ca/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>app-ca</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <dependencies> diff --git a/jdisc_core_test/test_bundles/app-dj/pom.xml b/jdisc_core_test/test_bundles/app-dj/pom.xml index 64ed25e2ba2..6ff8165cdb6 100644 --- a/jdisc_core_test/test_bundles/app-dj/pom.xml +++ b/jdisc_core_test/test_bundles/app-dj/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>app-dj</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <dependencies> diff --git a/jdisc_core_test/test_bundles/app-ej-priv/pom.xml b/jdisc_core_test/test_bundles/app-ej-priv/pom.xml index 5e6fe9cd451..db7c05542b3 100644 --- a/jdisc_core_test/test_bundles/app-ej-priv/pom.xml +++ b/jdisc_core_test/test_bundles/app-ej-priv/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>app-ej-priv</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <dependencies> diff --git a/jdisc_core_test/test_bundles/app-f-more/pom.xml b/jdisc_core_test/test_bundles/app-f-more/pom.xml index b8995baf46d..886e0ccb758 100644 --- a/jdisc_core_test/test_bundles/app-f-more/pom.xml +++ b/jdisc_core_test/test_bundles/app-f-more/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>app-f-more</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/app-g-act/pom.xml b/jdisc_core_test/test_bundles/app-g-act/pom.xml index aaa740efade..929b337f48d 100644 --- a/jdisc_core_test/test_bundles/app-g-act/pom.xml +++ b/jdisc_core_test/test_bundles/app-g-act/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>app-g-act</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/app-h-log/pom.xml b/jdisc_core_test/test_bundles/app-h-log/pom.xml index 0092dd1a11f..2a9603151b3 100644 --- a/jdisc_core_test/test_bundles/app-h-log/pom.xml +++ b/jdisc_core_test/test_bundles/app-h-log/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>app-h-log</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/cert-a/pom.xml b/jdisc_core_test/test_bundles/cert-a/pom.xml index 05ce9d4b072..ec27fc0b005 100644 --- a/jdisc_core_test/test_bundles/cert-a/pom.xml +++ b/jdisc_core_test/test_bundles/cert-a/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-a</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/cert-b/pom.xml b/jdisc_core_test/test_bundles/cert-b/pom.xml index c634dda581a..dc9f06a33f0 100644 --- a/jdisc_core_test/test_bundles/cert-b/pom.xml +++ b/jdisc_core_test/test_bundles/cert-b/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-b</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>container-plugin</packaging> <name>${project.artifactId}</name> <build> @@ -21,7 +21,6 @@ <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> <configuration> - <!-- The Vespa bundle-plugin doesn't include groupId. TODO Vespa 7: remove if that is fixed. --> <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> </configuration> </plugin> diff --git a/jdisc_core_test/test_bundles/cert-ca/pom.xml b/jdisc_core_test/test_bundles/cert-ca/pom.xml index 313e26e9b98..d458105121e 100644 --- a/jdisc_core_test/test_bundles/cert-ca/pom.xml +++ b/jdisc_core_test/test_bundles/cert-ca/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-ca</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <dependencies> diff --git a/jdisc_core_test/test_bundles/cert-dc/pom.xml b/jdisc_core_test/test_bundles/cert-dc/pom.xml index a25356f368a..6fbd918eaef 100644 --- a/jdisc_core_test/test_bundles/cert-dc/pom.xml +++ b/jdisc_core_test/test_bundles/cert-dc/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-dc</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <dependencies> diff --git a/jdisc_core_test/test_bundles/cert-eab/pom.xml b/jdisc_core_test/test_bundles/cert-eab/pom.xml index d5747517c5f..6b0f5ba6028 100644 --- a/jdisc_core_test/test_bundles/cert-eab/pom.xml +++ b/jdisc_core_test/test_bundles/cert-eab/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-eab</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <dependencies> diff --git a/jdisc_core_test/test_bundles/cert-fac/pom.xml b/jdisc_core_test/test_bundles/cert-fac/pom.xml index e27a87aa04b..f6b14f1b6a1 100644 --- a/jdisc_core_test/test_bundles/cert-fac/pom.xml +++ b/jdisc_core_test/test_bundles/cert-fac/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-fac</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <dependencies> diff --git a/jdisc_core_test/test_bundles/cert-gg/pom.xml b/jdisc_core_test/test_bundles/cert-gg/pom.xml index 7295ef352d3..43ae2dc73c3 100644 --- a/jdisc_core_test/test_bundles/cert-gg/pom.xml +++ b/jdisc_core_test/test_bundles/cert-gg/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-gg</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/cert-hi/pom.xml b/jdisc_core_test/test_bundles/cert-hi/pom.xml index cafcc6d83d7..42b75cf96b6 100644 --- a/jdisc_core_test/test_bundles/cert-hi/pom.xml +++ b/jdisc_core_test/test_bundles/cert-hi/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-hi</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/cert-ih/pom.xml b/jdisc_core_test/test_bundles/cert-ih/pom.xml index 2fbebe9fb00..3df15c66fb5 100644 --- a/jdisc_core_test/test_bundles/cert-ih/pom.xml +++ b/jdisc_core_test/test_bundles/cert-ih/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-ih</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/cert-j-priv/pom.xml b/jdisc_core_test/test_bundles/cert-j-priv/pom.xml index c7770861e9f..e9ea8a8dac8 100644 --- a/jdisc_core_test/test_bundles/cert-j-priv/pom.xml +++ b/jdisc_core_test/test_bundles/cert-j-priv/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-j-priv</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml b/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml index 37e8469afdc..c3875cf48eb 100644 --- a/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml +++ b/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-k-pkgs</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/cert-l1/pom.xml b/jdisc_core_test/test_bundles/cert-l1/pom.xml index 156635687ae..a7c0367adcb 100644 --- a/jdisc_core_test/test_bundles/cert-l1/pom.xml +++ b/jdisc_core_test/test_bundles/cert-l1/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-l1</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/cert-l2/pom.xml b/jdisc_core_test/test_bundles/cert-l2/pom.xml index ba879d861f2..4749ad7a2fe 100644 --- a/jdisc_core_test/test_bundles/cert-l2/pom.xml +++ b/jdisc_core_test/test_bundles/cert-l2/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-l2</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/cert-ml/pom.xml b/jdisc_core_test/test_bundles/cert-ml/pom.xml index 133ce9807b8..1c6e3bcbc41 100644 --- a/jdisc_core_test/test_bundles/cert-ml/pom.xml +++ b/jdisc_core_test/test_bundles/cert-ml/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-ml</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/cert-nac/pom.xml b/jdisc_core_test/test_bundles/cert-nac/pom.xml index e2bfeee9494..6408a62d2eb 100644 --- a/jdisc_core_test/test_bundles/cert-nac/pom.xml +++ b/jdisc_core_test/test_bundles/cert-nac/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-nac</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <dependencies> diff --git a/jdisc_core_test/test_bundles/cert-oa-path/pom.xml b/jdisc_core_test/test_bundles/cert-oa-path/pom.xml index c019cd48889..1b5ba98fee5 100644 --- a/jdisc_core_test/test_bundles/cert-oa-path/pom.xml +++ b/jdisc_core_test/test_bundles/cert-oa-path/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-oa-path</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <dependencies> diff --git a/jdisc_core_test/test_bundles/cert-p-jar/pom.xml b/jdisc_core_test/test_bundles/cert-p-jar/pom.xml index 1cb585d2937..94a3f5c2322 100644 --- a/jdisc_core_test/test_bundles/cert-p-jar/pom.xml +++ b/jdisc_core_test/test_bundles/cert-p-jar/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-p-jar</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>jar</packaging> <name>${project.artifactId}</name> </project> diff --git a/jdisc_core_test/test_bundles/cert-q-frag/pom.xml b/jdisc_core_test/test_bundles/cert-q-frag/pom.xml index 4170438150c..a94b9a0c70a 100644 --- a/jdisc_core_test/test_bundles/cert-q-frag/pom.xml +++ b/jdisc_core_test/test_bundles/cert-q-frag/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-q-frag</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/cert-rq/pom.xml b/jdisc_core_test/test_bundles/cert-rq/pom.xml index 4f6cf36c87c..1d45e48ca46 100644 --- a/jdisc_core_test/test_bundles/cert-rq/pom.xml +++ b/jdisc_core_test/test_bundles/cert-rq/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-rq</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <dependencies> diff --git a/jdisc_core_test/test_bundles/cert-s-act/pom.xml b/jdisc_core_test/test_bundles/cert-s-act/pom.xml index c1a11c45055..47c7718be39 100644 --- a/jdisc_core_test/test_bundles/cert-s-act/pom.xml +++ b/jdisc_core_test/test_bundles/cert-s-act/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-s-act</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/cert-tp/pom.xml b/jdisc_core_test/test_bundles/cert-tp/pom.xml index 45278efeff8..4d4f84e245e 100644 --- a/jdisc_core_test/test_bundles/cert-tp/pom.xml +++ b/jdisc_core_test/test_bundles/cert-tp/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-tp</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <dependencies> diff --git a/jdisc_core_test/test_bundles/cert-us/pom.xml b/jdisc_core_test/test_bundles/cert-us/pom.xml index 059341d6505..33aad6fad95 100644 --- a/jdisc_core_test/test_bundles/cert-us/pom.xml +++ b/jdisc_core_test/test_bundles/cert-us/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>cert-us</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <dependencies> diff --git a/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml b/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml index 8931c26a73e..9b0693e4a30 100644 --- a/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml +++ b/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>my-bundle-activator</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/my-guice-module/pom.xml b/jdisc_core_test/test_bundles/my-guice-module/pom.xml index ed64d9d0525..a0321d6a3f9 100644 --- a/jdisc_core_test/test_bundles/my-guice-module/pom.xml +++ b/jdisc_core_test/test_bundles/my-guice-module/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>my-guice-module</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/my-server-provider/pom.xml b/jdisc_core_test/test_bundles/my-server-provider/pom.xml index d2a96b9953c..f83bbc69bec 100644 --- a/jdisc_core_test/test_bundles/my-server-provider/pom.xml +++ b/jdisc_core_test/test_bundles/my-server-provider/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>my-server-provider</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>bundle</packaging> <name>${project.artifactId}</name> <build> diff --git a/jdisc_core_test/test_bundles/pom.xml b/jdisc_core_test/test_bundles/pom.xml index a5887cacf3c..a8713fb4e41 100644 --- a/jdisc_core_test/test_bundles/pom.xml +++ b/jdisc_core_test/test_bundles/pom.xml @@ -8,10 +8,10 @@ <parent> <groupId>com.yahoo.vespa.jdisc_core</groupId> <artifactId>integration-test-parent</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> </parent> <artifactId>test_bundles</artifactId> - <version>6-SNAPSHOT</version> + <version>7-SNAPSHOT</version> <packaging>pom</packaging> <name>${project.artifactId}</name> <dependencies> |