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.git
commit befb43799ebf958241e69b75b00835994f40fa7d Author: Martin Stockhammer <[email protected]> AuthorDate: Sat Jan 2 11:26:11 2021 +0100 Switching to alias definition for test bean --- .../consumers/lucene/test/TestRBACManager.java | 2 +- .../src/test/resources/spring-context.xml | 1 + .../resources/archiva/openapi-configuration.yaml | 41 ++++++++++++++++++++++ .../src/main/resources/openapi-configuration.yaml | 16 --------- 4 files changed, 43 insertions(+), 17 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java index a74d5bc..eddbd1f 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java @@ -38,7 +38,7 @@ import java.util.Set; /** * @author Olivier Lamy */ -@Service("rbacManager#cached") +@Service("rbacManager#test") public class TestRBACManager implements RBACManager { diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/test/resources/spring-context.xml index 8fb55e1..9ee68d1 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/src/test/resources/spring-context.xml @@ -58,6 +58,7 @@ </bean> <alias name="roleManager#test" alias="roleManager"/> + <alias name="rbacManager#test" alias="rbacManager#cached" /> <!-- <bean id="jcr-config" class="org.apache.archiva.metadata.repository.jcr.ArchivaJcrRepositoryConfig" factory-method="create"> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/resources/archiva/openapi-configuration.yaml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/resources/archiva/openapi-configuration.yaml new file mode 100644 index 0000000..7ddbdb9 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/resources/archiva/openapi-configuration.yaml @@ -0,0 +1,41 @@ +resourcePackages: + - org.apache.archiva.rest.api.services.v2 + - org.apache.archiva.rest.api.model.v2 + +prettyPrint: true +cacheTTL: 0 +openAPI: + components: + securitySchemes: + BearerAuth: + type: http + scheme: bearer + bearerFormat: JWT + BasicAuth: + type: http + scheme: basic + + servers: + - url: /archiva/api/v2/archiva + description: Base URL Version 2 API + - url: /archiva/archivaServices + description: Base URL Version 1 API (deprecated) + tags: + - name: v2 + description: Version 2 REST API + - name: v2/Security + description: Authentication operations for Login and token refresh + - name: v1 + description: Version 1 REST API (deprecated) + + info: + version: '3.0' + title: Apache Archiva REST API + description: 'This is the Apache Archiva REST API documentation' + termsOfService: https://archiva.apache.org + contact: + email: [email protected] + url: https://archiva.apache.org/index.html + license: + name: Apache 2.0 + url: http://www.apache.org/licenses/LICENSE-2.0.html \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/resources/openapi-configuration.yaml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/resources/openapi-configuration.yaml deleted file mode 100644 index 80917c9..0000000 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/resources/openapi-configuration.yaml +++ /dev/null @@ -1,16 +0,0 @@ -resourcePackages: - - org.apache.archiva.rest.api -prettyPrint: true -cacheTTL: 0 -openAPI: - info: - version: '3.0' - title: Apache Archiva REST API - description: 'This is the Apache Archiva REST API documentation' - termsOfService: https://archiva.apache.org - contact: - email: [email protected] - url: https://archiva.apache.org/index.html - license: - name: Apache 2.0 - url: http://www.apache.org/licenses/LICENSE-2.0.html \ No newline at end of file
