diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2019-09-01 21:01:33 +0200 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2019-09-01 21:01:33 +0200 |
| commit | 316c190b1a1f2286400c882a37aaf27d2f970845 (patch) | |
| tree | 107a8172665bb10dad9eb43f5e0f18c45a5b0552 | |
| parent | d7c3dbe771aed0a71c49d7ba29051b8ce3b6777e (diff) | |
| download | archiva-316c190b1a1f2286400c882a37aaf27d2f970845.tar.gz archiva-316c190b1a1f2286400c882a37aaf27d2f970845.zip | |
Replacing jsr250 dependency by javax.annotations
9 files changed, 70 insertions, 11 deletions
diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 9c93b6094..5038d5909 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -136,7 +136,7 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> + <artifactId>javax.annotation-api</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml index 486a861de..94881bcb5 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml @@ -117,8 +117,8 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> + <artifactId>javax.annotation-api</artifactId> + <version>1.3.2</version> </dependency> <dependency> <groupId>org.springframework</groupId> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 1bf667e45..eb11316bf 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -66,6 +66,12 @@ <dependency> <groupId>org.apache.archiva.redback.components</groupId> <artifactId>spring-taskqueue</artifactId> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml index 529dc3be7..96f4fcef3 100644 --- a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml +++ b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml @@ -55,7 +55,7 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> + <artifactId>javax.annotation-api</artifactId> </dependency> <dependency> <groupId>org.apache.maven</groupId> diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml index 9e3132c5d..a50cbbd51 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml @@ -89,6 +89,12 @@ <dependency> <groupId>org.apache.archiva.redback.components</groupId> <artifactId>spring-taskqueue</artifactId> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.modelmapper</groupId> diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml index 558749b0e..7da9c8b2a 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml @@ -39,6 +39,12 @@ <dependency> <groupId>org.apache.archiva.redback.components</groupId> <artifactId>spring-taskqueue</artifactId> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </project> diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index 24a4ec8fa..ec5f6229a 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -192,6 +192,12 @@ <dependency> <groupId>org.apache.archiva.redback.components</groupId> <artifactId>spring-taskqueue</artifactId> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback.components</groupId> diff --git a/archiva-modules/metadata/metadata-repository-api/pom.xml b/archiva-modules/metadata/metadata-repository-api/pom.xml index af1af19ad..72d321526 100644 --- a/archiva-modules/metadata/metadata-repository-api/pom.xml +++ b/archiva-modules/metadata/metadata-repository-api/pom.xml @@ -42,7 +42,7 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> + <artifactId>javax.annotation-api</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -147,11 +147,7 @@ <artifactId>javax.inject</artifactId> <version>1</version> </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - </dependency> + <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> @@ -597,6 +593,10 @@ <groupId>org.sonatype.sisu</groupId> <artifactId>sisu-guice</artifactId> </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -996,12 +996,23 @@ <groupId>org.apache.archiva.redback.components</groupId> <artifactId>spring-taskqueue</artifactId> <version>${redback.taskqueue.version}</version> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback.components</groupId> <artifactId>spring-quartz</artifactId> <version>${redback.quartz.version}</version> - </dependency> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.quartz-scheduler</groupId> <artifactId>quartz</artifactId> @@ -1031,6 +1042,12 @@ <groupId>org.apache.archiva.redback.components.cache</groupId> <artifactId>spring-cache-api</artifactId> <version>${redback.cache.version}</version> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback.components.cache</groupId> @@ -1133,6 +1150,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1268,6 +1289,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </exclusion> </exclusions> </dependency> @@ -1277,6 +1302,12 @@ <groupId>org.apache.archiva.redback.components.registry</groupId> <artifactId>spring-registry-api</artifactId> <version>${redback.registry.version}</version> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva.redback.components.registry</groupId> @@ -1299,6 +1330,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> |