Merge branch 'main' into feature/4907-Support-for-DocX

* main: #5056 - Ability to configure additional languages for knowledge bases #4909 - Upgrade dependencies No issue: Actually, document-metadata doesn't seem to be experimental after all... No issue: Set version to 35.0-SNAPSHOT [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release inception-33.7 No issue: Cosmetic improvements to login page and telemetry settings #4909 - Upgrade dependencies #5052 - No lazy details when viewing annotation suggestions for another user No issue: Cosmetic improvements to login page and telemetry settings #5033 - Ability to configure recommenders interactively on the annotation page #5033 - Ability to configure recommenders interactively on the annotation page #5050 - Tags on the second level of conditional features cannot be selected #5033 - Ability to configure recommenders interactively on the annotation page #4977 - Clean up Knowledge Base UI code % Conflicts: % inception/inception-bom/pom.xml
inception-project · Sep 21, 2024 · c8020d2 · c8020d2
2 parents 160abac + 6a737da
commit c8020d2
Show file tree

Hide file tree

Showing 223 changed files with 10,356 additions and 15,851 deletions.
diff --git a/inception/inception-active-learning/pom.xml b/inception/inception-active-learning/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>de.tudarmstadt.ukp.inception.app</groupId>
     <artifactId>inception-app</artifactId>
-    <version>34.0-SNAPSHOT</version>
+    <version>35.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>inception-active-learning</artifactId>

diff --git a/inception/inception-agreement/pom.xml b/inception/inception-agreement/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>de.tudarmstadt.ukp.inception.app</groupId>
     <artifactId>inception-app</artifactId>
-    <version>34.0-SNAPSHOT</version>
+    <version>35.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>inception-agreement</artifactId>

diff --git a/inception/inception-annotation-storage-api/pom.xml b/inception/inception-annotation-storage-api/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>de.tudarmstadt.ukp.inception.app</groupId>
     <artifactId>inception-app</artifactId>
-    <version>34.0-SNAPSHOT</version>
+    <version>35.0-SNAPSHOT</version>
   </parent>
   <artifactId>inception-annotation-storage-api</artifactId>
   <name>INCEpTION - Core - Annotation Storage - API</name>

diff --git a/inception/inception-annotation-storage/pom.xml b/inception/inception-annotation-storage/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>de.tudarmstadt.ukp.inception.app</groupId>
     <artifactId>inception-app</artifactId>
-    <version>34.0-SNAPSHOT</version>
+    <version>35.0-SNAPSHOT</version>
   </parent>
   <artifactId>inception-annotation-storage</artifactId>
   <name>INCEpTION - Core - Annotation Storage</name>

diff --git a/inception/inception-api-annotation/pom.xml b/inception/inception-api-annotation/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>de.tudarmstadt.ukp.inception.app</groupId>
     <artifactId>inception-app</artifactId>
-    <version>34.0-SNAPSHOT</version>
+    <version>35.0-SNAPSHOT</version>
   </parent>
   <artifactId>inception-api-annotation</artifactId>
   <name>INCEpTION - Core - Annotation API</name>

diff --git a/...udarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java b/...udarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java
@@ -39,7 +39,6 @@
 import org.wicketstuff.kendo.ui.renderer.ChoiceRenderer;
 
 import de.tudarmstadt.ukp.clarin.webanno.model.ReorderableTag;
-import de.tudarmstadt.ukp.clarin.webanno.model.TagSet;
 import de.tudarmstadt.ukp.inception.annotation.feature.misc.ConstraintsInUseIndicator;
 import de.tudarmstadt.ukp.inception.annotation.feature.string.KendoChoiceDescriptionScriptReference;
 import de.tudarmstadt.ukp.inception.annotation.feature.string.StringFeatureSupportProperties;
@@ -228,11 +227,11 @@ public FormComponent getFocusComponent()
     private List<ReorderableTag> getChoices(final IModel<FeatureState> aFeatureStateModel,
             String aInput)
     {
-        String input = aInput != null ? aInput.trim() : "";
+        var input = aInput != null ? aInput.trim() : "";
 
-        FeatureState featureState = aFeatureStateModel.getObject();
-        TagSet tagset = featureState.getFeature().getTagset();
-        List<ReorderableTag> choices = new ArrayList<>();
+        var featureState = aFeatureStateModel.getObject();
+        var tagset = featureState.getFeature().getTagset();
+        var choices = new ArrayList<ReorderableTag>();
 
         Collection<String> values;
         if (featureState.getValue() instanceof Collection) {
@@ -254,37 +253,36 @@ private List<ReorderableTag> getChoices(final IModel<FeatureState> aFeatureState
 
         // If the currently selected values contain any values not covered by the tagset,
         // add virtual entries for them as well
-        for (String value : values) {
+        for (var value : values) {
             if (!choices.stream().anyMatch(t -> t.getName().equals(value))) {
                 choices.add(new ReorderableTag(value, false));
             }
         }
 
         if (!input.isEmpty()) {
             // Move any entries that match the input case-insensitive to the top
-            List<ReorderableTag> inputMatchesInsensitive = choices.stream() //
+            var inputMatchesInsensitive = choices.stream() //
                     .filter(t -> t.getName().equalsIgnoreCase(input)) //
                     .collect(toList());
-            for (ReorderableTag t : inputMatchesInsensitive) {
+            for (var t : inputMatchesInsensitive) {
                 choices.remove(t);
                 choices.add(0, t);
             }
 
             // Move any entries that match the input case-sensitive to the top
-            List<ReorderableTag> inputMatchesSensitive = choices.stream() //
+            var inputMatchesSensitive = choices.stream() //
                     .filter(t -> t.getName().equals(input)) //
                     .collect(toList());
             if (inputMatchesSensitive.isEmpty()) {
                 // If the input does not match any tagset entry, add a new virtual entry for
-                // the
-                // input so that we can select that and add it - this has no description.
+                // the input so that we can select that and add it - this has no description.
                 // If the input matches an existing entry, move it to the top.
                 if (tagset == null || tagset.isCreateTag()) {
                     choices.add(0, new ReorderableTag(input, false));
                 }
             }
             else {
-                for (ReorderableTag t : inputMatchesSensitive) {
+                for (var t : inputMatchesSensitive) {
                     choices.remove(t);
                     choices.add(0, t);
                 }

diff --git a/...adt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureTraitsEditor.java b/...adt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureTraitsEditor.java
@@ -58,8 +58,7 @@ public MultiValueStringFeatureTraitsEditor(String aId,
 
         traits = CompoundPropertyModel.of(getFeatureSupport().readTraits(feature.getObject()));
 
-        Form<MultiValueStringFeatureTraits> form = new Form<MultiValueStringFeatureTraits>(MID_FORM,
-                traits)
+        var form = new Form<MultiValueStringFeatureTraits>(MID_FORM, traits)
         {
             private static final long serialVersionUID = -3109239605783291123L;
 
@@ -74,7 +73,7 @@ protected void onSubmit()
         form.setOutputMarkupPlaceholderTag(true);
         add(form);
 
-        DropDownChoice<TagSet> tagset = new DropDownChoice<>("tagset");
+        var tagset = new DropDownChoice<TagSet>("tagset");
         tagset.setOutputMarkupPlaceholderTag(true);
         tagset.setChoiceRenderer(new ChoiceRenderer<>("name"));
         tagset.setNullValid(true);

diff --git a/inception/inception-api-editor/pom.xml b/inception/inception-api-editor/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>de.tudarmstadt.ukp.inception.app</groupId>
     <artifactId>inception-app</artifactId>
-    <version>34.0-SNAPSHOT</version>
+    <version>35.0-SNAPSHOT</version>
   </parent>
   <artifactId>inception-api-editor</artifactId>
   <name>INCEpTION - Core - Annotation editor API</name>

diff --git a/inception/inception-api-formats/pom.xml b/inception/inception-api-formats/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>de.tudarmstadt.ukp.inception.app</groupId>
     <artifactId>inception-app</artifactId>
-    <version>34.0-SNAPSHOT</version>
+    <version>35.0-SNAPSHOT</version>
   </parent>
   <artifactId>inception-api-formats</artifactId>
   <name>INCEpTION - Core - Formats API</name>

diff --git a/inception/inception-api-render/pom.xml b/inception/inception-api-render/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>de.tudarmstadt.ukp.inception.app</groupId>
     <artifactId>inception-app</artifactId>
-    <version>34.0-SNAPSHOT</version>
+    <version>35.0-SNAPSHOT</version>
   </parent>
   <artifactId>inception-api-render</artifactId>
   <name>INCEpTION - Core - Annotation rendering API</name>

diff --git a/inception/inception-app-webapp/pom.xml b/inception/inception-app-webapp/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>de.tudarmstadt.ukp.inception.app</groupId>
     <artifactId>inception-app</artifactId>
-    <version>34.0-SNAPSHOT</version>
+    <version>35.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>