Merge branch 'master' into feature/1472-Upgrade-dependencies

* master:
  #1811 - Webanno does not boot in Intellij due to javax errors
  #1811 - Webanno does not boot in Intellij due to javax errors
  #1811 - Webanno does not boot in Intellij due to javax errors
  #1811 - Webanno does not boot in Intellij due to javax errors
  #1811 - Webanno does not boot in Intellij due to javax errors
  #1806 - Display incoming and outgoing relations in the details panel
  No issue: Ignore .gradle folder
  #1811 - Webanno does not boot in Intellij due to javax errors

% Conflicts:
%	pom.xml

.gitignore

@@ -12,3 +12,4 @@ webanno-doc/src/main/resources/public
 .checkstyle
 log4j2-dev.xml
 .factorypath
+.gradle

pom.xml

@@ -67,7 +67,7 @@
     <wicket.version>9.2.0</wicket.version>
     <wicketstuff.version>9.2.0</wicketstuff.version>
     <wicket-jquery-ui.version>9.1.0</wicket-jquery-ui.version>
-    <wicket-bootstrap.version>5.0.2</wicket-bootstrap.version>
+    <wicket-bootstrap.version>5.0.3</wicket-bootstrap.version>
     <wicket-jquery-selectors.version>3.0.1</wicket-jquery-selectors.version>
     <wicket-webjars.version>3.0.1</wicket-webjars.version>
     <wicket-spring-boot.version>3.0.4</wicket-spring-boot.version>

webanno-api-dao/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/dao/AnnotationSchemaServiceImpl.java

@@ -1211,6 +1211,10 @@ public List<AttachedAnnotation> getAttachedRels(AnnotationLayer aLayer, Annotati
             }
 
             for (AnnotationFS relationFS : CasUtil.select(cas, relationType)) {
+                if (!(relationFS instanceof AnnotationFS)) {
+                    continue;
+                }
+
                 // Here we get the annotations that the relation is pointing to in the UI
                 AnnotationFS sourceFS;
                 if (relationSourceAttachFeature != null) {
@@ -1265,6 +1269,10 @@ public List<AttachedAnnotation> getAttachedLinks(AnnotationLayer aLayer, Annotat
                     // them actually links to the current FS
                     Type linkHost = CasUtil.getType(cas, linkFeature.getLayer().getName());
                     for (FeatureStructure linkFS : CasUtil.selectFS(cas, linkHost)) {
+                        if (!(linkFS instanceof AnnotationFS)) {
+                            continue;
+                        }
+
                         List<LinkWithRoleModel> links = adapter.getFeatureValue(linkFeature,
                                 linkFS);
                         for (int li = 0; li < links.size(); li++) {

webanno-webapp/pom.xml

@@ -251,21 +251,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>jakarta.validation</groupId>
-      <artifactId>jakarta.validation-api</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat.embed</groupId>
-      <artifactId>tomcat-embed-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-tomcat</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>
@@ -435,6 +420,9 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
           <configuration>
+            <ignoredUsedUndeclaredDependencies>
+              <ignoredUsedUndeclaredDependency>org.apache.tomcat.embed:tomcat-embed-core</ignoredUsedUndeclaredDependency>
+            </ignoredUsedUndeclaredDependencies>
             <usedDependencies combine.children="append">
               <!-- WebAnno UI Modules - they auto-register via reflection -->
               <usedDependency>de.tudarmstadt.ukp.clarin.webanno:webanno-ui-annotation</usedDependency>
@@ -472,7 +460,6 @@
               <usedDependency>com.googlecode.wicket-jquery-ui:wicket-jquery-ui-theme-uilightness</usedDependency>
               <!-- Spring Boot stuff - used via reflection/classpath -->
               <usedDependency>org.springframework:spring-webmvc</usedDependency>
-              <usedDependency>org.springframework.boot:spring-boot-starter-tomcat</usedDependency>
               <usedDependency>org.springframework.boot:spring-boot-starter-web</usedDependency>
               <usedDependency>com.giffing.wicket.spring.boot.starter:wicket-spring-boot-starter</usedDependency>
               <usedDependency>org.springframework.boot:spring-boot-starter-validation</usedDependency>

webanno-webapp/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/WebAnno.java

@@ -24,7 +24,6 @@
 import java.util.Optional;
 
 import javax.swing.JWindow;
-import javax.validation.Validator;
 
 import org.apache.catalina.connector.Connector;
 import org.apache.uima.cas.impl.CASImpl;
@@ -36,13 +35,11 @@
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.DelegatingPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.crypto.password.StandardPasswordEncoder;
-import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 
 import de.tudarmstadt.ukp.clarin.webanno.plugin.api.PluginManager;
 import de.tudarmstadt.ukp.clarin.webanno.plugin.impl.PluginManagerImpl;
@@ -75,13 +72,6 @@ public class WebAnno
     @Value("${server.ajp.address:127.0.0.1}")
     private String ajpAddress;
 
-    @Bean
-    @Primary
-    public Validator validator()
-    {
-        return new LocalValidatorFactoryBean();
-    }
-
     @Bean
     public PluginManager pluginManager()
     {