diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-12 11:12:50 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-12 11:12:50 +0200 |
| commit | d613ea75051bfa6ed25129b5123ca43ee3642536 (patch) | |
| tree | c24f27b34b38b18ec11e3b8687618542639857c1 /security-utils/pom.xml | |
| parent | e65c9d4cc7d4950f309b50b8d5443e97188d6321 (diff) | |
Modules are no longer dependency of JDK8 based clients
Diffstat (limited to 'security-utils/pom.xml')
| -rw-r--r-- | security-utils/pom.xml | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/security-utils/pom.xml b/security-utils/pom.xml index d4b4bc8d0f6..c4e30a9f474 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>8-SNAPSHOT</version> <dependencies> @@ -20,6 +20,13 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <!-- Needed for bundle-plugin to generate import-package statements in OSGi manifest for javax packages --> + <groupId>com.yahoo.vespa</groupId> + <artifactId>jdisc_core</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> <!-- compile scope --> <dependency> @@ -71,37 +78,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <release>${vespaClients.jdk.releaseVersion}</release> - <showDeprecation>true</showDeprecation> - </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> + <groupId>com.yahoo.vespa</groupId> + <artifactId>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> |