diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-09-24 16:15:12 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2021-09-28 11:33:50 +0200 |
| commit | ea9f0e18612581df41b56d934172a63fd55937ef (patch) | |
| tree | 4566f6c62b2d0f5270f368547aa1d9e9d23b0e57 /security-utils | |
| parent | 94c749a81d3148182d791d76787307a3786ee133 (diff) | |
Build security-utils with maven-bundle-plugin
.. to avoid depending on jdisc_core to get osgi imports.
Diffstat (limited to 'security-utils')
| -rw-r--r-- | security-utils/pom.xml | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/security-utils/pom.xml b/security-utils/pom.xml index 4796a809293..f47173541d1 100644 --- a/security-utils/pom.xml +++ b/security-utils/pom.xml @@ -9,7 +9,7 @@ <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>security-utils</artifactId> - <packaging>container-plugin</packaging> + <packaging>bundle</packaging> <version>7-SNAPSHOT</version> <properties> @@ -77,11 +77,6 @@ <build> <plugins> <plugin> - <groupId>com.yahoo.vespa</groupId> - <artifactId>bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> @@ -98,6 +93,34 @@ </compilerArgs> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>parse-version</id> + <goals> + <goal>parse-version</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <!-- Build with maven-bundle-plugin to avoid depending on jdisc_core to get the correct Import-Packages --> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Export-Package>com.yahoo.security.*;version=1.0.0;-noimport:=true</Export-Package> + <_nouses>true</_nouses> + </instructions> + </configuration> + </plugin> </plugins> </build> </project> |