#4843 - Promote sidebar curation mode to proper curation page

- Fix build
inception-project · Jun 15, 2024 · 87e4542 · 87e4542
1 parent 10665b3
commit 87e4542
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 7 deletions.
diff --git a/inception/inception-curation/pom.xml b/inception/inception-curation/pom.xml
@@ -136,6 +136,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-core</artifactId>

diff --git a/inception/inception-dependencies/pom.xml b/inception/inception-dependencies/pom.xml
@@ -113,6 +113,12 @@
         </exclusions>
       </dependency>
 
+      <dependency>
+        <groupId>jakarta.data</groupId>
+        <artifactId>jakarta.data-api</artifactId>
+        <version>1.0.0</version>
+      </dependency>
+
       <!-- Testing -->
       <dependency>
         <groupId>org.junit</groupId>

diff --git a/inception/inception-external-search-core/pom.xml b/inception/inception-external-search-core/pom.xml
@@ -93,6 +93,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/inception/inception-imls-elg/pom.xml b/inception/inception-imls-elg/pom.xml
@@ -110,6 +110,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
 
      <!-- LOGGING DEPENDENCIES - SLF4J -->
     <dependency>

diff --git a/inception/inception-imls-stringmatch/pom.xml b/inception/inception-imls-stringmatch/pom.xml
@@ -138,6 +138,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>

diff --git a/inception/inception-imls-weblicht/pom.xml b/inception/inception-imls-weblicht/pom.xml
@@ -173,6 +173,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>

diff --git a/inception/inception-log/pom.xml b/inception/inception-log/pom.xml
@@ -139,6 +139,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>

diff --git a/inception/inception-model/pom.xml b/inception/inception-model/pom.xml
@@ -58,5 +58,9 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
   </dependencies>
 </project>
diff --git a/inception/inception-security/pom.xml b/inception/inception-security/pom.xml
@@ -147,6 +147,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-core</artifactId>

diff --git a/inception/inception-sharing/pom.xml b/inception/inception-sharing/pom.xml
@@ -71,6 +71,10 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-core</artifactId>

diff --git a/...ain/java/de/tudarmstadt/ukp/inception/support/extensionpoint/ExtensionPoint_ImplBase.java b/...ain/java/de/tudarmstadt/ukp/inception/support/extensionpoint/ExtensionPoint_ImplBase.java
@@ -74,10 +74,10 @@ public void init()
         extensionsList = unmodifiableList(extensions);
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     protected Comparator<E> makeComparator()
     {
-        return (Comparator<E>) AnnotationAwareOrderComparator.INSTANCE;
+        return (Comparator) AnnotationAwareOrderComparator.INSTANCE;
     }
 
     @Override

diff --git a/...n/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/LegacyCurationPageMenuItem.java b/...n/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/LegacyCurationPageMenuItem.java
@@ -20,8 +20,6 @@
 import static de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel.CURATOR;
 import static java.lang.String.format;
 
-import javax.servlet.ServletContext;
-
 import org.apache.wicket.Page;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.core.annotation.Order;
@@ -33,6 +31,7 @@
 import de.tudarmstadt.ukp.clarin.webanno.security.model.User;
 import de.tudarmstadt.ukp.clarin.webanno.ui.core.menu.ProjectMenuItem;
 import de.tudarmstadt.ukp.inception.project.api.ProjectService;
+import jakarta.servlet.ServletContext;
 import wicket.contrib.input.events.key.KeyType;
 
 @ConditionalOnWebApplication

diff --git a/...ain/java/de/tudarmstadt/ukp/inception/ui/curation/config/CurationUIAutoConfiguration.java b/...ain/java/de/tudarmstadt/ukp/inception/ui/curation/config/CurationUIAutoConfiguration.java
@@ -17,8 +17,6 @@
  */
 package de.tudarmstadt.ukp.inception.ui.curation.config;
 
-import javax.servlet.ServletContext;
-
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
@@ -27,6 +25,7 @@
 import de.tudarmstadt.ukp.clarin.webanno.security.UserDao;
 import de.tudarmstadt.ukp.inception.project.api.ProjectService;
 import de.tudarmstadt.ukp.inception.ui.curation.page.CurationPageMenuItem;
+import jakarta.servlet.ServletContext;
 
 @ConditionalOnWebApplication
 @Configuration

diff --git a/inception/inception-workload/pom.xml b/inception/inception-workload/pom.xml
@@ -85,7 +85,11 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
-
+    <dependency>
+      <groupId>jakarta.data</groupId>
+      <artifactId>jakarta.data-api</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>