diff options
| author | Håkon Hallingstad <hakon.hallingstad@gmail.com> | 2021-09-28 13:34:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-28 13:34:19 +0200 |
| commit | 627604b44f88c1aca2661d06b0d7e6b2f8cf5ba4 (patch) | |
| tree | 43fb3d47d05eaf904c303db1fb3beee76a653594 /security-utils/pom.xml | |
| parent | 3e0bb5b34c0c0868b641ab338698bd14e8b64d04 (diff) | |
Revert "Build security utils with maven bundle plugin"
Diffstat (limited to 'security-utils/pom.xml')
| -rw-r--r-- | security-utils/pom.xml | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/security-utils/pom.xml b/security-utils/pom.xml index 567174df102..4796a809293 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>bundle</packaging> + <packaging>container-plugin</packaging> <version>7-SNAPSHOT</version> <properties> @@ -26,6 +26,13 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <!-- required for bundle-plugin to generate import-package statements for Java's standard library --> + <groupId>com.yahoo.vespa</groupId> + <artifactId>jdisc_core</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> <!-- compile scope --> <dependency> @@ -70,6 +77,11 @@ <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> @@ -86,33 +98,6 @@ </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> - <Export-Package>com.yahoo.security.*;version=1.0.0;-noimport:=true</Export-Package> - <_nouses>true</_nouses> <!-- Don't include 'uses' directives for package exports --> - <_fixupmessages>"Classes found in the wrong directory"</_fixupmessages> <!-- Hide warnings for bouncycastle multi-release jars --> - </instructions> - </configuration> - </plugin> </plugins> </build> </project> |