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

[GWC-1198] Upgrade Hazelcast from 5.3.1 to 5.3.6 #1199

Merged
merged 1 commit into from
Dec 11, 2023
Merged

[GWC-1198] Upgrade Hazelcast from 5.3.1 to 5.3.6 #1199

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
5 changes: 5 additions & 0 deletions geowebcache/distributed/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
<artifactId>gwc-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-xml</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
13 changes: 13 additions & 0 deletions ...d/src/main/java/org/geowebcache/storage/blobstore/memory/distributed/HazelcastLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.logging.Logger;
import org.apache.commons.io.filefilter.NameFileFilter;
import org.geotools.util.logging.Logging;
import org.geotools.xml.XMLUtils;
import org.springframework.beans.factory.InitializingBean;

/**
Expand All @@ -54,6 +55,18 @@ public class HazelcastLoader implements InitializingBean {
/** Hazelcast instance to pass to the {@link HazelcastCacheProvider} class */
private HazelcastInstance instance;

// Disable Hazelcast's XXE protection if the XML libraries don't support JAXP 1.5
static {
if (System.getProperty("hazelcast.ignoreXxeProtectionFailures") == null) {
try {
XMLUtils.checkSupportForJAXP15Properties();
} catch (IllegalStateException e) {
LOGGER.warning("Disabling Hazelcast XXE protection because " + e.getMessage());
System.setProperty("hazelcast.ignoreXxeProtectionFailures", "true");
}
}
}

@Override
public void afterPropertiesSet() throws Exception {
if (instance == null) {
Expand Down
2 changes: 1 addition & 1 deletion geowebcache/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<test.maxHeapSize>64M</test.maxHeapSize>
<maven.test.jvmargs></maven.test.jvmargs>
<imageio-ext.version>1.4.9</imageio-ext.version>
<hazelcast.version>5.3.1</hazelcast.version>
<hazelcast.version>5.3.6</hazelcast.version>
<joda-time.version>2.8.1</joda-time.version>
<spotless.action>apply</spotless.action>
<spotless.apply.skip>false</spotless.apply.skip>
Expand Down
Loading