diff options
Diffstat (limited to 'archiva-modules/archiva-maven')
| -rw-r--r-- | archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml | 25 | ||||
| -rw-r--r-- | archiva-modules/archiva-maven/archiva-maven-repository/pom.xml | 24 |
2 files changed, 4 insertions, 45 deletions
diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml index 841ef71b5..cab879352 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml @@ -123,7 +123,10 @@ <groupId>jakarta.annotation</groupId> <artifactId>jakarta.annotation-api</artifactId> </dependency> - + <dependency> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> @@ -253,24 +256,4 @@ </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>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> - </project> diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml index 71d3efed2..7be138c84 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml @@ -113,8 +113,6 @@ <artifactId>archiva-repository-admin-api</artifactId> </dependency> - - <dependency> <groupId>jakarta.annotation</groupId> <artifactId>jakarta.annotation-api</artifactId> @@ -367,26 +365,4 @@ </pluginManagement> </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> |