From 7dc0f7cc10bb9059937f4d0e1cd6602de193e54a Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Mon, 9 Jan 2023 20:16:16 +0100 Subject: [PATCH 1/5] #3706 - Update dependencies (26.6) - groovy 3.0.14 -> 4.0.7 --- inception/inception-io-lif/pom.xml | 21 ++++++++++++++++++--- inception/pom.xml | 12 ++++++++++-- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/inception/inception-io-lif/pom.xml b/inception/inception-io-lif/pom.xml index 6115277ec79..376f6ced473 100644 --- a/inception/inception-io-lif/pom.xml +++ b/inception/inception-io-lif/pom.xml @@ -33,7 +33,6 @@ de.tudarmstadt.ukp.inception.app inception-model - org.springframework spring-context @@ -42,7 +41,6 @@ org.springframework.boot spring-boot-autoconfigure - org.apache.uima uimaj-core @@ -51,10 +49,27 @@ org.apache.uima uimafit-core - org.dkpro.core dkpro-core-io-lif-asl + + + org.codehaus.groovy + groovy + + + org.codehaus.groovy + groovy-xml + + + + + org.apache.groovy + groovy + + + org.apache.groovy + groovy-xml \ No newline at end of file diff --git a/inception/pom.xml b/inception/pom.xml index 8dee43641cd..be390c2971f 100644 --- a/inception/pom.xml +++ b/inception/pom.xml @@ -86,7 +86,7 @@ 2.18.0 3.5.0.Final - 3.0.14 + 4.0.7 9.0.70 4.0.1 @@ -1699,7 +1699,7 @@ - org.codehaus.groovy + org.apache.groovy groovy-bom ${groovy.version} pom @@ -2615,6 +2615,14 @@ org.codehaus.gmaven groovy-maven-plugin 2.1.1 + + + org.apache.groovy + groovy-all + ${groovy.version} + pom + + com.github.eirslett From ad2b57408360cc2ca48c6e9e4eaee796914f16fb Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Mon, 9 Jan 2023 21:12:44 +0100 Subject: [PATCH 2/5] #3706 - Update dependencies (26.6) - DKPro Parent POM 27 -> 28 --- inception/inception-io-lif/pom.xml | 17 +++++++++++++++++ pom.xml | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/inception/inception-io-lif/pom.xml b/inception/inception-io-lif/pom.xml index 376f6ced473..1b07f662d25 100644 --- a/inception/inception-io-lif/pom.xml +++ b/inception/inception-io-lif/pom.xml @@ -72,4 +72,21 @@ groovy-xml + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + org.apache.groovy:groovy + org.apache.groovy:groovy-xml + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 731fa1be6bb..d4162f03aa4 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.dkpro dkpro-parent-pom - 27 + 28 de.tudarmstadt.ukp.inception.app From ec4a20dd5635ba6fd45fece3a12911d931de482a Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Mon, 9 Jan 2023 21:13:42 +0100 Subject: [PATCH 3/5] #3708 - Concept feature editor layout broken - Fix the layout so the width of the feature editor adjusts properly --- .../ukp/inception/ui/kb/feature/ConceptFeatureEditor.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.html b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.html index 61565d7855b..3b3b1b5c3c3 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.html +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.html @@ -33,7 +33,7 @@ - +
From 8c03b51aeceb935c455608a40e47ee55286198a3 Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Mon, 9 Jan 2023 21:43:59 +0100 Subject: [PATCH 4/5] #3705 - annotation.default-preferences.page-size is ignored even if defined in settings.properties - Funnel page size property into the legacy bridge class that still fills in the legacy annotation editor preferences --- .../preferences/UserPreferencesServiceImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/UserPreferencesServiceImpl.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/UserPreferencesServiceImpl.java index 67a91f79cc2..4255b8cf915 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/UserPreferencesServiceImpl.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/preferences/UserPreferencesServiceImpl.java @@ -53,6 +53,7 @@ import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; import de.tudarmstadt.ukp.clarin.webanno.model.Mode; import de.tudarmstadt.ukp.clarin.webanno.model.Project; +import de.tudarmstadt.ukp.clarin.webanno.support.ApplicationContextProvider; import de.tudarmstadt.ukp.inception.preferences.Key; import de.tudarmstadt.ukp.inception.preferences.PreferencesService; import de.tudarmstadt.ukp.inception.rendering.coloring.ColoringService; @@ -329,6 +330,14 @@ public static class BratAnnotationEditorManagerPrefs private int defaultPageSize = 10; + public BratAnnotationEditorManagerPrefs() + { + AnnotationEditorDefaultPreferencesProperties defaults = ApplicationContextProvider + .getApplicationContext() + .getBean(AnnotationEditorDefaultPreferencesProperties.class); + defaultPageSize = defaults.getPageSize(); + } + public int getDefaultPageSize() { return defaultPageSize; From b64af309594dd7f8a214fa2f2c08b51d88915aca Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Tue, 10 Jan 2023 08:25:06 +0100 Subject: [PATCH 5/5] #3706 - Update dependencies (26.6) - Remove explicit Groovy dependeny which is now included in the parent pom --- inception/pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/inception/pom.xml b/inception/pom.xml index be390c2971f..ce93a265234 100644 --- a/inception/pom.xml +++ b/inception/pom.xml @@ -2615,14 +2615,6 @@ org.codehaus.gmaven groovy-maven-plugin 2.1.1 - - - org.apache.groovy - groovy-all - ${groovy.version} - pom - - com.github.eirslett