diff options
Diffstat (limited to 'archiva-modules/metadata')
4 files changed, 33 insertions, 12 deletions
diff --git a/archiva-modules/metadata/metadata-repository-api/pom.xml b/archiva-modules/metadata/metadata-repository-api/pom.xml index 192652919..0a360d532 100644 --- a/archiva-modules/metadata/metadata-repository-api/pom.xml +++ b/archiva-modules/metadata/metadata-repository-api/pom.xml @@ -71,8 +71,8 @@ </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> </dependency> <dependency> diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml index 364ce76f5..fa58650f4 100644 --- a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml +++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml @@ -80,12 +80,12 @@ <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> </dependency> <dependency> @@ -143,6 +143,15 @@ <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> </exclusion> + <exclusion> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </exclusion> + <exclusion> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + </exclusion> + </exclusions> </dependency> @@ -189,6 +198,12 @@ <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> <version>0.13.0</version> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <!-- <dependency> @@ -220,6 +235,12 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> <version>4.3.2.Final</version> + <exclusions> + <exclusion> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + </exclusion> + </exclusions> </dependency> diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-file/pom.xml b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/pom.xml index 573b7d320..f35811d38 100644 --- a/archiva-modules/metadata/metadata-store-provider/metadata-store-file/pom.xml +++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/pom.xml @@ -59,8 +59,8 @@ <artifactId>spring-context</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/pom.xml b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/pom.xml index 22cd0c659..0a5ff5ade 100644 --- a/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/pom.xml +++ b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/pom.xml @@ -169,12 +169,12 @@ <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> </dependency> <dependency> |