This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git
commit 8c5c4c230f2c706c6c94d1157b1d7b223d96c558 Author: Martin Stockhammer <[email protected]> AuthorDate: Tue Dec 24 11:06:51 2019 +0100 Setting provided scope for java ee dependencies --- pom.xml | 61 ++++++++++++---------- .../redback-authentication-open/pom.xml | 2 +- .../redback-authentication-users/pom.xml | 10 ++++ .../redback-authorization-open/pom.xml | 2 +- .../redback-authorization-rbac/pom.xml | 12 ++++- redback-data-management/pom.xml | 8 ++- .../redback-common-integrations/pom.xml | 12 ++++- .../redback-rest/redback-rest-services/pom.xml | 16 +++--- redback-keys/redback-authentication-keys/pom.xml | 2 +- .../redback-keys-cached/pom.xml | 15 +++++- .../redback-keys-jpa/pom.xml | 15 +++++- .../redback-keys-memory/pom.xml | 2 +- .../redback-rbac-cached/pom.xml | 11 ++++ .../redback-rbac-ldap/pom.xml | 10 ++++ .../redback-rbac-memory/pom.xml | 10 ++++ redback-rbac/redback-rbac-role-manager/pom.xml | 10 ++++ redback-system/pom.xml | 17 ++++-- .../redback-users-cached/pom.xml | 23 ++++++++ .../redback-users-memory/pom.xml | 2 +- redback-users/redback-users-tests/pom.xml | 5 ++ 20 files changed, 195 insertions(+), 50 deletions(-) diff --git a/pom.xml b/pom.xml index 3b7fe0a..2780568 100644 --- a/pom.xml +++ b/pom.xml @@ -335,24 +335,7 @@ <artifactId>redback-common-configuration-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>javax.persistence-api</artifactId> - <version>2.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>javax.transaction-api</artifactId> - <version>1.3</version> - <scope>compile</scope> - </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> @@ -513,16 +496,7 @@ <artifactId>spring-orm</artifactId> <version>${springVersion}</version> </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - </dependency> + <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-rest-api</artifactId> @@ -672,20 +646,49 @@ <version>2.3.29</version> </dependency> - <!-- Dependencies for JDK >=9 update --> + <!-- Java EE Dependencies --> <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> <version>${javax.annotation.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>2.3.0</version> + <scope>provided</scope> </dependency> <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <version>2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <version>1.3</version> + <scope>provided</scope> + </dependency> + + + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>${commons-beanutils.version}</version> diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml b/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml index c90dfdc..0b84ce0 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml +++ b/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml @@ -44,7 +44,7 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> + <artifactId>javax.annotation-api</artifactId> </dependency> </dependencies> diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml b/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml index d5280b1..35616f1 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml +++ b/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml @@ -69,6 +69,16 @@ </dependency> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.archiva.components.registry</groupId> <artifactId>archiva-components-spring-registry-commons</artifactId> <scope>test</scope> diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml b/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml index cca4e34..4d779f8 100644 --- a/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml +++ b/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml @@ -44,7 +44,7 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> + <artifactId>javax.annotation-api</artifactId> </dependency> </dependencies> diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml index 4de7eb4..397ef92 100644 --- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml +++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml @@ -76,10 +76,20 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> + <artifactId>javax.annotation-api</artifactId> </dependency> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-users-cached</artifactId> <scope>test</scope> diff --git a/redback-data-management/pom.xml b/redback-data-management/pom.xml index 040827b..8b3d368 100644 --- a/redback-data-management/pom.xml +++ b/redback-data-management/pom.xml @@ -53,7 +53,7 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> + <artifactId>javax.annotation-api</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> @@ -85,7 +85,11 @@ <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> </dependency> - + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-launcher</artifactId> diff --git a/redback-integrations/redback-common-integrations/pom.xml b/redback-integrations/redback-common-integrations/pom.xml index d5dedd8..1b74845 100644 --- a/redback-integrations/redback-common-integrations/pom.xml +++ b/redback-integrations/redback-common-integrations/pom.xml @@ -128,7 +128,7 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> + <artifactId>javax.annotation-api</artifactId> </dependency> <dependency> @@ -136,6 +136,16 @@ <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>commons-collections</groupId> diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml index c17952f..0b271b8 100644 --- a/redback-integrations/redback-rest/redback-rest-services/pom.xml +++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml @@ -47,7 +47,7 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> + <artifactId>javax.annotation-api</artifactId> </dependency> <dependency> @@ -223,13 +223,17 @@ <scope>test</scope> </dependency> - <!-- Needed for JDK >= 9 --> + <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - <scope>test</scope> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <scope>provided</scope> </dependency> - <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> diff --git a/redback-keys/redback-authentication-keys/pom.xml b/redback-keys/redback-authentication-keys/pom.xml index 4d9686c..86749bb 100644 --- a/redback-keys/redback-authentication-keys/pom.xml +++ b/redback-keys/redback-authentication-keys/pom.xml @@ -53,7 +53,7 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> + <artifactId>javax.annotation-api</artifactId> </dependency> </dependencies> diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml b/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml index bafa46f..f310868 100644 --- a/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml +++ b/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml @@ -69,8 +69,19 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </dependency> + <artifactId>javax.annotation-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-keys-tests</artifactId> diff --git a/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml b/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml index 7c02c41..5bf8d7a 100644 --- a/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml +++ b/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml @@ -51,10 +51,23 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> + <artifactId>javax.annotation-api</artifactId> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> </dependency> <dependency> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-keys-tests</artifactId> <scope>test</scope> diff --git a/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml b/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml index cff8735..15d8727 100644 --- a/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml +++ b/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml @@ -48,7 +48,7 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> + <artifactId>javax.annotation-api</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml index 062c052..ef7e3a4 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml +++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml @@ -73,6 +73,17 @@ <scope>runtime</scope> </dependency> + + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml index 75f479c..ee3d323 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml +++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml @@ -99,6 +99,16 @@ </dependency> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <scope>test</scope> diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml index 8554eb1..4306da4 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml +++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml @@ -77,6 +77,16 @@ </dependency> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-rbac-jpa</artifactId> <scope>test</scope> diff --git a/redback-rbac/redback-rbac-role-manager/pom.xml b/redback-rbac/redback-rbac-role-manager/pom.xml index 9ab7ffc..2b18ecb 100644 --- a/redback-rbac/redback-rbac-role-manager/pom.xml +++ b/redback-rbac/redback-rbac-role-manager/pom.xml @@ -71,6 +71,16 @@ </dependency> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> <scope>test</scope> diff --git a/redback-system/pom.xml b/redback-system/pom.xml index 454f8c4..71ced08 100644 --- a/redback-system/pom.xml +++ b/redback-system/pom.xml @@ -69,14 +69,25 @@ <artifactId>spring-context-support</artifactId> </dependency> <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </dependency> + + <dependency> <groupId>org.apache.archiva.components.registry</groupId> <artifactId>archiva-components-spring-registry-commons</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-authentication-memory</artifactId> diff --git a/redback-users/redback-users-providers/redback-users-cached/pom.xml b/redback-users/redback-users-providers/redback-users-cached/pom.xml index 8bb1d79..5f29480 100644 --- a/redback-users/redback-users-providers/redback-users-cached/pom.xml +++ b/redback-users/redback-users-providers/redback-users-cached/pom.xml @@ -118,6 +118,29 @@ <artifactId>redback-users-memory</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>javax.persistence-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>javax.transaction-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> diff --git a/redback-users/redback-users-providers/redback-users-memory/pom.xml b/redback-users/redback-users-providers/redback-users-memory/pom.xml index 630e50b..7165d99 100644 --- a/redback-users/redback-users-providers/redback-users-memory/pom.xml +++ b/redback-users/redback-users-providers/redback-users-memory/pom.xml @@ -49,7 +49,7 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> + <artifactId>javax.annotation-api</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/redback-users/redback-users-tests/pom.xml b/redback-users/redback-users-tests/pom.xml index 12970bf..10ba7a0 100644 --- a/redback-users/redback-users-tests/pom.xml +++ b/redback-users/redback-users-tests/pom.xml @@ -65,6 +65,11 @@ <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> </dependency> + + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> </dependencies> </project>
