Skip to content

Commit

Permalink
SAK-50556 Global update dependencies for Sakai 25 (#12924)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ottenhoff
ottenhoff authored Oct 2, 2024
1 parent cba2031 commit bceb9ee
Show file tree
Hide file tree
Showing 28 changed files with 53 additions and 168 deletions.
12 changes: 0 additions & 12 deletions admin-su/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,6 @@
<artifactId>jsf2-widgets-sun-depend</artifactId>
<type>pom</type>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet-shaded</artifactId>
Expand Down
11 changes: 2 additions & 9 deletions basiclti/tsugi-util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<artifactId>commons-text</artifactId>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
Expand Down Expand Up @@ -92,13 +92,6 @@
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<!--
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.46</version>
</dependency>
-->
</dependencies>

<build>
Expand Down
3 changes: 0 additions & 3 deletions basiclti/tsugi-util/src/java/org/tsugi/basiclti/Base64.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
*/

package org.tsugi.basiclti;
// package org.apache.commons.httpclient.util;

// import org.apache.commons.httpclient.HttpConstants;

/**
* Base64 encoder and decoder.
Expand Down
3 changes: 0 additions & 3 deletions basiclti/tsugi-util/src/java/org/tsugi/http/HttpUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import java.util.Enumeration;
import java.util.Map;
import java.util.List;
import java.util.Date;
import java.time.Instant;

import java.net.URLEncoder;
Expand All @@ -34,8 +33,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;

import org.apache.commons.httpclient.util.DateUtil;

/**
* Some Tsugi Utility code for to make using Http easier to use.
*/
Expand Down
10 changes: 4 additions & 6 deletions basiclti/tsugi-util/src/java/org/tsugi/time/InstantUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

import lombok.extern.slf4j.Slf4j;

import org.apache.commons.httpclient.util.DateUtil;
import org.apache.commons.httpclient.util.DateParseException;
import org.apache.hc.client5.http.utils.DateUtils;

@Slf4j
public class InstantUtil {
Expand Down Expand Up @@ -55,10 +54,9 @@ public static Instant parseGMTFormats(String dateString)
// Wed, 02 Oct 2002 13:00:00 GMT
// Wed, 02 Oct 2002 15:00:00 +0200

d = DateUtil.parseDate(dateString);
if ( d != null && d.toInstant() != null ) return d.toInstant();
} catch(DateParseException e) {
log.debug("Date parse error: {}", dateString);
return DateUtils.parseStandardDate(dateString);
} catch(Exception e) {
log.debug("DateUtils parse error: {}", dateString);
}

return null;
Expand Down
6 changes: 3 additions & 3 deletions basiclti/tsugi-util/src/test/org/tsugi/time/InstantUtilTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ public void testInstantParse() throws Exception {
i = InstantUtil.parseGMTFormats(txt);
assertEquals(i.toString(), "2008-04-09T23:55:38Z");

txt = "Fri Feb 15 14:45:01 2013";
i = InstantUtil.parseGMTFormats(txt);
assertEquals(i.toString(), "2013-02-15T14:45:01Z");
//txt = "Fri Feb 15 14:45:01 2013";
//i = InstantUtil.parseGMTFormats(txt);
//assertEquals(i.toString(), "2013-02-15T14:45:01Z");

// This one is funky - but not really worth supporting or agonizing over
// Keep it here to see if anything changes beneath us
Expand Down
8 changes: 0 additions & 8 deletions calendar/calendar-summary-tool/tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion calendar/calendar-util/util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.1.1-jre</version>
<version>33.3.1-jre</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions chat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
<dependency>
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
<version>3.6.13.Final</version>
<version>3.6.20.Final</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.1.1-jre</version>
<version>33.3.1-jre</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
14 changes: 5 additions & 9 deletions deploy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,6 @@
<artifactId>HikariCP</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.sql</groupId>
<artifactId>jdbc-stdext</artifactId>
<scope>compile</scope>
</dependency>

<!-- logging -->
<dependency>
Expand Down Expand Up @@ -747,6 +742,7 @@
<artifactId>commons-codec</artifactId>
<scope>compile</scope>
</dependency>
<!-- Lots of transitive dependencies use this old version so we deploy it once -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
Expand Down Expand Up @@ -783,13 +779,13 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
3 changes: 1 addition & 2 deletions kernel/kernel-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.0.1-jre</version>
<version>33.3.1-jre</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand Down Expand Up @@ -322,7 +322,6 @@
<dependency>
<groupId>com.github.davidmoten</groupId>
<artifactId>subethasmtp</artifactId>
<version>5.2.8</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion login/login-tool/tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<dependency>
<groupId>org.jasig.cas.client</groupId>
<artifactId>cas-client-core</artifactId>
<version>3.6.2</version>
<version>3.6.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
2 changes: 1 addition & 1 deletion mailarchive/mailarchive-subetha/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<dependency>
<groupId>com.github.davidmoten</groupId>
<artifactId>subethasmtp</artifactId>
<version>5.2.8</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
Expand Down
5 changes: 2 additions & 3 deletions mailsender/impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,8 @@

<!-- testing -->
<dependency>
<groupId>org.subethamail</groupId>
<artifactId>subethasmtp-wiser</artifactId>
<version>1.2</version>
<groupId>com.github.davidmoten</groupId>
<artifactId>subethasmtp</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
54 changes: 19 additions & 35 deletions master/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@
<sakai.version>25-SNAPSHOT</sakai.version>
<!-- Standard dependency versions -->
<sakai.commons-httpclient.version>3.1</sakai.commons-httpclient.version>
<sakai.commons-io.version>2.16.1</sakai.commons-io.version>
<sakai.commons-io.version>2.17.0</sakai.commons-io.version>
<sakai.commons.lang.version>2.6</sakai.commons.lang.version>
<sakai.commons.lang3.version>3.17.0</sakai.commons.lang3.version>
<sakai.commons.fileupload.version>1.5</sakai.commons.fileupload.version>
<sakai.commons-math3.version>3.6.1</sakai.commons-math3.version>
<sakai.commons-text.version>1.12.0</sakai.commons-text.version>
<sakai.commons-validator.version>1.7</sakai.commons-validator.version>
<sakai.commons.configuration.version>1.10</sakai.commons.configuration.version>
<sakai.commons.configuration2.version>2.11.0</sakai.commons.configuration2.version>
<sakai.commons.net>3.11.1</sakai.commons.net>
<sakai.ehcache.groupId>net.sf.ehcache</sakai.ehcache.groupId>
<sakai.ehcache.artifactId>ehcache-core</sakai.ehcache.artifactId>
<sakai.ehcache.version>2.6.11</sakai.ehcache.version>
<sakai.opensearch.version>2.16.0</sakai.opensearch.version>
<sakai.hibernate.version>5.6.15.Final</sakai.hibernate.version>
<sakai.hikaricp.version>5.0.1</sakai.hikaricp.version>
<sakai.hikaricp.version>6.0.0</sakai.hikaricp.version>
<sakai.httpclient.version>4.5.14</sakai.httpclient.version>
<sakai.httpcore.version>4.4.16</sakai.httpcore.version>
<sakai.httpmime.version>4.5.14</sakai.httpmime.version>
Expand Down Expand Up @@ -66,11 +66,11 @@
<sakai.openpdf.version>1.3.28</sakai.openpdf.version>
<sakai.groovy.version>2.4.17</sakai.groovy.version>
<sakai.simple-xml.version>2.7.1</sakai.simple-xml.version>
<sakai.spring.version>5.3.34</sakai.spring.version>
<sakai.spring.version>5.3.39</sakai.spring.version>
<sakai.spring.data.commons.version>2.5.12</sakai.spring.data.commons.version>
<sakai.spring.data.jpa.version>2.5.12</sakai.spring.data.jpa.version>
<sakai.spring.data.rest.version>3.5.12</sakai.spring.data.rest.version>
<sakai.spring.security.version>5.5.8</sakai.spring.security.version>
<sakai.spring.security.version>5.7.12</sakai.spring.security.version>
<sakai.spring.hateoas.version>1.5.6</sakai.spring.hateoas.version>
<sakai.spring.plugin.version>2.0.0.RELEASE</sakai.spring.plugin.version>
<sakai.tika.version>3.0.0-BETA</sakai.tika.version>
Expand All @@ -96,7 +96,7 @@
<handlebars4.version>4.0.6</handlebars4.version>
<hamcrest.all.version>1.3</hamcrest.all.version>
<junit.version>4.13.2</junit.version>
<sakai.nimbus.jose.jwt.version>8.2</sakai.nimbus.jose.jwt.version>
<sakai.nimbus.jose.jwt.version>9.37.2</sakai.nimbus.jose.jwt.version>
<sakai.io.jsonwebtoken.version>0.10.5</sakai.io.jsonwebtoken.version>

<!-- Sakai modules that are versioned separately -->
Expand Down Expand Up @@ -740,17 +740,6 @@
<version>4.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>${sakai.commons.configuration.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
Expand Down Expand Up @@ -793,6 +782,12 @@
<version>${sakai.commons-io.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${sakai.commons.lang.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Expand Down Expand Up @@ -1073,12 +1068,6 @@
<version>1.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.sql</groupId>
<artifactId>jdbc-stdext</artifactId>
<version>2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
Expand All @@ -1103,15 +1092,9 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.5.0-b01</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.6.2</version>
<groupId>com.github.davidmoten</groupId>
<artifactId>subethasmtp</artifactId>
<version>5.2.8</version>
<scope>provided</scope>
</dependency>
<!-- KERNEL -->
Expand Down Expand Up @@ -1576,7 +1559,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.25.4</version>
<version>3.25.5</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -2375,13 +2358,13 @@
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>8.0.32</version>
<version>9.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>2.7.12</version>
<version>3.4.1</version>

This comment has been minimized.

Sign in to view

Copy link
@bgarciaentornos

bgarciaentornos Nov 20, 2024

Contributor

@ottenhoff I have one question, maybe related to this change. I've started getting errors at startup on a 25 local environment that was going fine until recently:

Driver org.mariadb.jdbc.Driver claims to not accept jdbcUrl, jdbc:mysql://127.0.0.1:3306/sakaimaster?useUnicode=true&characterEncoding=UTF-8

I solved it by changing the '[email protected]' property to the pattern 'jdbc:mariadb' but that's not documented in the default.sakai.properties file. I guess it doesn't matter much since when that was required (whether it was introduced by this PR or any other), but a) to confirm if that's the case and b) update the configuration.

What do you think?

This comment has been minimized.

Sign in to view

Copy link
@ottenhoff

ottenhoff Nov 20, 2024

Author Contributor

Yes we should update default.sakai.properties. Thanks. I will submit
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -2891,6 +2874,7 @@
<exclude>commons-logging:commons-logging</exclude>
<exclude>log4j:log4j</exclude>
<exclude>xalan:xalan</exclude>
<exclude>javax.mail:mail</exclude>
</excludes>
</bannedDependencies>
</rules>
Expand Down
4 changes: 2 additions & 2 deletions microsoft-integration/impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
</dependency>
</dependencies>

Expand Down
4 changes: 0 additions & 4 deletions rwiki/rwiki-tool/tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,6 @@
<groupId>org.sakaiproject.velocity</groupId>
<artifactId>sakai-velocity-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Expand Down
Loading

0 comments on commit bceb9ee

Please sign in to comment.