Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SAK-50556 Global update dependencies for Sakai 25 #12924

Merged
merged 12 commits into from
Oct 2, 2024
Merged

SAK-50556 Global update dependencies for Sakai 25 #12924

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d958c84
SAK-49906 SCORM remove old use of commons-collection
ottenhoff Sep 27, 2024
b86be0b
WIP update dependencies for Sakai 25
ottenhoff Sep 27, 2024
636c725
remove old
ottenhoff Sep 27, 2024
ca6135c
reinclude
ottenhoff Sep 27, 2024
e1b11a9
comment out one chuck test
ottenhoff Sep 27, 2024
58371dc
update subetha
ottenhoff Sep 27, 2024
b34acaf
subetha updates
ottenhoff Sep 27, 2024
96a1f3f
exclude mail
ottenhoff Sep 27, 2024
b2939b1
compile
ottenhoff Sep 28, 2024
d025fcf
guava updates
ottenhoff Sep 28, 2024
55eaeca
remove unused commons-collections
ottenhoff Sep 29, 2024
c6631e1
re-add old commons-lang and commons-collections because of transitive…
ottenhoff Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions basiclti/tsugi-util/pom.xml
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a very strange date @csev .... where did you find it?

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
15 changes: 0 additions & 15 deletions deploy/pom.xml
View file
Open in desktop
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,11 +742,6 @@
<artifactId>commons-codec</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
Expand Down Expand Up @@ -782,11 +772,6 @@
<artifactId>commons-fileupload</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion kernel/kernel-impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
<dependency>
<groupId>com.github.davidmoten</groupId>
<artifactId>subethasmtp</artifactId>
<version>5.2.8</version>
<version>7.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion mailarchive/mailarchive-subetha/pom.xml
View file
Open in desktop
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>
<version>7.1.1</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
Expand Down
6 changes: 3 additions & 3 deletions mailsender/impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@

<!-- testing -->
<dependency>
<groupId>org.subethamail</groupId>
<artifactId>subethasmtp-wiser</artifactId>
<version>1.2</version>
<groupId>com.github.davidmoten</groupId>
<artifactId>subethasmtp</artifactId>
<version>7.1.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
43 changes: 4 additions & 39 deletions master/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,14 @@
<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 @@ -728,29 +727,12 @@
<version>3.3.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
<scope>provided</scope>
</dependency>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see SAK-49906, this is transitively needed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needed by who?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think i understand.... you'd rather just declare it centrally instead of having old tool dependencies like velocity and tomahawk bring it in transitively

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<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 @@ -1073,12 +1055,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 @@ -1102,18 +1078,6 @@
<version>1.6.7</version>
<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>
<scope>provided</scope>
</dependency>
<!-- KERNEL -->
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
Expand Down Expand Up @@ -2375,13 +2339,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>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -2891,6 +2855,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
Open in desktop
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: 2 additions & 2 deletions scormplayer/scorm-tool/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
<artifactId>antlr</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
Expand Down
4 changes: 2 additions & 2 deletions search/search-impl/impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<!--
HSQL DB does not have clean transaction isolation
Expand Down
19 changes: 0 additions & 19 deletions web/web-portlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
<!-- remove when KNL-1105 is handled -->
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
Expand All @@ -59,16 +50,6 @@
<groupId>org.sakaiproject.velocity</groupId>
<artifactId>sakai-velocity-util</artifactId>
</dependency>
<dependency>
<groupId>logkit</groupId>
<artifactId>logkit</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
</dependency>
</dependencies>
<build>
<resources>
Expand Down
1 change: 0 additions & 1 deletion web/web-portlet/src/java/org/sakaiproject/portlets/PortletIFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
import javax.servlet.ServletRequest;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.validator.routines.UrlValidator;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
Expand Down
Loading