Switching to alias definition for test bean

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 a74d5bc8c..eddbd1f14 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 8fb55e1b1..9ee68d1fa 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 000000000..7ddbdb92e
--- /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: users@archiva.apache.org
+      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 80917c951..000000000
--- 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: dev@archiva.apache.org
-      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