diff options
| author | Olivier Lamy <olamy@apache.org> | 2022-06-06 09:46:02 +1000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2022-06-06 09:46:02 +1000 |
| commit | f150f4204209f7e1ab7e998e321e5a03dcfe9dce (patch) | |
| tree | 0a8c81c69c774e7c42afc8027802297b3d07596a /archiva-modules/archiva-web | |
| parent | 235196f4717ec1fd45deced895862c196a1f1821 (diff) | |
| download | archiva-f150f4204209f7e1ab7e998e321e5a03dcfe9dce.tar.gz archiva-f150f4204209f7e1ab7e998e321e5a03dcfe9dce.zip | |
fix upperbound and jdk 11 build
Signed-off-by: Olivier Lamy <olamy@apache.org>
Diffstat (limited to 'archiva-modules/archiva-web')
3 files changed, 25 insertions, 2 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 eeed333a3..fbc01e61f 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 @@ -154,7 +154,7 @@ <dependencies> <dependency> <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> </dependencies> </profile> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index 16f4d02bf..2fd158e24 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -564,4 +564,27 @@ </plugins> </build> + <profiles> + <profile> + <id>jdk9+</id> + <activation> + <jdk>[1.9,)</jdk> + </activation> + <dependencies> + <!-- Needed for JDK >= 9 --> + <dependency> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <scope>test</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 dc73e13a5..e44ea64d8 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -611,7 +611,7 @@ <dependencies> <dependency> <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> </dependencies> </profile> |