diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2019-01-20 22:20:25 +0100 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2019-01-20 22:20:25 +0100 |
| commit | 3da7b8ff94f5a15736bf07767f069863b3504ecc (patch) | |
| tree | 160a632825a4f6ac4c18f179f794b282452bcfe7 /archiva-modules | |
| parent | 4c2c8f02b6295310e68638acccff3d13ae6e8d93 (diff) | |
| download | archiva-3da7b8ff94f5a15736bf07767f069863b3504ecc.tar.gz archiva-3da7b8ff94f5a15736bf07767f069863b3504ecc.zip | |
Adding jabx dependency for JDK11
The dependency is needed by enunciate plugin. It is not sufficient to add it as plugin dependency.
Using profile for selecting JDK9+ only and adding it as 'provided' scope.
Diffstat (limited to 'archiva-modules')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml | 23 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/pom.xml | 23 |
2 files changed, 46 insertions, 0 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml index e4ee61e5a..e2daaab12 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml @@ -110,4 +110,27 @@ </plugins> </build> + <!-- + The jaxb dependency is needed by the enunciate plugin starting with JDK9. + Adding to the plugin dependency is not sufficient, so I have to add it as project dependency. + Using provided scope to avoid adding it to packaging. + --> + <profiles> + <profile> + <id>jdk9+</id> + <activation> + <jdk>[1.9,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.0</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> + + </project> diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index f7b86786c..24a4ec8fa 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -491,4 +491,27 @@ </plugins> </build> + <!-- + The jaxb dependency is needed by the enunciate plugin starting with JDK9. + Adding to the plugin dependency is not sufficient, so I have to add it as project dependency. + Using provided scope to avoid adding it to packaging. + --> + <profiles> + <profile> + <id>jdk9+</id> + <activation> + <jdk>[1.9,)</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.0</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> + + </project> |