diff options
| -rw-r--r-- | http-utils/pom.xml | 4 | ||||
| -rw-r--r-- | security-utils/pom.xml | 39 |
2 files changed, 33 insertions, 10 deletions
diff --git a/http-utils/pom.xml b/http-utils/pom.xml index 5b26235b62e..52dac0cfeea 100644 --- a/http-utils/pom.xml +++ b/http-utils/pom.xml @@ -66,6 +66,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <release>${vespaClients.jdk.releaseVersion}</release> + <showDeprecation>true</showDeprecation> + </configuration> </plugin> </plugins> </build> diff --git a/security-utils/pom.xml b/security-utils/pom.xml index c4e30a9f474..d4b4bc8d0f6 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>8-SNAPSHOT</version> <dependencies> @@ -20,13 +20,6 @@ <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> @@ -78,11 +71,37 @@ <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> - <groupId>com.yahoo.vespa</groupId> - <artifactId>bundle-plugin</artifactId> + <!-- 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> |