Skip to content

Commit

Permalink
#4909 - Upgrade dependencies
Browse files Browse the repository at this point in the history 
- Exclude jcl-over-log4j, commons-logging and commons-logging-api in favor of spring-jcl
- liquibase-slf4j -> 5.0.0
- Remove Wicket Webjars workaround for bug in WicketStuff 10.1.0
- Remove/exclude dependencies on all commons-logging stuff except spring-jcl
  • Loading branch information
@reckart
reckart committed Jun 28, 2024
1 parent f4366d6 commit 6cd59fd
Show file tree
Hide file tree
Showing 5 changed files with 101 additions and 57 deletions.
9 changes: 5 additions & 4 deletions inception/inception-app-webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,10 +531,6 @@
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
Expand Down Expand Up @@ -570,6 +566,11 @@
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
</dependency>
<dependency>
<groupId>com.mattbertolini</groupId>
<artifactId>liquibase-slf4j</artifactId>
<version>5.0.0</version>
</dependency>

<dependency>
<groupId>org.hibernate.orm</groupId>
Expand Down
113 changes: 88 additions & 25 deletions inception/inception-dependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,10 @@
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -969,6 +973,12 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>${solr.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
Expand Down Expand Up @@ -1024,6 +1034,12 @@
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>1.9.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
Expand Down Expand Up @@ -1051,6 +1067,17 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.dkpro.core</groupId>
<artifactId>dkpro-core-api-datasets-asl</artifactId>
<version>${dkpro.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.dkpro.core</groupId>
<artifactId>dkpro-core-io-xml-asl</artifactId>
Expand All @@ -1073,6 +1100,28 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.dkpro.core</groupId>
<artifactId>dkpro-core-api-resources-asl</artifactId>
<version>${dkpro.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.dkpro.core</groupId>
<artifactId>dkpro-core-io-pdf-asl</artifactId>
<version>${dkpro.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.eclipse.rdf4j</groupId>
Expand All @@ -1092,6 +1141,39 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-jsonld</artifactId>
<version>${rdf4j.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-http-client</artifactId>
<version>${rdf4j.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-api</artifactId>
<version>${rdf4j.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.cyberborean</groupId>
Expand Down Expand Up @@ -1186,6 +1268,12 @@
<groupId>org.opensearch.client</groupId>
<artifactId>opensearch-rest-client</artifactId>
<version>${opensearch.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.opensearch.client</groupId>
Expand Down Expand Up @@ -1363,31 +1451,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.dkpro.core</groupId>
<artifactId>dkpro-core-api-resources-asl</artifactId>
<version>${dkpro.version}</version>
<exclusions>
<!-- We do not use DKPro Core model-downloading -->
<!--
<exclusion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
</exclusion>
-->
<!--
Cannot exclude until https://github.com/dkpro/dkpro-core/issues/1511 is fixed
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.ivy</groupId>
<artifactId>ivy</artifactId>
</exclusion>
-->
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.ivy</groupId>
<artifactId>ivy</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions inception/inception-ui-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,6 @@
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-extensions</artifactId>
</dependency>
<dependency>
<groupId>de.agilecoders.wicket.webjars</groupId>
<artifactId>wicket-webjars</artifactId>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
Expand Down
11 changes: 1 addition & 10 deletions ...i-core/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/core/WicketApplicationBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@

import de.agilecoders.wicket.core.Bootstrap;
import de.agilecoders.wicket.core.settings.IBootstrapSettings;
import de.agilecoders.wicket.webjars.WicketWebjars;
import de.tudarmstadt.ukp.clarin.webanno.security.SpringAuthenticatedWebSession;
import de.tudarmstadt.ukp.clarin.webanno.ui.config.FontAwesomeResourceBehavior;
import de.tudarmstadt.ukp.clarin.webanno.ui.core.page.ApplicationPageBase;
Expand Down Expand Up @@ -116,7 +115,7 @@ protected void init()
{
super.init();

CompoundAuthorizationStrategy authorizationStrategy = new CompoundAuthorizationStrategy();
var authorizationStrategy = new CompoundAuthorizationStrategy();
authorizationStrategy.add(new RoleAuthorizationStrategy(this));
getSecuritySettings().setAuthorizationStrategy(authorizationStrategy);

Expand Down Expand Up @@ -249,14 +248,6 @@ private void initPageRequestTracker()
getRequestCycleListeners().add(new PageRequestHandlerTracker());
}

@Override
protected void internalInit()
{
super.internalInit();

WicketWebjars.install(this);
}

protected void initWebFrameworks()
{
initJQueryResourceReference();
Expand Down
21 changes: 7 additions & 14 deletions inception/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,6 @@
<artifactId>log4j-over-slf4j</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<!-- Avoid Commons Logging (we use the spring-jcl bridge -->
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<!-- Route Java Util Logging over SLF4J -->
<groupId>org.slf4j</groupId>
Expand All @@ -106,13 +100,6 @@
<!-- Route Java Commons Logging over SLF4J -->
<groupId>org.springframework</groupId>
<artifactId>spring-jcl</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<!-- Avoid Commons Logging (we use the spring-jcl bridge -->
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>provided</scope>
</dependency>

<!-- Dev aids -->
Expand Down Expand Up @@ -440,7 +427,6 @@
<dependency>org.apache.logging.log4j:log4j-layout-template-json</dependency>
<dependency>org.apache.logging.log4j:log4j-core</dependency>
<dependency>org.slf4j:log4j-over-slf4j</dependency>
<dependency>org.slf4j:jcl-over-slf4j</dependency>
<dependency>org.slf4j:jul-to-slf4j</dependency>
<dependency>commons-logging:commons-logging</dependency>
<dependency>org.springframework:spring-jcl</dependency>
Expand Down Expand Up @@ -515,6 +501,13 @@
<requireJavaVersion>
<version>[${maven.compiler.release},)</version>
</requireJavaVersion>
<bannedDependencies>
<excludes>
<exclude>commons-logging:commons-logging</exclude>
<exclude>commons-logging:commons-logging-api</exclude>
<exclude>org.slf4j:jcl-over-slf4j</exclude>
</excludes>
</bannedDependencies>
</rules>
</configuration>
</execution>
Expand Down

0 comments on commit 6cd59fd

Please sign in to comment.