From d381f0d431b46ede15ee7264bdc90a4d7adf1c4a Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 5 Oct 2012 19:48:15 +0000 Subject: [PATCH] add rest ui services documentation move rest services from the webapp-js to web-common module git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1394756 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-docs/pom.xml | 16 +++++ .../archiva-rest-services/pom.xml | 2 +- .../archiva-web/archiva-web-common/pom.xml | 59 ++++++++++++++++--- .../src/enunciate/enunciate.xml | 0 .../web}/api/DataValidatorService.java | 2 +- .../web}/api/DefaultDataValidatorService.java | 2 +- .../web}/api/DefaultFileUploadService.java | 4 +- .../web}/api/DefaultRuntimeInfoService.java | 4 +- .../archiva/web}/api/FileUploadService.java | 4 +- .../archiva/web}/api/RuntimeInfoService.java | 4 +- .../archiva/web}/docs/RestDocsServlet.java | 2 +- .../web}/model/ApplicationRuntimeInfo.java | 2 +- .../archiva/web}/model/FileMetadata.java | 2 +- .../resources/META-INF/spring-context.xml | 31 +++++++++- .../archiva}/RuntimeInfoServiceTest.java | 5 +- .../archiva-web/archiva-webapp-js/pom.xml | 8 ++- .../resources/META-INF/spring-context.xml | 35 +---------- .../src/main/webapp/WEB-INF/web.xml | 2 +- pom.xml | 5 ++ 19 files changed, 129 insertions(+), 60 deletions(-) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-web-common}/src/enunciate/enunciate.xml (100%) rename archiva-modules/archiva-web/{archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services => archiva-web-common/src/main/java/org/apache/archiva/web}/api/DataValidatorService.java (97%) rename archiva-modules/archiva-web/{archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services => archiva-web-common/src/main/java/org/apache/archiva/web}/api/DefaultDataValidatorService.java (98%) rename archiva-modules/archiva-web/{archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services => archiva-web-common/src/main/java/org/apache/archiva/web}/api/DefaultFileUploadService.java (99%) rename archiva-modules/archiva-web/{archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services => archiva-web-common/src/main/java/org/apache/archiva/web}/api/DefaultRuntimeInfoService.java (95%) rename archiva-modules/archiva-web/{archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services => archiva-web-common/src/main/java/org/apache/archiva/web}/api/FileUploadService.java (96%) rename archiva-modules/archiva-web/{archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services => archiva-web-common/src/main/java/org/apache/archiva/web}/api/RuntimeInfoService.java (93%) rename archiva-modules/archiva-web/{archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services => archiva-web-common/src/main/java/org/apache/archiva/web}/docs/RestDocsServlet.java (98%) rename archiva-modules/archiva-web/{archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services => archiva-web-common/src/main/java/org/apache/archiva/web}/model/ApplicationRuntimeInfo.java (98%) rename archiva-modules/archiva-web/{archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services => archiva-web-common/src/main/java/org/apache/archiva/web}/model/FileMetadata.java (98%) rename archiva-modules/archiva-web/{archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api => archiva-web-common/src/test/java/org/apache/archiva}/RuntimeInfoServiceTest.java (95%) diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml index 1ec358c51..5b44cf374 100644 --- a/archiva-docs/pom.xml +++ b/archiva-docs/pom.xml @@ -109,6 +109,18 @@ META-INF/**,org/** + + archiva-rest-ui-api-docs-extract + site + + unpack-dependencies + + + archiva-web-common + ${project.build.directory}/site/ + META-INF/**,org/**,WEB-INF/** + + @@ -120,6 +132,10 @@ org.apache.archiva archiva-rest-api + + org.apache.archiva + archiva-web-common + diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index 813e1ffec..a25ffa553 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -20,8 +20,8 @@ 4.0.0 - archiva-rest org.apache.archiva + archiva-rest 1.4-M4-SNAPSHOT archiva-rest-services diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index 5e8805236..0f8c24a60 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -26,9 +26,14 @@ archiva-web-common - bundle + + jar Archiva Web :: Web Common + + ${project.build.outputDirectory}/rest-docs-archiva-ui + + org.apache.archiva @@ -80,11 +85,31 @@ org.apache.archiva.redback redback-system + + org.apache.archiva + archiva-repository-layer + + + org.apache.archiva + archiva-rest-api + + + org.apache.archiva + archiva-rest-services + + + org.apache.archiva + audit + javax.servlet javax.servlet-api provided + + javax.ws.rs + jsr311-api + org.apache.archiva.redback.components spring-taskqueue @@ -119,6 +144,14 @@ org.springframework spring-context-support + + org.jsoup + jsoup + + + javax.servlet + servlet-api + org.springframework spring-web @@ -215,12 +248,6 @@ test - - org.apache.archiva - archiva-rest-services - test - - org.apache.archiva archiva-webdav @@ -335,6 +362,15 @@ + + + create-manifest + process-test-classes + + manifest + + + org.apache.maven.plugins @@ -347,6 +383,15 @@ + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/enunciate/enunciate.xml b/archiva-modules/archiva-web/archiva-web-common/src/enunciate/enunciate.xml similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/enunciate/enunciate.xml rename to archiva-modules/archiva-web/archiva-web-common/src/enunciate/enunciate.xml diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DataValidatorService.java similarity index 97% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java rename to archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DataValidatorService.java index 72e63b3d9..2931d7c64 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DataValidatorService.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DataValidatorService.java @@ -1,4 +1,4 @@ -package org.apache.archiva.webapp.ui.services.api; +package org.apache.archiva.web.api; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultDataValidatorService.java similarity index 98% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java rename to archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultDataValidatorService.java index bbbe0f865..1210f1386 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultDataValidatorService.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultDataValidatorService.java @@ -1,4 +1,4 @@ -package org.apache.archiva.webapp.ui.services.api; +package org.apache.archiva.web.api; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java similarity index 99% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java rename to archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java index 55cf09999..01ef60d2d 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultFileUploadService.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java @@ -1,4 +1,4 @@ -package org.apache.archiva.webapp.ui.services.api; +package org.apache.archiva.web.api; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -45,7 +45,7 @@ import org.apache.archiva.rest.api.services.ArchivaRestServiceException; import org.apache.archiva.rest.services.AbstractRestService; import org.apache.archiva.scheduler.ArchivaTaskScheduler; import org.apache.archiva.scheduler.repository.RepositoryTask; -import org.apache.archiva.webapp.ui.services.model.FileMetadata; +import org.apache.archiva.web.model.FileMetadata; import org.apache.archiva.xml.XMLException; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultRuntimeInfoService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java similarity index 95% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultRuntimeInfoService.java rename to archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java index 5846057c3..f28ce3266 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/DefaultRuntimeInfoService.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultRuntimeInfoService.java @@ -1,4 +1,4 @@ -package org.apache.archiva.webapp.ui.services.api; +package org.apache.archiva.web.api; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -19,7 +19,7 @@ package org.apache.archiva.webapp.ui.services.api; */ import org.apache.archiva.web.runtime.ArchivaRuntimeInfo; -import org.apache.archiva.webapp.ui.services.model.ApplicationRuntimeInfo; +import org.apache.archiva.web.model.ApplicationRuntimeInfo; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/FileUploadService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/FileUploadService.java similarity index 96% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/FileUploadService.java rename to archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/FileUploadService.java index 3a354aad6..d95db3da5 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/FileUploadService.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/FileUploadService.java @@ -1,4 +1,4 @@ -package org.apache.archiva.webapp.ui.services.api; +package org.apache.archiva.web.api; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -20,7 +20,7 @@ package org.apache.archiva.webapp.ui.services.api; import org.apache.archiva.rest.api.services.ArchivaRestServiceException; import org.apache.archiva.security.common.ArchivaRoleConstants; -import org.apache.archiva.webapp.ui.services.model.FileMetadata; +import org.apache.archiva.web.model.FileMetadata; import org.apache.cxf.jaxrs.ext.multipart.MultipartBody; import org.apache.archiva.redback.authorization.RedbackAuthorization; diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/RuntimeInfoService.java similarity index 93% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoService.java rename to archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/RuntimeInfoService.java index cfc730bb8..cb5b03e12 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoService.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/RuntimeInfoService.java @@ -1,4 +1,4 @@ -package org.apache.archiva.webapp.ui.services.api; +package org.apache.archiva.web.api; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,7 +18,7 @@ package org.apache.archiva.webapp.ui.services.api; * under the License. */ -import org.apache.archiva.webapp.ui.services.model.ApplicationRuntimeInfo; +import org.apache.archiva.web.model.ApplicationRuntimeInfo; import org.apache.archiva.redback.authorization.RedbackAuthorization; import javax.ws.rs.GET; diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/docs/RestDocsServlet.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/docs/RestDocsServlet.java similarity index 98% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/docs/RestDocsServlet.java rename to archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/docs/RestDocsServlet.java index 020f171a4..a7f0e0fe8 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/docs/RestDocsServlet.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/docs/RestDocsServlet.java @@ -1,4 +1,4 @@ -package org.apache.archiva.webapp.ui.services.docs; +package org.apache.archiva.web.docs; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/ApplicationRuntimeInfo.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/model/ApplicationRuntimeInfo.java similarity index 98% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/ApplicationRuntimeInfo.java rename to archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/model/ApplicationRuntimeInfo.java index 15dc6d3ec..b5bc8cc91 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/ApplicationRuntimeInfo.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/model/ApplicationRuntimeInfo.java @@ -1,4 +1,4 @@ -package org.apache.archiva.webapp.ui.services.model; +package org.apache.archiva.web.model; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/FileMetadata.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/model/FileMetadata.java similarity index 98% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/FileMetadata.java rename to archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/model/FileMetadata.java index 0d6a7893e..f3a8245e1 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/FileMetadata.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/model/FileMetadata.java @@ -1,4 +1,4 @@ -package org.apache.archiva.webapp.ui.services.model; +package org.apache.archiva.web.model; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/META-INF/spring-context.xml index 261b88532..ea18caee1 100755 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/META-INF/spring-context.xml @@ -22,17 +22,44 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" + xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/util - http://www.springframework.org/schema/util/spring-util-3.0.xsd" + http://www.springframework.org/schema/util/spring-util-3.0.xsd + http://cxf.apache.org/jaxrs + http://cxf.apache.org/schemas/jaxrs.xsd" default-lazy-init="true"> - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/RuntimeInfoServiceTest.java similarity index 95% rename from archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java rename to archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/RuntimeInfoServiceTest.java index d9992d9ca..51dd976ab 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/webapp/ui/services/api/RuntimeInfoServiceTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/RuntimeInfoServiceTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.webapp.ui.services.api; +package org.apache.archiva; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,7 +18,8 @@ package org.apache.archiva.webapp.ui.services.api; * under the License. */ -import org.apache.archiva.webapp.ui.services.model.ApplicationRuntimeInfo; +import org.apache.archiva.web.api.RuntimeInfoService; +import org.apache.archiva.web.model.ApplicationRuntimeInfo; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml index 8c0eb6f3b..7979d4e04 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml @@ -40,7 +40,7 @@ false - ${project.build.outputDirectory}/rest-docs-archiva-ui + @@ -758,6 +758,12 @@ spring-web + + org.jsoup + jsoup + + + org.apache.archiva archiva-test-mocks diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml index 2cce5e81d..a948d74aa 100755 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml @@ -22,25 +22,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" - xmlns:jaxrs="http://cxf.apache.org/jaxrs" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/util - http://www.springframework.org/schema/util/spring-util-3.0.xsd - http://cxf.apache.org/jaxrs - http://cxf.apache.org/schemas/jaxrs.xsd" + http://www.springframework.org/schema/util/spring-util-3.0.xsd" default-lazy-init="true"> - - - - - + @@ -54,29 +45,7 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml index eb89242f2..8d8515292 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml @@ -81,7 +81,7 @@ RestDocumentation - org.apache.archiva.webapp.ui.services.docs.RestDocsServlet + org.apache.archiva.web.docs.RestDocsServlet 3 diff --git a/pom.xml b/pom.xml index fdb8d926c..d18833ba4 100644 --- a/pom.xml +++ b/pom.xml @@ -1496,6 +1496,11 @@ 1.8.5 test + + org.jsoup + jsoup + 1.7.1 + -- 2.39.5