diff options
author | gjoranv <gv@verizonmedia.com> | 2019-10-22 16:46:47 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-10-23 12:26:58 +0200 |
commit | 3f98c0cea7437fc55721f6e18025a0047b27d47f (patch) | |
tree | 726f71192a3772bcd3b12592bde9dcb7ddb7571b /bundle-plugin-test | |
parent | f5115c2bfcf97f90fbc9db1d04f6eb92ccea4e75 (diff) |
Use project.version also for the dependency test bundle.
- The automated build process updates the project version for all
modules.
- Unfortunately, this reduces the value of one of the test cases,
because the versions of the dependent and dependency bundles are
now the same.
Diffstat (limited to 'bundle-plugin-test')
3 files changed, 15 insertions, 13 deletions
diff --git a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/ExportPackageVersionTest.java b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/ExportPackageVersionTest.java index 46f8dd61576..66f36e32f39 100644 --- a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/ExportPackageVersionTest.java +++ b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/ExportPackageVersionTest.java @@ -22,12 +22,15 @@ import static org.junit.Assert.assertThat; public class ExportPackageVersionTest { private static Attributes mainAttributes; + private static String bundleVersion; @BeforeClass public static void setup() { try { File componentJar = findBundleJar("artifact-version-for-exports"); mainAttributes = new JarFile(componentJar).getManifest().getMainAttributes(); + bundleVersion = mainAttributes.getValue("Bundle-Version"); + } catch (IOException e) { throw new RuntimeException(e); } @@ -36,7 +39,6 @@ public class ExportPackageVersionTest { @Test public void artifact_version_without_qualifier_is_used_as_export_version() { // Bundle-Version is artifact version without qualifier - String bundleVersion = mainAttributes.getValue("Bundle-Version"); String expectedExport = "ai.vespa.noversion;version=" + bundleVersion; String exportPackage = mainAttributes.getValue("Export-Package"); @@ -55,8 +57,10 @@ public class ExportPackageVersionTest { @Test public void artifact_version_of_dependency_is_used_as_export_version_for_package_in_compile_scoped_dependency() { String exportPackage = mainAttributes.getValue("Export-Package"); - // Verify against the artifact version from the test bundle's pom. - assertThat(exportPackage, containsString("ai.vespa.noversion_dep;version=3.2.1")); + + // TODO: This test should have checked for a fixed version of the dependency bundle, different than the main bundle version. + // See comment in the dependency bundle's pom.xml for why this is not the case. + assertThat(exportPackage, containsString("ai.vespa.noversion_dep;version=" + bundleVersion)); } @Test diff --git a/bundle-plugin-test/test-bundles/artifact-version-for-exports-dep/pom.xml b/bundle-plugin-test/test-bundles/artifact-version-for-exports-dep/pom.xml index e958618472b..34b250ae927 100644 --- a/bundle-plugin-test/test-bundles/artifact-version-for-exports-dep/pom.xml +++ b/bundle-plugin-test/test-bundles/artifact-version-for-exports-dep/pom.xml @@ -12,26 +12,24 @@ <relativePath>../pom.xml</relativePath> </parent> <artifactId>artifact-version-for-exports-dep</artifactId> - <version>3.2.1</version> + <!-- TODO: Should use a fixed version different than the dependent bundle. + But version is set to the release version by build scripts before building. + Then, the dependent bundle will not find the artifact. Skipping this step for a sub-module seems + impossible with the maven-versions-plugin, and cumbersome with factorylib. --> + <version>7-SNAPSHOT</version> <packaging>container-plugin</packaging> <dependencies> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-dev</artifactId> - <version>${project.parent.version}</version> - <scope>provided</scope> - </dependency> </dependencies> <build> <plugins> <plugin> <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin</artifactId> - <version>${project.parent.version}</version> + <version>${project.version}</version> <extensions>true</extensions> <configuration> <useArtifactVersionForExportPackages>true</useArtifactVersionForExportPackages> - <configGenVersion>${project.parent.version}</configGenVersion> + <configGenVersion>${project.version}</configGenVersion> </configuration> </plugin> </plugins> diff --git a/bundle-plugin-test/test-bundles/artifact-version-for-exports/pom.xml b/bundle-plugin-test/test-bundles/artifact-version-for-exports/pom.xml index ac7263c8846..619189cd874 100644 --- a/bundle-plugin-test/test-bundles/artifact-version-for-exports/pom.xml +++ b/bundle-plugin-test/test-bundles/artifact-version-for-exports/pom.xml @@ -18,7 +18,7 @@ <dependency> <groupId>com.yahoo.vespa.bundle-plugin</groupId> <artifactId>artifact-version-for-exports-dep</artifactId> - <version>3.2.1</version> + <version>${project.version}</version> </dependency> </dependencies> <build> |