refactor(deploy): merge hawtio-base.war with hawtio-default.war

Fix #2997
hawtio · Nov 13, 2023 · bf46f0a · bf46f0a
1 parent ceb296d
commit bf46f0a
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 92 deletions.
diff --git a/deploy/hawtio-base/.gitignore b/deploy/hawtio-base/.gitignore
diff --git a/deploy/hawtio-base/pom.xml b/deploy/hawtio-base/pom.xml
diff --git a/deploy/hawtio-base/src/main/resources/log4j2.properties b/deploy/hawtio-base/src/main/resources/log4j2.properties
diff --git a/deploy/hawtio-default/pom.xml b/deploy/hawtio-default/pom.xml
@@ -23,11 +23,11 @@
 
     <dependency>
       <groupId>io.hawt</groupId>
-      <artifactId>hawtio-base</artifactId>
+      <artifactId>hawtio-war</artifactId>
       <version>${project.version}</version>
       <!--
         NOTE this WAR dependency type which enables this WAR to
-        inherit all the plugins and content from the core hawtio-base WAR
+        inherit all the plugins and content from the core hawtio-war WAR
       -->
       <type>war</type>
     </dependency>

diff --git a/deploy/hawtio-default/src/main/webapp/.gitignore b/deploy/hawtio-default/src/main/webapp/.gitignore
diff --git a/...wtio-base/src/main/webapp/WEB-INF/web.xml → ...o-default/src/main/webapp/WEB-INF/web.xml b/...wtio-base/src/main/webapp/WEB-INF/web.xml → ...o-default/src/main/webapp/WEB-INF/web.xml
diff --git a/pom.xml b/pom.xml
@@ -111,7 +111,6 @@
   <modules>
     <module>bom</module>
     <module>console</module>
-    <module>deploy/hawtio-base</module>
     <module>deploy/hawtio-default</module>
     <module>deploy/hawtio-embedded</module>
     <module>examples/quarkus</module>