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/test-bundles | |
| 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/test-bundles')
| -rw-r--r-- | bundle-plugin-test/test-bundles/artifact-version-for-exports-dep/pom.xml | 16 | ||||
| -rw-r--r-- | bundle-plugin-test/test-bundles/artifact-version-for-exports/pom.xml | 2 |
2 files changed, 8 insertions, 10 deletions
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> |