diff --git a/inception/inception-agreement/pom.xml b/inception/inception-agreement/pom.xml index d95e433da0b..c52b28d73f4 100644 --- a/inception/inception-agreement/pom.xml +++ b/inception/inception-agreement/pom.xml @@ -135,8 +135,8 @@ wicket-bootstrap-core - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-core + org.wicketstuff + wicketstuff-jquery-ui-core org.wicketstuff diff --git a/inception/inception-api-annotation/pom.xml b/inception/inception-api-annotation/pom.xml index 1b0559c031d..ce41d803c01 100644 --- a/inception/inception-api-annotation/pom.xml +++ b/inception/inception-api-annotation/pom.xml @@ -166,16 +166,16 @@ wicket-extensions - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-core + org.wicketstuff + wicketstuff-jquery-ui-core - com.googlecode.wicket-jquery-ui - wicket-jquery-ui + org.wicketstuff + wicketstuff-jquery-ui - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui de.agilecoders.wicket diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEditor.java index b2dd0fd0246..aa146fdf58f 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureEditor.java @@ -58,13 +58,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.wicketstuff.event.annotation.OnEvent; - -import com.googlecode.wicket.jquery.core.JQueryBehavior; -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.jquery.ui.widget.tooltip.TooltipBehavior; -import com.googlecode.wicket.kendo.ui.KendoUIBehavior; -import com.googlecode.wicket.kendo.ui.form.TextField; -import com.googlecode.wicket.kendo.ui.form.combobox.ComboBoxBehavior; +import org.wicketstuff.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.jquery.ui.widget.tooltip.TooltipBehavior; +import org.wicketstuff.kendo.ui.KendoUIBehavior; +import org.wicketstuff.kendo.ui.form.TextField; +import org.wicketstuff.kendo.ui.form.combobox.ComboBoxBehavior; import de.tudarmstadt.ukp.clarin.webanno.constraints.evaluator.PossibleValue; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureTraitsEditor.java index 9cc912a3ac3..8bd584f27d2 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/link/LinkFeatureTraitsEditor.java @@ -35,10 +35,9 @@ import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.spring.injection.annot.SpringBean; - -import com.googlecode.wicket.jquery.core.JQueryBehavior; -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.kendo.ui.form.multiselect.MultiSelect; +import org.wicketstuff.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.kendo.ui.form.multiselect.MultiSelect; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/misc/ReorderableTagAutoCompleteField.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/misc/ReorderableTagAutoCompleteField.java index 6f5aaa47f2b..2e776f9ae2e 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/misc/ReorderableTagAutoCompleteField.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/misc/ReorderableTagAutoCompleteField.java @@ -23,11 +23,10 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.util.convert.ConversionException; import org.apache.wicket.util.convert.IConverter; - -import com.googlecode.wicket.jquery.core.JQueryBehavior; -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.jquery.core.template.IJQueryTemplate; -import com.googlecode.wicket.kendo.ui.form.autocomplete.AutoCompleteTextField; +import org.wicketstuff.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.jquery.core.template.IJQueryTemplate; +import org.wicketstuff.kendo.ui.form.autocomplete.AutoCompleteTextField; import de.tudarmstadt.ukp.clarin.webanno.model.ReorderableTag; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java index b5a40341f26..06bf01df7db 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java @@ -33,11 +33,10 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.spring.injection.annot.SpringBean; - -import com.googlecode.wicket.jquery.core.JQueryBehavior; -import com.googlecode.wicket.jquery.core.template.IJQueryTemplate; -import com.googlecode.wicket.kendo.ui.form.multiselect.lazy.MultiSelect; -import com.googlecode.wicket.kendo.ui.renderer.ChoiceRenderer; +import org.wicketstuff.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.template.IJQueryTemplate; +import org.wicketstuff.kendo.ui.form.multiselect.lazy.MultiSelect; +import org.wicketstuff.kendo.ui.renderer.ChoiceRenderer; import de.tudarmstadt.ukp.clarin.webanno.model.ReorderableTag; import de.tudarmstadt.ukp.clarin.webanno.model.TagSet; @@ -128,7 +127,7 @@ public void addFeatureUpdateBehavior() @SuppressWarnings({ "unchecked", "rawtypes" }) private FormComponent createReadOnlyInput() { - var input = new com.googlecode.wicket.kendo.ui.form.multiselect. // + var input = new org.wicketstuff.kendo.ui.form.multiselect. // MultiSelect(CID_VALUE) { private static final long serialVersionUID = 1L; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureEditor.java index a914128342a..198fd85e0f6 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureEditor.java @@ -22,9 +22,8 @@ import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.spring.injection.annot.SpringBean; - -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.kendo.ui.form.NumberTextField; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.kendo.ui.form.NumberTextField; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureTraitsEditor.java index 9f6c0c3a2ba..d4945d09e28 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/number/NumberFeatureTraitsEditor.java @@ -33,9 +33,8 @@ import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.spring.injection.annot.SpringBean; - -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.kendo.ui.form.NumberTextField; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.kendo.ui.form.NumberTextField; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.inception.annotation.feature.misc.UimaPrimitiveFeatureSupport_ImplBase; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/ClassicKendoComboboxTextFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/ClassicKendoComboboxTextFeatureEditor.java index a1b8ff11ad8..dbec356399b 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/ClassicKendoComboboxTextFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/ClassicKendoComboboxTextFeatureEditor.java @@ -25,11 +25,10 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.request.cycle.RequestCycle; - -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.jquery.ui.widget.tooltip.TooltipBehavior; -import com.googlecode.wicket.kendo.ui.KendoUIBehavior; -import com.googlecode.wicket.kendo.ui.form.combobox.ComboBoxBehavior; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.jquery.ui.widget.tooltip.TooltipBehavior; +import org.wicketstuff.kendo.ui.KendoUIBehavior; +import org.wicketstuff.kendo.ui.form.combobox.ComboBoxBehavior; import de.tudarmstadt.ukp.clarin.webanno.model.Tag; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/InputFieldStringFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/InputFieldStringFeatureEditor.java index dbcb7bc78a9..b05a09b434e 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/InputFieldStringFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/InputFieldStringFeatureEditor.java @@ -24,8 +24,7 @@ import org.apache.wicket.markup.html.link.ExternalLink; import org.apache.wicket.model.IModel; import org.apache.wicket.validation.validator.UrlValidator; - -import com.googlecode.wicket.kendo.ui.form.TextField; +import org.wicketstuff.kendo.ui.form.TextField; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.keybindings.KeyBindingsPanel; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoChoiceDescriptionScriptReference.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoChoiceDescriptionScriptReference.java index b8d4bb6fa09..e13d2e4c12d 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoChoiceDescriptionScriptReference.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoChoiceDescriptionScriptReference.java @@ -25,9 +25,8 @@ import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.request.resource.JavaScriptResourceReference; - -import com.googlecode.wicket.jquery.core.template.IJQueryTemplate; -import com.googlecode.wicket.jquery.ui.settings.JQueryUILibrarySettings; +import org.wicketstuff.jquery.core.template.IJQueryTemplate; +import org.wicketstuff.jquery.ui.settings.JQueryUILibrarySettings; public class KendoChoiceDescriptionScriptReference extends JavaScriptResourceReference diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java index c8adcf2de83..5efe443adb1 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/KendoComboboxTextFeatureEditor.java @@ -32,12 +32,11 @@ import org.apache.wicket.model.PropertyModel; import org.apache.wicket.request.cycle.RequestCycle; import org.wicketstuff.event.annotation.OnEvent; - -import com.googlecode.wicket.jquery.core.JQueryBehavior; -import com.googlecode.wicket.jquery.core.template.IJQueryTemplate; -import com.googlecode.wicket.kendo.ui.KendoUIBehavior; -import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox; -import com.googlecode.wicket.kendo.ui.form.combobox.ComboBoxBehavior; +import org.wicketstuff.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.template.IJQueryTemplate; +import org.wicketstuff.kendo.ui.KendoUIBehavior; +import org.wicketstuff.kendo.ui.form.combobox.ComboBox; +import org.wicketstuff.kendo.ui.form.combobox.ComboBoxBehavior; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.keybindings.KeyBindingsPanel; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureTraitsEditor.java index 2d48c158931..c27d69ef1f8 100644 --- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureTraitsEditor.java +++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureTraitsEditor.java @@ -33,9 +33,8 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.spring.injection.annot.SpringBean; - -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.kendo.ui.form.NumberTextField; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.kendo.ui.form.NumberTextField; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.keybindings.KeyBindingsConfigurationPanel; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; diff --git a/inception/inception-api-editor/pom.xml b/inception/inception-api-editor/pom.xml index 8478b3e2952..a3636d6f11d 100644 --- a/inception/inception-api-editor/pom.xml +++ b/inception/inception-api-editor/pom.xml @@ -93,8 +93,8 @@ wicket-spring - com.googlecode.wicket-jquery-ui - wicket-jquery-ui + org.wicketstuff + wicketstuff-jquery-ui diff --git a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtension.java b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtension.java index 128ca153a4a..1e3d4e5e8da 100644 --- a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtension.java +++ b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtension.java @@ -23,8 +23,7 @@ import org.apache.uima.cas.CAS; import org.apache.wicket.ajax.AjaxRequestTarget; - -import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem; +import org.wicketstuff.jquery.ui.widget.menu.IMenuItem; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; diff --git a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistry.java b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistry.java index b7b3eb0a755..2c432d37a2d 100644 --- a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistry.java +++ b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistry.java @@ -22,8 +22,7 @@ import org.apache.uima.cas.CAS; import org.apache.wicket.ajax.AjaxRequestTarget; - -import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem; +import org.wicketstuff.jquery.ui.widget.menu.IMenuItem; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState; diff --git a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistryImpl.java b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistryImpl.java index a377b527346..23946c739af 100644 --- a/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistryImpl.java +++ b/inception/inception-api-editor/src/main/java/de/tudarmstadt/ukp/inception/editor/AnnotationEditorExtensionRegistryImpl.java @@ -33,8 +33,7 @@ import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.context.event.EventListener; import org.springframework.core.annotation.AnnotationAwareOrderComparator; - -import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem; +import org.wicketstuff.jquery.ui.widget.menu.IMenuItem; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; import de.tudarmstadt.ukp.inception.editor.config.AnnotationEditorAutoConfiguration; diff --git a/inception/inception-app-webapp/pom.xml b/inception/inception-app-webapp/pom.xml index f62e01a81fb..81523bf9a34 100644 --- a/inception/inception-app-webapp/pom.xml +++ b/inception/inception-app-webapp/pom.xml @@ -450,12 +450,12 @@ rhino-runtime - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-theme-uilightness + org.wicketstuff + wicketstuff-jquery-ui-theme-uilightness - com.googlecode.wicket-jquery-ui - wicket-kendo-ui-theme-bootstrap + org.wicketstuff + wicketstuff-kendo-ui-theme-bootstrap @@ -1005,8 +1005,8 @@ io.sentry:sentry-spring-boot-starter io.sentry:sentry-log4j2 - com.googlecode.wicket-jquery-ui:wicket-kendo-ui-theme-bootstrap - com.googlecode.wicket-jquery-ui:wicket-jquery-ui-theme-uilightness + org.wicketstuff:wicketstuff-kendo-ui-theme-bootstrap + org.wicketstuff:wicketstuff-jquery-ui-theme-uilightness org.wicketstuff:wicketstuff-htmlcompressor org.mozilla:rhino-runtime diff --git a/inception/inception-dependencies/pom.xml b/inception/inception-dependencies/pom.xml index cf889db6796..69a55216b0b 100644 --- a/inception/inception-dependencies/pom.xml +++ b/inception/inception-dependencies/pom.xml @@ -202,34 +202,32 @@ ${awaitility.version} - + - com.googlecode.wicket-jquery-ui - wicket-jquery-ui - ${wicket-jquery-ui.version} + org.wicketstuff + wicketstuff-jquery-ui + ${wicketstuff.version} - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-core - ${wicket-jquery-ui.version} + org.wicketstuff + wicketstuff-jquery-ui-core + ${wicketstuff.version} - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-theme-uilightness - ${wicket-jquery-ui.version} + org.wicketstuff + wicketstuff-jquery-ui-theme-uilightness + ${wicketstuff.version} - com.googlecode.wicket-jquery-ui - wicket-kendo-ui - ${wicket-jquery-ui.version} + org.wicketstuff + wicketstuff-kendo-ui + ${wicketstuff.version} - com.googlecode.wicket-jquery-ui - wicket-kendo-ui-theme-bootstrap - ${wicket-jquery-ui.version} + org.wicketstuff + wicketstuff-kendo-ui-theme-bootstrap + ${wicketstuff.version} - - org.wicketstuff wicketstuff-htmlcompressor diff --git a/inception/inception-diag/pom.xml b/inception/inception-diag/pom.xml index fd8d4ec2ca7..bda147a41e1 100644 --- a/inception/inception-diag/pom.xml +++ b/inception/inception-diag/pom.xml @@ -100,8 +100,8 @@ - javax.persistence - javax.persistence-api + jakarta.persistence + jakarta.persistence-api diff --git a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingRelationsRepair.java b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingRelationsRepair.java index af2d946f5e2..2783d1cbeb6 100644 --- a/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingRelationsRepair.java +++ b/inception/inception-diag/src/main/java/de/tudarmstadt/ukp/clarin/webanno/diag/repairs/RemoveDanglingRelationsRepair.java @@ -24,8 +24,6 @@ import java.util.LinkedHashSet; import java.util.List; -import javax.persistence.NoResultException; - import org.apache.uima.cas.CAS; import org.apache.uima.cas.Feature; import org.apache.uima.cas.FeatureStructure; @@ -37,6 +35,7 @@ import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService; import de.tudarmstadt.ukp.inception.schema.api.adapter.TypeAdapter; import de.tudarmstadt.ukp.inception.support.logging.LogMessage; +import jakarta.persistence.NoResultException; /** * Removes relations that were not properly cleaned up after deleting a source/target span. Such diff --git a/inception/inception-diam/pom.xml b/inception/inception-diam/pom.xml index 1fd9208f201..be58becb998 100644 --- a/inception/inception-diam/pom.xml +++ b/inception/inception-diam/pom.xml @@ -156,8 +156,8 @@ wicket-spring - com.googlecode.wicket-jquery-ui - wicket-jquery-ui + org.wicketstuff + wicketstuff-jquery-ui diff --git a/inception/inception-feature-lookup/pom.xml b/inception/inception-feature-lookup/pom.xml index 516b14b43f2..542db344585 100644 --- a/inception/inception-feature-lookup/pom.xml +++ b/inception/inception-feature-lookup/pom.xml @@ -89,12 +89,12 @@ wicketstuff-annotationeventdispatcher - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-core + org.wicketstuff + wicketstuff-jquery-ui-core diff --git a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupEntryTemplate.java b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupEntryTemplate.java index 664e7da4a99..109539ac596 100644 --- a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupEntryTemplate.java +++ b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupEntryTemplate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; -import com.googlecode.wicket.jquery.core.template.IJQueryTemplate; +import org.wicketstuff.jquery.core.template.IJQueryTemplate; final class LookupEntryTemplate implements IJQueryTemplate diff --git a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureEditor.java b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureEditor.java index 63b2e417371..52c98662391 100644 --- a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureEditor.java +++ b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureEditor.java @@ -51,12 +51,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.wicketstuff.event.annotation.OnEvent; - -import com.googlecode.wicket.jquery.core.JQueryBehavior; -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.jquery.core.renderer.TextRenderer; -import com.googlecode.wicket.jquery.core.template.IJQueryTemplate; -import com.googlecode.wicket.kendo.ui.form.autocomplete.AutoCompleteTextField; +import org.wicketstuff.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.jquery.core.renderer.TextRenderer; +import org.wicketstuff.jquery.core.template.IJQueryTemplate; +import org.wicketstuff.kendo.ui.form.autocomplete.AutoCompleteTextField; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.inception.annotation.feature.string.KendoChoiceDescriptionScriptReference; diff --git a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureTraitsEditor.java b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureTraitsEditor.java index fe4788a8e8d..64f1441792d 100644 --- a/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureTraitsEditor.java +++ b/inception/inception-feature-lookup/src/main/java/de/tudarmstadt/ukp/inception/feature/lookup/LookupFeatureTraitsEditor.java @@ -33,9 +33,8 @@ import org.apache.wicket.model.PropertyModel; import org.apache.wicket.spring.injection.annot.SpringBean; import org.apache.wicket.validation.validator.UrlValidator; - -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.kendo.ui.form.NumberTextField; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.kendo.ui.form.NumberTextField; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.inception.feature.lookup.config.LookupServiceProperties; diff --git a/inception/inception-image/pom.xml b/inception/inception-image/pom.xml index 4207168afdb..5bddac1205a 100644 --- a/inception/inception-image/pom.xml +++ b/inception/inception-image/pom.xml @@ -113,8 +113,8 @@ wicketstuff-annotationeventdispatcher - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui de.agilecoders.wicket diff --git a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureEditor.java b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureEditor.java index d89613311c6..46136ec3126 100644 --- a/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureEditor.java +++ b/inception/inception-image/src/main/java/de/tudarmstadt/ukp/inception/image/feature/ImageFeatureEditor.java @@ -29,8 +29,7 @@ import org.apache.wicket.validation.validator.UrlValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import com.googlecode.wicket.kendo.ui.form.TextField; +import org.wicketstuff.kendo.ui.form.TextField; import de.tudarmstadt.ukp.inception.rendering.editorstate.FeatureState; import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureEditor; diff --git a/inception/inception-imls-elg/pom.xml b/inception/inception-imls-elg/pom.xml index 67e3561a3ca..05f5edd8a3a 100644 --- a/inception/inception-imls-elg/pom.xml +++ b/inception/inception-imls-elg/pom.xml @@ -85,12 +85,12 @@ wicket-spring - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-core + org.wicketstuff + wicketstuff-jquery-ui-core org.danekja diff --git a/inception/inception-imls-elg/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/elg/ElgCatalogSearchField.java b/inception/inception-imls-elg/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/elg/ElgCatalogSearchField.java index 378989cb0fd..7ef42cd12d9 100644 --- a/inception/inception-imls-elg/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/elg/ElgCatalogSearchField.java +++ b/inception/inception-imls-elg/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/elg/ElgCatalogSearchField.java @@ -23,9 +23,8 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.spring.injection.annot.SpringBean; - -import com.googlecode.wicket.jquery.core.renderer.TextRenderer; -import com.googlecode.wicket.kendo.ui.form.autocomplete.AutoCompleteTextField; +import org.wicketstuff.jquery.core.renderer.TextRenderer; +import org.wicketstuff.kendo.ui.form.autocomplete.AutoCompleteTextField; import de.tudarmstadt.ukp.inception.recommendation.imls.elg.client.ElgCatalogClient; import de.tudarmstadt.ukp.inception.recommendation.imls.elg.model.ElgCatalogEntity; diff --git a/inception/inception-imls-hf/pom.xml b/inception/inception-imls-hf/pom.xml index 6263ea14524..f75edc7bf95 100644 --- a/inception/inception-imls-hf/pom.xml +++ b/inception/inception-imls-hf/pom.xml @@ -78,12 +78,12 @@ wicket-spring - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-core + org.wicketstuff + wicketstuff-jquery-ui-core org.danekja diff --git a/inception/inception-imls-hf/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/hf/HfModelSearchField.java b/inception/inception-imls-hf/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/hf/HfModelSearchField.java index f05bc3bda85..1451c53505e 100644 --- a/inception/inception-imls-hf/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/hf/HfModelSearchField.java +++ b/inception/inception-imls-hf/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/hf/HfModelSearchField.java @@ -25,9 +25,8 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.spring.injection.annot.SpringBean; - -import com.googlecode.wicket.jquery.core.renderer.TextRenderer; -import com.googlecode.wicket.kendo.ui.form.autocomplete.AutoCompleteTextField; +import org.wicketstuff.jquery.core.renderer.TextRenderer; +import org.wicketstuff.kendo.ui.form.autocomplete.AutoCompleteTextField; import de.tudarmstadt.ukp.inception.recommendation.imls.hf.client.HfHubClient; import de.tudarmstadt.ukp.inception.recommendation.imls.hf.model.HfModelCard; diff --git a/inception/inception-imls-ollama/pom.xml b/inception/inception-imls-ollama/pom.xml index 60fffb975a9..ce171990323 100644 --- a/inception/inception-imls-ollama/pom.xml +++ b/inception/inception-imls-ollama/pom.xml @@ -94,8 +94,8 @@ wicket-spring - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui org.danekja diff --git a/inception/inception-imls-ollama/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/ollama/OllamaRecommenderTraitsEditor.java b/inception/inception-imls-ollama/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/ollama/OllamaRecommenderTraitsEditor.java index a85f56383a4..b1f4ace0bdc 100644 --- a/inception/inception-imls-ollama/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/ollama/OllamaRecommenderTraitsEditor.java +++ b/inception/inception-imls-ollama/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/ollama/OllamaRecommenderTraitsEditor.java @@ -48,10 +48,9 @@ import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.spring.injection.annot.SpringBean; import org.apache.wicket.validation.validator.UrlValidator; - -import com.googlecode.wicket.kendo.ui.KendoUIBehavior; -import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox; -import com.googlecode.wicket.kendo.ui.form.combobox.ComboBoxBehavior; +import org.wicketstuff.kendo.ui.KendoUIBehavior; +import org.wicketstuff.kendo.ui.form.combobox.ComboBox; +import org.wicketstuff.kendo.ui.form.combobox.ComboBoxBehavior; import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender; diff --git a/inception/inception-imls-weblicht/pom.xml b/inception/inception-imls-weblicht/pom.xml index a16b07fd395..a966a48ad8a 100644 --- a/inception/inception-imls-weblicht/pom.xml +++ b/inception/inception-imls-weblicht/pom.xml @@ -148,8 +148,8 @@ wicket-spring - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui de.agilecoders.wicket diff --git a/inception/inception-imls-weblicht/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/weblicht/traits/WeblichtRecommenderTraitsEditor.java b/inception/inception-imls-weblicht/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/weblicht/traits/WeblichtRecommenderTraitsEditor.java index d88b395a49c..72d87fcd487 100644 --- a/inception/inception-imls-weblicht/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/weblicht/traits/WeblichtRecommenderTraitsEditor.java +++ b/inception/inception-imls-weblicht/src/main/java/de/tudarmstadt/ukp/inception/recommendation/imls/weblicht/traits/WeblichtRecommenderTraitsEditor.java @@ -46,8 +46,7 @@ import org.apache.wicket.validation.validator.UrlValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox; +import org.wicketstuff.kendo.ui.form.combobox.ComboBox; import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.DateTextField; import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.FileInputConfig; diff --git a/inception/inception-kb-fact-linking/pom.xml b/inception/inception-kb-fact-linking/pom.xml index 577595d2b20..984a38050a1 100644 --- a/inception/inception-kb-fact-linking/pom.xml +++ b/inception/inception-kb-fact-linking/pom.xml @@ -124,12 +124,12 @@ wicketstuff-annotationeventdispatcher - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-core + org.wicketstuff + wicketstuff-jquery-ui-core - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui org.danekja diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureEditor.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureEditor.java index 008b54bae19..a1c70e303f3 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureEditor.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/PropertyFeatureEditor.java @@ -34,11 +34,10 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import com.googlecode.wicket.jquery.core.JQueryBehavior; -import com.googlecode.wicket.jquery.core.renderer.TextRenderer; -import com.googlecode.wicket.jquery.core.template.IJQueryTemplate; -import com.googlecode.wicket.kendo.ui.form.autocomplete.AutoCompleteTextField; +import org.wicketstuff.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.renderer.TextRenderer; +import org.wicketstuff.jquery.core.template.IJQueryTemplate; +import org.wicketstuff.kendo.ui.form.autocomplete.AutoCompleteTextField; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/QualifierFeatureEditor.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/QualifierFeatureEditor.java index 240b4928fff..31bd8d9d396 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/QualifierFeatureEditor.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/QualifierFeatureEditor.java @@ -53,11 +53,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.wicketstuff.event.annotation.OnEvent; - -import com.googlecode.wicket.jquery.core.JQueryBehavior; -import com.googlecode.wicket.jquery.core.renderer.TextRenderer; -import com.googlecode.wicket.jquery.core.template.IJQueryTemplate; -import com.googlecode.wicket.kendo.ui.form.autocomplete.AutoCompleteTextField; +import org.wicketstuff.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.renderer.TextRenderer; +import org.wicketstuff.jquery.core.template.IJQueryTemplate; +import org.wicketstuff.kendo.ui.form.autocomplete.AutoCompleteTextField; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; diff --git a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureEditor.java b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureEditor.java index cccb94d7b40..9b837138707 100644 --- a/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureEditor.java +++ b/inception/inception-kb-fact-linking/src/main/java/de/tudarmstadt/ukp/inception/kb/factlinking/feature/SubjectObjectFeatureEditor.java @@ -49,11 +49,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.wicketstuff.event.annotation.OnEvent; - -import com.googlecode.wicket.jquery.core.JQueryBehavior; -import com.googlecode.wicket.jquery.core.renderer.TextRenderer; -import com.googlecode.wicket.jquery.core.template.IJQueryTemplate; -import com.googlecode.wicket.kendo.ui.form.autocomplete.AutoCompleteTextField; +import org.wicketstuff.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.renderer.TextRenderer; +import org.wicketstuff.jquery.core.template.IJQueryTemplate; +import org.wicketstuff.kendo.ui.form.autocomplete.AutoCompleteTextField; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer; diff --git a/inception/inception-recommendation/pom.xml b/inception/inception-recommendation/pom.xml index 2e4a233cf87..159e959f24f 100644 --- a/inception/inception-recommendation/pom.xml +++ b/inception/inception-recommendation/pom.xml @@ -212,12 +212,12 @@ wicket-util - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-core + org.wicketstuff + wicketstuff-jquery-ui-core - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui org.apache.wicket diff --git a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebar.java b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebar.java index 4bfcfa6c398..e3439ecda85 100644 --- a/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebar.java +++ b/inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/sidebar/RecommendationSidebar.java @@ -41,9 +41,8 @@ import org.apache.wicket.model.util.ListModel; import org.apache.wicket.spring.injection.annot.SpringBean; import org.wicketstuff.event.annotation.OnEvent; - -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.kendo.ui.widget.tooltip.TooltipBehavior; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.kendo.ui.widget.tooltip.TooltipBehavior; import de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasProvider; import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; diff --git a/inception/inception-sharing/pom.xml b/inception/inception-sharing/pom.xml index f1ed3b7c6b7..c57d0b96d98 100644 --- a/inception/inception-sharing/pom.xml +++ b/inception/inception-sharing/pom.xml @@ -143,8 +143,8 @@ wicket-bootstrap-extensions - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui org.danekja diff --git a/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/project/InviteProjectSettingsPanel.java b/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/project/InviteProjectSettingsPanel.java index d16f2f630d4..df00cd214f4 100644 --- a/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/project/InviteProjectSettingsPanel.java +++ b/inception/inception-sharing/src/main/java/de/tudarmstadt/ukp/inception/sharing/project/InviteProjectSettingsPanel.java @@ -38,8 +38,7 @@ import org.apache.wicket.model.ResourceModel; import org.apache.wicket.spring.injection.annot.SpringBean; import org.wicketstuff.clipboardjs.ClipboardJsBehavior; - -import com.googlecode.wicket.kendo.ui.form.datetime.DatePicker; +import org.wicketstuff.kendo.ui.form.datetime.DatePicker; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.ui.core.settings.ProjectSettingsPanelBase; diff --git a/inception/inception-support/pom.xml b/inception/inception-support/pom.xml index e31a2dc5b09..41da6181025 100644 --- a/inception/inception-support/pom.xml +++ b/inception/inception-support/pom.xml @@ -124,16 +124,16 @@ wicket-spring - com.googlecode.wicket-jquery-ui - wicket-jquery-ui + org.wicketstuff + wicketstuff-jquery-ui - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-core + org.wicketstuff + wicketstuff-jquery-ui-core - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui org.wicketstuff diff --git a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/jquery/JQueryUIResourceBehavior.java b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/jquery/JQueryUIResourceBehavior.java index 42189056b6c..30ff912e23a 100644 --- a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/jquery/JQueryUIResourceBehavior.java +++ b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/jquery/JQueryUIResourceBehavior.java @@ -21,8 +21,7 @@ import org.apache.wicket.behavior.Behavior; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; - -import com.googlecode.wicket.jquery.ui.settings.JQueryUILibrarySettings; +import org.wicketstuff.jquery.ui.settings.JQueryUILibrarySettings; public class JQueryUIResourceBehavior extends Behavior diff --git a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/kendo/KendoResourceBehavior.java b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/kendo/KendoResourceBehavior.java index df0e4887e5b..805b1789e0e 100644 --- a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/kendo/KendoResourceBehavior.java +++ b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/kendo/KendoResourceBehavior.java @@ -22,8 +22,7 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; - -import com.googlecode.wicket.kendo.ui.settings.KendoUILibrarySettings; +import org.wicketstuff.kendo.ui.settings.KendoUILibrarySettings; public class KendoResourceBehavior extends Behavior diff --git a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/kendo/KendoStyleUtils.java b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/kendo/KendoStyleUtils.java index 9b42809f5a8..786e373a37c 100644 --- a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/kendo/KendoStyleUtils.java +++ b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/kendo/KendoStyleUtils.java @@ -19,7 +19,7 @@ import static java.lang.String.join; -import com.googlecode.wicket.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.JQueryBehavior; public class KendoStyleUtils { diff --git a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/lambda/LambdaMenuItem.java b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/lambda/LambdaMenuItem.java index 810c2a53cb5..eab5c96785f 100644 --- a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/lambda/LambdaMenuItem.java +++ b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/lambda/LambdaMenuItem.java @@ -24,8 +24,7 @@ import org.apache.wicket.request.cycle.PageRequestHandlerTracker; import org.apache.wicket.request.cycle.RequestCycle; import org.slf4j.LoggerFactory; - -import com.googlecode.wicket.jquery.ui.widget.menu.MenuItem; +import org.wicketstuff.jquery.ui.widget.menu.MenuItem; import de.tudarmstadt.ukp.inception.support.wicket.CommonException; diff --git a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/lambda/MenuCategoryHeader.java b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/lambda/MenuCategoryHeader.java index 97c8682ba36..7fee0af7b99 100644 --- a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/lambda/MenuCategoryHeader.java +++ b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/lambda/MenuCategoryHeader.java @@ -20,9 +20,8 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; - -import com.googlecode.wicket.jquery.ui.JQueryIcon; -import com.googlecode.wicket.jquery.ui.widget.menu.AbstractMenuItem; +import org.wicketstuff.jquery.ui.JQueryIcon; +import org.wicketstuff.jquery.ui.widget.menu.AbstractMenuItem; public class MenuCategoryHeader extends AbstractMenuItem diff --git a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/wicket/ContextMenu.java b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/wicket/ContextMenu.java index e3685c0aca3..925c34bb6be 100644 --- a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/wicket/ContextMenu.java +++ b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/wicket/ContextMenu.java @@ -25,11 +25,10 @@ import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; - -import com.googlecode.wicket.jquery.ui.widget.menu.ContextMenuBehavior; +import org.wicketstuff.jquery.ui.widget.menu.ContextMenuBehavior; public class ContextMenu - extends com.googlecode.wicket.jquery.ui.widget.menu.ContextMenu + extends org.wicketstuff.jquery.ui.widget.menu.ContextMenu { private static final long serialVersionUID = -1839334030165463085L; diff --git a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/wicket/DescriptionTooltipBehavior.java b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/wicket/DescriptionTooltipBehavior.java index c89fa93fa73..0d821e51e83 100644 --- a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/wicket/DescriptionTooltipBehavior.java +++ b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/wicket/DescriptionTooltipBehavior.java @@ -25,9 +25,8 @@ import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; - -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.jquery.ui.widget.tooltip.CustomTooltipBehavior; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.jquery.ui.widget.tooltip.CustomTooltipBehavior; import de.tudarmstadt.ukp.inception.support.markdown.MarkdownLabel; diff --git a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/wicket/StyledComboBox.java b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/wicket/StyledComboBox.java index 297fb590c40..d6cf1e640ac 100644 --- a/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/wicket/StyledComboBox.java +++ b/inception/inception-support/src/main/java/de/tudarmstadt/ukp/inception/support/wicket/StyledComboBox.java @@ -22,10 +22,9 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.model.IModel; - -import com.googlecode.wicket.jquery.core.renderer.IChoiceRenderer; -import com.googlecode.wicket.jquery.core.template.IJQueryTemplate; -import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox; +import org.wicketstuff.jquery.core.renderer.IChoiceRenderer; +import org.wicketstuff.jquery.core.template.IJQueryTemplate; +import org.wicketstuff.kendo.ui.form.combobox.ComboBox; public class StyledComboBox extends ComboBox diff --git a/inception/inception-telemetry/pom.xml b/inception/inception-telemetry/pom.xml index 1bb556133d1..c49d114a806 100644 --- a/inception/inception-telemetry/pom.xml +++ b/inception/inception-telemetry/pom.xml @@ -102,12 +102,12 @@ wicketstuff-annotation - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-core + org.wicketstuff + wicketstuff-jquery-ui-core org.danekja diff --git a/inception/inception-telemetry/src/main/java/de/tudarmstadt/ukp/clarin/webanno/telemetry/matomo/ToggleBox.java b/inception/inception-telemetry/src/main/java/de/tudarmstadt/ukp/clarin/webanno/telemetry/matomo/ToggleBox.java index 9f94f660896..21d050f52fb 100644 --- a/inception/inception-telemetry/src/main/java/de/tudarmstadt/ukp/clarin/webanno/telemetry/matomo/ToggleBox.java +++ b/inception/inception-telemetry/src/main/java/de/tudarmstadt/ukp/clarin/webanno/telemetry/matomo/ToggleBox.java @@ -20,10 +20,9 @@ import static java.util.Arrays.asList; import org.apache.wicket.markup.html.form.IChoiceRenderer; - -import com.googlecode.wicket.jquery.core.JQueryBehavior; -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.kendo.ui.form.dropdown.DropDownList; +import org.wicketstuff.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.kendo.ui.form.dropdown.DropDownList; public class ToggleBox extends DropDownList diff --git a/inception/inception-ui-annotation/pom.xml b/inception/inception-ui-annotation/pom.xml index a8cf6456d2e..f15d6fa739f 100644 --- a/inception/inception-ui-annotation/pom.xml +++ b/inception/inception-ui-annotation/pom.xml @@ -106,8 +106,8 @@ - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui diff --git a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/FeatureEditorListPanel.java b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/FeatureEditorListPanel.java index f2ac1d311e5..274ea25fe64 100644 --- a/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/FeatureEditorListPanel.java +++ b/inception/inception-ui-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/annotation/detail/FeatureEditorListPanel.java @@ -44,8 +44,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.wicketstuff.event.annotation.OnEvent; - -import com.googlecode.wicket.kendo.ui.form.TextField; +import org.wicketstuff.kendo.ui.form.TextField; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; diff --git a/inception/inception-ui-core/pom.xml b/inception/inception-ui-core/pom.xml index fad3eeb4417..72a58244308 100644 --- a/inception/inception-ui-core/pom.xml +++ b/inception/inception-ui-core/pom.xml @@ -157,8 +157,8 @@ wicket-extensions - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui org.apache.wicket diff --git a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/WicketApplicationBase.java b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/WicketApplicationBase.java index 30f88ea3c63..923ad8ea668 100644 --- a/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/WicketApplicationBase.java +++ b/inception/inception-ui-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/WicketApplicationBase.java @@ -70,12 +70,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.wicketstuff.kendo.ui.form.TextField; +import org.wicketstuff.kendo.ui.form.autocomplete.AutoCompleteTextField; +import org.wicketstuff.kendo.ui.form.combobox.ComboBox; +import org.wicketstuff.kendo.ui.form.multiselect.MultiSelect; import com.giffing.wicket.spring.boot.starter.app.WicketBootSecuredWebApplication; -import com.googlecode.wicket.kendo.ui.form.TextField; -import com.googlecode.wicket.kendo.ui.form.autocomplete.AutoCompleteTextField; -import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox; -import com.googlecode.wicket.kendo.ui.form.multiselect.MultiSelect; import de.agilecoders.wicket.core.Bootstrap; import de.agilecoders.wicket.core.settings.IBootstrapSettings; @@ -251,6 +251,8 @@ private void initPageRequestTracker() protected void initWebFrameworks() { + WicketWebjars.install(this); + initJQueryResourceReference(); addJQueryJavascriptToAllPages(); @@ -272,8 +274,6 @@ protected void initWebFrameworks() protected void initBootstrap() { - WicketWebjars.install(this); - Bootstrap.install(this); IBootstrapSettings settings = Bootstrap.getSettings(this); @@ -321,7 +321,7 @@ protected void addKendoComponentsDisabledLookFix() getComponentInstantiationListeners().add(component -> { if (component instanceof ComboBox || component instanceof AutoCompleteTextField || component instanceof TextField || component instanceof MultiSelect - || component instanceof com.googlecode.wicket.kendo.ui.form.multiselect.lazy.MultiSelect) { + || component instanceof org.wicketstuff.kendo.ui.form.multiselect.lazy.MultiSelect) { component.add(new KendoFixDisabledInputComponentStylingBehavior()); } }); diff --git a/inception/inception-ui-curation/pom.xml b/inception/inception-ui-curation/pom.xml index cf1f938a828..826a2dc473b 100644 --- a/inception/inception-ui-curation/pom.xml +++ b/inception/inception-ui-curation/pom.xml @@ -202,16 +202,16 @@ wicket-bootstrap-extensions - com.googlecode.wicket-jquery-ui - wicket-jquery-ui + org.wicketstuff + wicketstuff-jquery-ui - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-core + org.wicketstuff + wicketstuff-jquery-ui-core - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui org.wicketstuff diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/AnnotatorsPanel.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/AnnotatorsPanel.java index 2eb85d000b5..4af33bb104a 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/AnnotatorsPanel.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/AnnotatorsPanel.java @@ -61,8 +61,7 @@ import org.apache.wicket.util.string.StringValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem; +import org.wicketstuff.jquery.ui.widget.menu.IMenuItem; import de.tudarmstadt.ukp.clarin.webanno.brat.schema.BratSchemaGenerator; import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.Configuration; diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/BratSuggestionVisualizer.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/BratSuggestionVisualizer.java index 7745e64f616..89f95033bbe 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/BratSuggestionVisualizer.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/component/BratSuggestionVisualizer.java @@ -50,8 +50,7 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import com.googlecode.wicket.jquery.ui.settings.JQueryUILibrarySettings; +import org.wicketstuff.jquery.ui.settings.JQueryUILibrarySettings; import de.agilecoders.wicket.core.markup.html.bootstrap.image.Icon; import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType; diff --git a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java index 27c9afdd16d..4742b721a26 100644 --- a/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java +++ b/inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java @@ -63,10 +63,9 @@ import org.slf4j.LoggerFactory; import org.wicketstuff.annotation.mount.MountPath; import org.wicketstuff.event.annotation.OnEvent; - -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.kendo.ui.widget.splitter.SplitterAdapter; -import com.googlecode.wicket.kendo.ui.widget.splitter.SplitterBehavior; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.kendo.ui.widget.splitter.SplitterAdapter; +import org.wicketstuff.kendo.ui.widget.splitter.SplitterBehavior; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.actionbar.ActionBar; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.page.AnnotationPageBase; diff --git a/inception/inception-ui-kb/pom.xml b/inception/inception-ui-kb/pom.xml index cff8aaf84c7..a98112d5d18 100644 --- a/inception/inception-ui-kb/pom.xml +++ b/inception/inception-ui-kb/pom.xml @@ -211,12 +211,12 @@ wicketstuff-annotationeventdispatcher - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-core + org.wicketstuff + wicketstuff-jquery-ui-core - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui org.danekja diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/AbstractInfoPanel.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/AbstractInfoPanel.java index 1fe62723e6c..abf43722894 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/AbstractInfoPanel.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/AbstractInfoPanel.java @@ -38,9 +38,8 @@ import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.spring.injection.annot.SpringBean; import org.eclipse.rdf4j.model.Statement; - -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.kendo.ui.widget.tooltip.TooltipBehavior; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.kendo.ui.widget.tooltip.TooltipBehavior; import de.tudarmstadt.ukp.inception.bootstrap.BootstrapModalDialog; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/IriInfoBadge.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/IriInfoBadge.java index 796a25e88f4..fb27b8abf0d 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/IriInfoBadge.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/IriInfoBadge.java @@ -20,9 +20,8 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; - -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.kendo.ui.widget.tooltip.TooltipBehavior; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.kendo.ui.widget.tooltip.TooltipBehavior; public class IriInfoBadge extends Panel diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.java index 83582225658..b5e0d76105b 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureEditor.java @@ -47,8 +47,7 @@ import org.apache.wicket.validation.validator.UrlValidator; import org.danekja.java.util.function.serializable.SerializableFunction; import org.wicketstuff.event.annotation.OnEvent; - -import com.googlecode.wicket.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.JQueryBehavior; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.keybindings.KeyBindingsPanel; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/DisabledKBWarning.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/DisabledKBWarning.java index 1532efdac63..41cb61b87bc 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/DisabledKBWarning.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/DisabledKBWarning.java @@ -24,9 +24,8 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.StringResourceModel; import org.apache.wicket.spring.injection.annot.SpringBean; - -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.kendo.ui.widget.tooltip.TooltipBehavior; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.kendo.ui.widget.tooltip.TooltipBehavior; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/KBHandleTemplate.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/KBHandleTemplate.java index 5772238a808..fe2edf5a6b3 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/KBHandleTemplate.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/KBHandleTemplate.java @@ -23,8 +23,7 @@ import java.util.List; import org.apache.wicket.Application; - -import com.googlecode.wicket.jquery.core.template.IJQueryTemplate; +import org.wicketstuff.jquery.core.template.IJQueryTemplate; final class KBHandleTemplate implements IJQueryTemplate diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/KnowledgeBaseItemAutoCompleteField.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/KnowledgeBaseItemAutoCompleteField.java index cc525a8c2a1..8e984f8d427 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/KnowledgeBaseItemAutoCompleteField.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/KnowledgeBaseItemAutoCompleteField.java @@ -22,13 +22,12 @@ import org.apache.commons.lang3.Validate; import org.apache.wicket.model.IModel; import org.danekja.java.util.function.serializable.SerializableFunction; - -import com.googlecode.wicket.jquery.core.JQueryBehavior; -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.jquery.core.renderer.ITextRenderer; -import com.googlecode.wicket.jquery.core.renderer.TextRenderer; -import com.googlecode.wicket.jquery.core.template.IJQueryTemplate; -import com.googlecode.wicket.kendo.ui.form.autocomplete.AutoCompleteTextField; +import org.wicketstuff.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.jquery.core.renderer.ITextRenderer; +import org.wicketstuff.jquery.core.renderer.TextRenderer; +import org.wicketstuff.jquery.core.template.IJQueryTemplate; +import org.wicketstuff.kendo.ui.form.autocomplete.AutoCompleteTextField; import de.tudarmstadt.ukp.inception.kb.graph.KBHandle; import de.tudarmstadt.ukp.inception.support.kendo.KendoStyleUtils; diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureEditor.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureEditor.java index 1a765f4cbcd..6225dc69996 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureEditor.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/MultiValueConceptFeatureEditor.java @@ -25,11 +25,10 @@ import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.model.IModel; import org.apache.wicket.spring.injection.annot.SpringBean; - -import com.googlecode.wicket.jquery.core.JQueryBehavior; -import com.googlecode.wicket.jquery.core.template.IJQueryTemplate; -import com.googlecode.wicket.kendo.ui.form.multiselect.lazy.MultiSelect; -import com.googlecode.wicket.kendo.ui.renderer.ChoiceRenderer; +import org.wicketstuff.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.template.IJQueryTemplate; +import org.wicketstuff.kendo.ui.form.multiselect.lazy.MultiSelect; +import org.wicketstuff.kendo.ui.renderer.ChoiceRenderer; import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationFeature; import de.tudarmstadt.ukp.inception.editor.action.AnnotationActionHandler; @@ -114,7 +113,7 @@ private FormComponent> createEditableInput() @SuppressWarnings({ "unchecked", "rawtypes" }) private FormComponent> createReadOnlyInput() { - var input = new com.googlecode.wicket.kendo.ui.form.multiselect. // + var input = new org.wicketstuff.kendo.ui.form.multiselect. // MultiSelect(CID_VALUE) { private static final long serialVersionUID = 1L; diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/GeneralSettingsPanel.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/GeneralSettingsPanel.java index 2869fe9b1ec..3019fe79cba 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/GeneralSettingsPanel.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/GeneralSettingsPanel.java @@ -31,8 +31,7 @@ import org.apache.wicket.validation.IValidatable; import org.apache.wicket.validation.IValidator; import org.apache.wicket.validation.ValidationError; - -import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox; +import org.wicketstuff.kendo.ui.form.combobox.ComboBox; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.inception.kb.IriConstants; diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/KnowledgeBaseIriPanel.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/KnowledgeBaseIriPanel.java index 5bdf55baac7..d4c09d60555 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/KnowledgeBaseIriPanel.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/KnowledgeBaseIriPanel.java @@ -37,8 +37,7 @@ import org.apache.wicket.model.Model; import org.apache.wicket.spring.injection.annot.SpringBean; import org.eclipse.rdf4j.model.IRI; - -import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox; +import org.wicketstuff.kendo.ui.form.combobox.ComboBox; import de.tudarmstadt.ukp.inception.kb.IriConstants; import de.tudarmstadt.ukp.inception.kb.KnowledgeBaseService; diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/value/editor/IRIValueEditor.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/value/editor/IRIValueEditor.java index b5bd6a55578..82f4b1173f6 100644 --- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/value/editor/IRIValueEditor.java +++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/value/editor/IRIValueEditor.java @@ -35,9 +35,8 @@ import org.eclipse.rdf4j.model.util.URIUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import com.googlecode.wicket.jquery.core.renderer.ITextRenderer; -import com.googlecode.wicket.jquery.core.renderer.TextRenderer; +import org.wicketstuff.jquery.core.renderer.ITextRenderer; +import org.wicketstuff.jquery.core.renderer.TextRenderer; import de.tudarmstadt.ukp.inception.conceptlinking.service.ConceptLinkingService; import de.tudarmstadt.ukp.inception.kb.ConceptFeatureValueType; diff --git a/inception/inception-ui-project/pom.xml b/inception/inception-ui-project/pom.xml index b5b7e21c940..f9194049468 100644 --- a/inception/inception-ui-project/pom.xml +++ b/inception/inception-ui-project/pom.xml @@ -188,12 +188,12 @@ wicket-bootstrap-extensions - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-core + org.wicketstuff + wicketstuff-jquery-ui-core - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui org.wicketstuff diff --git a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/users/UserSelectionPanel.java b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/users/UserSelectionPanel.java index 0ea55f796f0..240faa6fd34 100644 --- a/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/users/UserSelectionPanel.java +++ b/inception/inception-ui-project/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/project/users/UserSelectionPanel.java @@ -32,12 +32,11 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.util.CollectionModel; import org.apache.wicket.spring.injection.annot.SpringBean; - -import com.googlecode.wicket.jquery.core.JQueryBehavior; -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.kendo.ui.KendoDataSource; -import com.googlecode.wicket.kendo.ui.form.multiselect.lazy.MultiSelect; -import com.googlecode.wicket.kendo.ui.renderer.ChoiceRenderer; +import org.wicketstuff.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.kendo.ui.KendoDataSource; +import org.wicketstuff.kendo.ui.form.multiselect.lazy.MultiSelect; +import org.wicketstuff.kendo.ui.renderer.ChoiceRenderer; import de.tudarmstadt.ukp.clarin.webanno.model.Project; import de.tudarmstadt.ukp.clarin.webanno.model.ProjectUserPermissions; diff --git a/inception/inception-workload-dynamic/pom.xml b/inception/inception-workload-dynamic/pom.xml index 7ea2eb0114a..874916e156d 100644 --- a/inception/inception-workload-dynamic/pom.xml +++ b/inception/inception-workload-dynamic/pom.xml @@ -170,16 +170,16 @@ wicketstuff-annotationeventdispatcher - com.googlecode.wicket-jquery-ui - wicket-jquery-ui-core + org.wicketstuff + wicketstuff-jquery-ui-core - com.googlecode.wicket-jquery-ui - wicket-jquery-ui + org.wicketstuff + wicketstuff-jquery-ui - com.googlecode.wicket-jquery-ui - wicket-kendo-ui + org.wicketstuff + wicketstuff-kendo-ui org.danekja diff --git a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPage.java b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPage.java index d44d4d09a4e..3fc495be05e 100644 --- a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPage.java +++ b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPage.java @@ -76,12 +76,11 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.wicketstuff.annotation.mount.MountPath; import org.wicketstuff.event.annotation.OnEvent; - -import com.googlecode.wicket.jquery.core.JQueryBehavior; -import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.kendo.ui.KendoDataSource; -import com.googlecode.wicket.kendo.ui.form.multiselect.lazy.MultiSelect; -import com.googlecode.wicket.kendo.ui.renderer.ChoiceRenderer; +import org.wicketstuff.jquery.core.JQueryBehavior; +import org.wicketstuff.jquery.core.Options; +import org.wicketstuff.kendo.ui.KendoDataSource; +import org.wicketstuff.kendo.ui.form.multiselect.lazy.MultiSelect; +import org.wicketstuff.kendo.ui.renderer.ChoiceRenderer; import de.agilecoders.wicket.core.markup.html.bootstrap.form.BootstrapRadioChoice; import de.tudarmstadt.ukp.clarin.webanno.api.annotation.comment.AnnotatorCommentDialogPanel; diff --git a/inception/inception-workload-matrix/pom.xml b/inception/inception-workload-matrix/pom.xml index e71bc93847c..141550ccbe9 100644 --- a/inception/inception-workload-matrix/pom.xml +++ b/inception/inception-workload-matrix/pom.xml @@ -170,8 +170,8 @@ wicketstuff-annotationeventdispatcher - com.googlecode.wicket-jquery-ui - wicket-jquery-ui + org.wicketstuff + wicketstuff-jquery-ui org.danekja diff --git a/pom.xml b/pom.xml index 4b71dea0a8e..e4309c059b5 100644 --- a/pom.xml +++ b/pom.xml @@ -107,9 +107,8 @@ 6.4.4.Final 8.0.1.Final - 10.0.0 - 10.0.0 - 10.0.0-M1 + 10.1.0 + 10.2.0-SNAPSHOT 7.0.3 4.0.4 4.0.3