Merge pull request #374 from groldan/feature/web-rest-settings

webui: Add missing dependency on gs-web-rest
geoserver · Nov 25, 2023 · ec78196 · ec78196
2 parents f23b647 + 1645ba9
commit ec78196
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/apps/geoserver/webui/pom.xml b/src/apps/geoserver/webui/pom.xml
@@ -75,6 +75,10 @@
       <groupId>org.geoserver.extension</groupId>
       <artifactId>gs-web-resource</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.geoserver.web</groupId>
+      <artifactId>gs-web-rest</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.geoserver.importer</groupId>
       <artifactId>gs-importer-web</artifactId>

diff --git a/.../webui/src/main/java/org/geoserver/cloud/autoconfigure/web/core/WebCoreConfiguration.java b/.../webui/src/main/java/org/geoserver/cloud/autoconfigure/web/core/WebCoreConfiguration.java
@@ -20,7 +20,8 @@
         reader = FilteringXmlBeanDefinitionReader.class, //
         locations = { //
             "jar:gs-web-core-.*!/applicationContext.xml#name="
-                    + WebCoreConfiguration.EXCLUDED_BEANS_PATTERN //
+                    + WebCoreConfiguration.EXCLUDED_BEANS_PATTERN, //
+            "jar:gs-web-rest-.*!/applicationContext.xml" //
         })
 public class WebCoreConfiguration {
 

diff --git a/src/pom.xml b/src/pom.xml
@@ -403,6 +403,11 @@
         <artifactId>gs-web-wcs</artifactId>
         <version>${gs.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.geoserver.web</groupId>
+        <artifactId>gs-web-rest</artifactId>
+        <version>${gs.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.geoserver.web</groupId>
         <artifactId>gs-web-sec-core</artifactId>