wicket9: fix up merge problems

aaime · May 22, 2024 · dc1df05 · dc1df05
1 parent 4d13ce1
commit dc1df05
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 19 deletions.
diff --git a/...nity/taskmanager/core/src/test/java/org/geoserver/taskmanager/web/BulkOperationsTest.java b/...nity/taskmanager/core/src/test/java/org/geoserver/taskmanager/web/BulkOperationsTest.java
@@ -4,6 +4,8 @@
  */
 package org.geoserver.taskmanager.web;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

diff --git a/src/extension/pom.xml b/src/extension/pom.xml
@@ -500,17 +500,8 @@
         <module>wps-jdbc</module>
         <module>mapml</module>
         <module>geopkg-output</module>
-<<<<<<< HEAD
-<<<<<<< HEAD
         <module>metadata</module>
         <module>rat</module>
-=======
-        <!-- TODO WICKET 8 - re-enable after it builds -->
-        <!-- <module>metadata</module> -->
->>>>>>> b1ec0919e6 (wip: initial work on Wicket 8 upgrade)
-=======
-        <module>metadata</module>
->>>>>>> 505537823e (wicket8: get metadata module compiling again)
       </modules>
     </profile>
   </profiles>

diff --git a/src/extension/rat/pom.xml b/src/extension/rat/pom.xml
@@ -36,6 +36,11 @@
       <artifactId>gt-brewer</artifactId>
       <version>${gt.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.geoserver.web</groupId>
       <artifactId>gs-web-core</artifactId>

diff --git a/...tension/web-resource/src/main/java/org/geoserver/web/resources/WicketResourceAdaptor.java b/...tension/web-resource/src/main/java/org/geoserver/web/resources/WicketResourceAdaptor.java
@@ -11,8 +11,6 @@
 import java.time.Instant;
 import org.apache.wicket.util.resource.AbstractResourceStream;
 import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
-import org.apache.wicket.util.time.Time;
-import org.geoserver.platform.resource.Paths;
 import org.geoserver.platform.resource.Resource;
 
 /**

diff --git a/src/web/core/src/main/java/org/geoserver/web/wicket/GeoServerTablePanel.html b/src/web/core/src/main/java/org/geoserver/web/wicket/GeoServerTablePanel.html
@@ -11,15 +11,7 @@
 		</div>
 		<div class="float-end">
 			<input id="filter" wicket:id="filter" class="me-1 search" type="text" size="35" title="Search" placeholder="Search" wicket:message="placeholder:Search"/>
-<<<<<<< HEAD
-			<input wicket:id="submit" class="d-none" type="submit" value="Search"/>
-			<span class="help-link" title="Enclose the search term in quotes for exact-term search." wicket:message="title:search.help"></span>
-			<script type="text/javascript">
-				$('input, textarea').placeholder();
-			</script>
-=======
 			<input wicket:id="submit" class="d-none" type="submit" placeholder="Search"/>
->>>>>>> c1f56d6e61 (Avoid inline scripts in table panel search)
 			<a href="#" id="clear" wicket:id="clear" class="float-end" title="clear the filter">Clear</a>
 		</div>
 	</form>