Skip to content

Commit

Permalink
#3611 - Upgrade to Spring 6, Boot 3, Wicket 10, etc.
Browse files Browse the repository at this point in the history
- wicket 10.0.0 -> 10.1.0
- wicketstuff 10.0.0-M1 -> 10.2.0-SNAPSHOT
  • Loading branch information
reckart committed Jun 7, 2024
1 parent c444472 commit bebf030
Show file tree
Hide file tree
Showing 80 changed files with 236 additions and 290 deletions.
4 changes: 2 additions & 2 deletions inception/inception-agreement/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@
<artifactId>wicket-bootstrap-core</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-core</artifactId>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-jquery-ui-core</artifactId>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
Expand Down
12 changes: 6 additions & 6 deletions inception/inception-api-annotation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,16 +166,16 @@
<artifactId>wicket-extensions</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-core</artifactId>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-jquery-ui-core</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui</artifactId>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-jquery-ui</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-kendo-ui</artifactId>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-kendo-ui</artifactId>
</dependency>
<dependency>
<groupId>de.agilecoders.wicket</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -128,7 +127,7 @@ public void addFeatureUpdateBehavior()
@SuppressWarnings({ "unchecked", "rawtypes" })
private FormComponent<String> createReadOnlyInput()
{
var input = new com.googlecode.wicket.kendo.ui.form.multiselect. //
var input = new org.wicketstuff.kendo.ui.form.multiselect. //
MultiSelect<String>(CID_VALUE)
{
private static final long serialVersionUID = 1L;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions inception/inception-api-editor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@
<artifactId>wicket-spring</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui</artifactId>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-jquery-ui</artifactId>
</dependency>

<!-- LOGGING DEPENDENCIES - SLF4J -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions inception/inception-app-webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -450,12 +450,12 @@
<artifactId>rhino-runtime</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-theme-uilightness</artifactId>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-jquery-ui-theme-uilightness</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-kendo-ui-theme-bootstrap</artifactId>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-kendo-ui-theme-bootstrap</artifactId>
</dependency>

<!-- Spring dependencies -->
Expand Down Expand Up @@ -1005,8 +1005,8 @@
<usedDependency>io.sentry:sentry-spring-boot-starter</usedDependency>
<usedDependency>io.sentry:sentry-log4j2</usedDependency>
<!-- Themes -->
<usedDependency>com.googlecode.wicket-jquery-ui:wicket-kendo-ui-theme-bootstrap</usedDependency>
<usedDependency>com.googlecode.wicket-jquery-ui:wicket-jquery-ui-theme-uilightness</usedDependency>
<usedDependency>org.wicketstuff:wicketstuff-kendo-ui-theme-bootstrap</usedDependency>
<usedDependency>org.wicketstuff:wicketstuff-jquery-ui-theme-uilightness</usedDependency>
<!-- Wicket plugins -->
<usedDependency>org.wicketstuff:wicketstuff-htmlcompressor</usedDependency>
<usedDependency>org.mozilla:rhino-runtime</usedDependency>
Expand Down
34 changes: 16 additions & 18 deletions inception/inception-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -202,34 +202,32 @@
<version>${awaitility.version}</version>
</dependency>

<!-- Wicket jQuery -->
<!-- Wicketstuff -->
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui</artifactId>
<version>${wicket-jquery-ui.version}</version>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-jquery-ui</artifactId>
<version>${wicketstuff.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-core</artifactId>
<version>${wicket-jquery-ui.version}</version>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-jquery-ui-core</artifactId>
<version>${wicketstuff.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-theme-uilightness</artifactId>
<version>${wicket-jquery-ui.version}</version>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-jquery-ui-theme-uilightness</artifactId>
<version>${wicketstuff.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-kendo-ui</artifactId>
<version>${wicket-jquery-ui.version}</version>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-kendo-ui</artifactId>
<version>${wicketstuff.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-kendo-ui-theme-bootstrap</artifactId>
<version>${wicket-jquery-ui.version}</version>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-kendo-ui-theme-bootstrap</artifactId>
<version>${wicketstuff.version}</version>
</dependency>

<!-- Wicketstuff -->
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-htmlcompressor</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions inception/inception-diag/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@
</dependency>

<dependency>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
</dependency>

<!-- LOGGING DEPENDENCIES - SLF4J -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions inception/inception-diam/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@
<artifactId>wicket-spring</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui</artifactId>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-jquery-ui</artifactId>
</dependency>

<dependency>
Expand Down
8 changes: 4 additions & 4 deletions inception/inception-feature-lookup/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@
<artifactId>wicketstuff-annotationeventdispatcher</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-kendo-ui</artifactId>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-kendo-ui</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-core</artifactId>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-jquery-ui-core</artifactId>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit bebf030

Please sign in to comment.