Merge branch 'release/31.x'

* release/31.x:
  No issue: Try to get build work on Windows
  No issue: Added gitattributes file
  #4618 - Resizing a span does not update annotations on disk

% Conflicts:
%	inception/inception-schema-api/src/main/java/de/tudarmstadt/ukp/inception/schema/api/AnnotationSchemaService.java

inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/editor/actions/MoveSpanAnnotationHandler.java

@@ -22,16 +22,13 @@
 import java.io.IOException;
 
 import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.request.Request;
 import org.springframework.core.annotation.Order;
 
-import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase;
 import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanAdapter;
 import de.tudarmstadt.ukp.inception.diam.editor.config.DiamAutoConfig;
 import de.tudarmstadt.ukp.inception.diam.model.ajax.DefaultAjaxResponse;
-import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState;
 import de.tudarmstadt.ukp.inception.rendering.model.Range;
 import de.tudarmstadt.ukp.inception.rendering.vmodel.VID;
 import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService;
@@ -66,12 +63,13 @@ public String getCommand()
     public DefaultAjaxResponse handle(AjaxRequestTarget aTarget, Request aRequest)
     {
         try {
-            AnnotationPageBase page = getPage();
-            CAS cas = page.getEditorCas();
+            var page = getPage();
+            var cas = page.getEditorCas();
             var vid = getVid(aRequest);
-            AnnotatorState state = getAnnotatorState();
+            var state = getAnnotatorState();
             var range = getRangeFromRequest(state, aRequest.getRequestParameters(), cas);
             moveSpan(aTarget, cas, vid, range);
+            page.writeEditorCas(cas);
             return new DefaultAjaxResponse(getAction(aRequest));
         }
         catch (Exception e) {
@@ -82,12 +80,11 @@ public DefaultAjaxResponse handle(AjaxRequestTarget aTarget, Request aRequest)
     private void moveSpan(AjaxRequestTarget aTarget, CAS aCas, VID aVid, Range aRange)
         throws IOException, AnnotationException
     {
-        AnnotatorState state = getAnnotatorState();
+        var state = getAnnotatorState();
 
-        AnnotationFS annoFs = ICasUtil.selectAnnotationByAddr(aCas, aVid.getId());
+        var annoFs = ICasUtil.selectAnnotationByAddr(aCas, aVid.getId());
 
-        SpanAdapter adapter = (SpanAdapter) annotationService.findAdapter(state.getProject(),
-                annoFs);
+        var adapter = (SpanAdapter) annotationService.findAdapter(state.getProject(), annoFs);
 
         adapter.move(state.getDocument(), state.getUser().getUsername(), aCas, annoFs,
                 aRange.getBegin(), aRange.getEnd());