diff options
| -rw-r--r-- | config-lib/pom.xml | 26 | ||||
| -rw-r--r-- | configgen/pom.xml | 32 | ||||
| -rw-r--r-- | container-disc/pom.xml | 1 |
3 files changed, 34 insertions, 25 deletions
diff --git a/config-lib/pom.xml b/config-lib/pom.xml index bc11f0ab874..90c61725466 100644 --- a/config-lib/pom.xml +++ b/config-lib/pom.xml @@ -30,6 +30,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>configgen</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> </dependencies> <build> @@ -73,31 +74,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>abi-check-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <configuration> - <finalName>${project.artifactId}-jar-with-dependencies</finalName> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <manifestEntries> - <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <Import-Package> - com.yahoo.config.codegen<!-- TODO: Remove when the model of config def, which today is InnerCNode in codegen :-(, is moved to config-lib --> - </Import-Package> - </manifestEntries> - </transformer> - </transformers> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </project> diff --git a/configgen/pom.xml b/configgen/pom.xml index 7d316061a99..a335e345234 100644 --- a/configgen/pom.xml +++ b/configgen/pom.xml @@ -52,6 +52,38 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> </plugin> + <plugin> + <!-- Add headers making this an OSGi bundle (cannot use bundle plugin as this is needed at bootstrap). + This is needed because the model of config definitions is part of codegen but needed by modules + doing generic access over config. + --> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <configuration> + <finalName>${project.artifactId}</finalName> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <manifestEntries> + <Export-Package>com.yahoo.config.codegen</Export-Package> + <Bundle-ManifestVersion>2</Bundle-ManifestVersion> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + <Bundle-Version>7.0.0</Bundle-Version> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-Vendor>Yahoo!</Bundle-Vendor> + <Bundle-ClassPath>.</Bundle-ClassPath> + </manifestEntries> + </transformer> + </transformers> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 413af786f2c..399686bd9cc 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -190,6 +190,7 @@ <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle> <discPreInstallBundle> <!-- Vespa bundles --> + configgen.jar, config-bundle-jar-with-dependencies.jar, configdefinitions-jar-with-dependencies.jar, container-jersey2-jar-with-dependencies.jar, |