diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a608c728f2..fef78b7fb4 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -36,6 +36,7 @@ jobs: archive.ics.uci.edu:80 auth.docker.io:443 build.shibboleth.net:443 + centralus.data.mcr.microsoft.com:443 download.eclipse.org:443 eastus.data.mcr.microsoft.com:443 github.com:443 @@ -46,6 +47,7 @@ jobs: registry-1.docker.io:443 registry.npmjs.org:443 repo.maven.apache.org:443 + repo.spring.io:443 repo1.maven.org:443 westus.data.mcr.microsoft.com:443 westus2.data.mcr.microsoft.com:443 diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/TokenAttachedSpanChangeListener.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/TokenAttachedSpanChangeListener.java index 99601b5157..fc43b3a646 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/TokenAttachedSpanChangeListener.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/span/TokenAttachedSpanChangeListener.java @@ -25,6 +25,7 @@ import org.apache.uima.jcas.tcas.Annotation; import org.springframework.context.event.EventListener; +import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; public class TokenAttachedSpanChangeListener @@ -39,9 +40,11 @@ public TokenAttachedSpanChangeListener(AnnotationSchemaService aSchemaService) @EventListener public void onSpanMovedEvent(SpanMovedEvent aEvent) { - adjustAttachedAnnotations(aEvent); - adjustSingleTokenAnchoredAnnotations(aEvent); - adjustTokenAnchoredAnnotations(aEvent); + if (aEvent.getAnnotation() instanceof Token) { + adjustAttachedAnnotations(aEvent); + adjustSingleTokenAnchoredAnnotations(aEvent); + adjustTokenAnchoredAnnotations(aEvent); + } } void adjustTokenAnchoredAnnotations(SpanMovedEvent aEvent) diff --git a/inception/inception-imls-ollama/pom.xml b/inception/inception-imls-ollama/pom.xml index a4075a50fe..92ebdc3f92 100644 --- a/inception/inception-imls-ollama/pom.xml +++ b/inception/inception-imls-ollama/pom.xml @@ -102,6 +102,10 @@ jdk-serializable-functional + + com.fasterxml.jackson.core + jackson-core + com.fasterxml.jackson.core jackson-annotations diff --git a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/ProjectImportExportUtils.java b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/ProjectImportExportUtils.java index 1e43b98028..57fbe5219a 100644 --- a/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/ProjectImportExportUtils.java +++ b/inception/inception-project-export/src/main/java/de/tudarmstadt/ukp/inception/project/export/ProjectImportExportUtils.java @@ -19,7 +19,6 @@ import java.io.File; import java.io.IOException; -import java.util.Enumeration; import java.util.zip.ZipEntry; import java.util.zip.ZipException; import java.util.zip.ZipFile; @@ -40,22 +39,19 @@ public class ProjectImportExportUtils * if an I/O error occurs. * */ - @SuppressWarnings({ "rawtypes" }) public static boolean isValidProjectArchive(File aZipFile) throws IOException { - - boolean isZipValidWebanno = false; - try (ZipFile zip = new ZipFile(aZipFile)) { - for (Enumeration zipEnumerate = zip.entries(); zipEnumerate.hasMoreElements();) { - ZipEntry entry = (ZipEntry) zipEnumerate.nextElement(); - if (entry.toString().replace("/", "").startsWith(EXPORTED_PROJECT) - && entry.toString().replace("/", "").endsWith(".json")) { - isZipValidWebanno = true; - break; + try (var zip = new ZipFile(aZipFile)) { + for (var zipEnumerate = zip.entries(); zipEnumerate.hasMoreElements();) { + var entry = (ZipEntry) zipEnumerate.nextElement(); + var name = entry.getName().replace("/", ""); + if (name.startsWith(EXPORTED_PROJECT) && name.endsWith(".json")) { + return true; } } } - return isZipValidWebanno; + + return false; } }