Skip to content

MCR-3585 update Java dependencies to latest versions #3145

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

Merged
yagee-de merged 1 commit into from
Oct 25, 2026
Merged

MCR-3585 update Java dependencies to latest versions #3145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions mycore-base/src/main/java/org/mycore/datamodel/metadata/MCRMetaHistoryDate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,8 +469,8 @@ public void validate() throws MCRException {
throw new MCRException(getSubTag() + ": von,bis or calendar are null");
}
if (ibis < ivon) {
Calendar swp = (Calendar) von.clone();
setVonDate((Calendar) bis.clone());
Calendar swp = von.clone();
setVonDate(bis.clone());
setBisDate(swp);
}
}
Expand All @@ -482,8 +482,8 @@ public MCRMetaHistoryDate clone() {

clone.texts = this.texts.stream().map(MCRMetaHistoryDateText::clone)
.collect(Collectors.toCollection(ArrayList::new));
clone.bis = (Calendar) this.bis.clone();
clone.von = (Calendar) this.von.clone();
clone.bis = this.bis.clone();
clone.von = this.von.clone();
clone.ibis = this.ibis;
clone.ivon = this.ivon;
clone.calendar = this.calendar;
Expand Down
4 changes: 2 additions & 2 deletions mycore-base/src/main/java/org/mycore/frontend/MCRLayoutUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
import java.net.URLConnection;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;

import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
Expand Down Expand Up @@ -112,7 +112,7 @@ public class MCRLayoutUtilities {
private static Map<String, Element> itemStore = new HashMap<>();

private static final LoadingCache<String, DocumentHolder> NAV_DOCUMENT_CACHE = CacheBuilder.newBuilder()
.refreshAfterWrite(STANDARD_CACHE_SECONDS, TimeUnit.SECONDS).build(new CacheLoader<>() {
.refreshAfterWrite(Duration.ofSeconds(STANDARD_CACHE_SECONDS)).build(new CacheLoader<>() {

Executor executor = Executors.newSingleThreadExecutor(r -> new Thread(r, "navigation.xml refresh"));

Expand Down
8 changes: 4 additions & 4 deletions mycore-base/src/test/java/org/mycore/common/MCRCalendarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,12 +677,12 @@ public void testParseEgyptianDate() {
public void testParseJapaneseDate() {
Calendar cal;

// Meiji era: 8.9.1868 - 29.07.1912
cal = MCRCalendar.getHistoryDateAsCalendar("8.9.M1", true, MCRCalendar.TAG_JAPANESE);
assertCalEqualWithActual(cal, 8, JapaneseCalendar.SEPTEMBER, 1, JapaneseCalendar.MEIJI);
// Meiji era: 23.10.1868 - 29.07.1912
cal = MCRCalendar.getHistoryDateAsCalendar("23.10.M1", true, MCRCalendar.TAG_JAPANESE);
assertCalEqualWithActual(cal, 23, JapaneseCalendar.OCTOBER, 1, JapaneseCalendar.MEIJI);

assertEquals(MCRCalendar.getJulianDayNumber(cal), MCRCalendar.getJulianDayNumber(
MCRCalendar.getHistoryDateAsCalendar("8.9.1868", false, MCRCalendar.TAG_GREGORIAN)));
MCRCalendar.getHistoryDateAsCalendar("23.10.1868", false, MCRCalendar.TAG_GREGORIAN)));

cal = MCRCalendar.getHistoryDateAsCalendar("29.7.M45", true, MCRCalendar.TAG_JAPANESE);
assertCalEqualWithActual(cal, 29, JapaneseCalendar.JULY, 45, JapaneseCalendar.MEIJI);
Expand Down
4 changes: 2 additions & 2 deletions mycore-base/src/test/java/org/mycore/common/xsl/uriresolver/MCRURIResolverFlavorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void testSaxonFlavor() {
assertEquals("xslt", id);
assertEquals("3.0", version);
assertEquals("Saxonica", vendor);
assertEquals("http://www.saxonica.com/", vendorUrl);
assertEquals("https://www.saxonica.com/", vendorUrl);

}

Expand All @@ -60,7 +60,7 @@ public void testSaxonFlavorViaParameter() {
assertEquals("xslt", id);
assertEquals("3.0", version);
assertEquals("Saxonica", vendor);
assertEquals("http://www.saxonica.com/", vendorUrl);
assertEquals("https://www.saxonica.com/", vendorUrl);

}

Expand Down
2 changes: 1 addition & 1 deletion mycore-base/src/test/java/org/mycore/common/xsl/uriresolver/MCRURIResolverSaxonTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void testSaxonAvailability() {
assertEquals("xslt-test", id);
assertEquals("3.0", version);
assertEquals("Saxonica", vendor);
assertEquals("http://www.saxonica.com/", vendorUrl);
assertEquals("https://www.saxonica.com/", vendorUrl);

}

Expand Down
4 changes: 2 additions & 2 deletions mycore-iview2/src/main/java/org/mycore/iview2/frontend/MCRThumbnailServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
import java.text.MessageFormat;
import java.time.Duration;
import java.util.Date;
import java.util.Locale;
import java.util.Objects;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;

import javax.imageio.IIOImage;
Expand Down Expand Up @@ -84,7 +84,7 @@ public class MCRThumbnailServlet extends MCRServlet {
private int thumbnailSize = MCRImage.getTileSize();

private static LoadingCache<String, Long> modifiedCache = CacheBuilder.newBuilder().maximumSize(5000)
.expireAfterWrite(MCRTileServlet.MAX_AGE, TimeUnit.SECONDS).weakKeys().build(new CacheLoader<>() {
.expireAfterWrite(Duration.ofSeconds(MCRTileServlet.MAX_AGE)).weakKeys().build(new CacheLoader<>() {
@Override
public Long load(String id) {
ThumnailInfo thumbnailInfo = getThumbnailInfo(id);
Expand Down
2 changes: 1 addition & 1 deletion mycore-neo4j/src/main/resources/components/neo4j/config/mycore.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ MCR.Neo4J.Parser.MCRMetaXML.Class=org.mycore.mcr.neo4j.datamodel.metadata.neo4jp
# MCR.Neo4J.Parser.MCRMetaXML.mods.Class=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRMetaXMLModsParser
# MCR.Neo4J.Parser.MCRMetaXML.record.Class=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRMetaXMLRecordParser

MCR.Neo4J.VISNetworkJSURL=/webjars/vis-network/9.1.2/dist/vis-network.js
MCR.Neo4J.VISNetworkJSURL=/webjars/vis-network/10.0.3/dist/vis-network.js
2 changes: 1 addition & 1 deletion mycore-user2/src/main/java/org/mycore/user2/hash/bouncycastle/MCRBCryptStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ private Details parseBCryptMCFString(String sting) {
private byte[] getHash(int cost, byte[] salt, String password) {

byte[] bytes = (password + '\0').getBytes(StandardCharsets.UTF_8);
byte[] fullHash = BCrypt.generate(bytes, salt, cost);
byte[] fullHash = BCrypt.generate(bytes, salt, cost, false);
assert fullHash.length == 24;

byte[] hash = new byte[23];
Expand Down
Loading