Skip to content

Commit 11f9fb2

Browse files
committed
updated dockerfile and Para core
1 parent b77ee1c commit 11f9fb2

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openjdk:11-jre-slim
1+
FROM adoptopenjdk/openjdk11:ubi-minimal-jre
22

33
RUN mkdir -p /para/lib
44

deploy.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ read -e -p "New dev version: " devver
88
sed -i -e "s/PARA_PLUGIN_VER=.*/PARA_PLUGIN_VER="\"$ver\""/g" Dockerfile && \
99

1010
git add -A && git commit -m "Release v$ver." && git push origin master && \
11-
mvn --batch-mode -Dtag=${ver} release:prepare -DreleaseVersion=${ver} -DdevelopmentVersion=${devver}-SNAPSHOT && \
11+
mvn --batch-mode -Dtag=${ver} release:prepare -Dresume=false -DreleaseVersion=${ver} -DdevelopmentVersion=${devver}-SNAPSHOT && \
1212
mvn release:perform && \
1313
echo "Maven release done, publishing release on GitHub..," && \
1414
echo "v$ver" > changelog.txt && \
@@ -18,4 +18,6 @@ echo "" >> changelog.txt && \
1818
echo "" >> changelog.txt && \
1919
echo "### :package: [Download JAR](https://oss.sonatype.org/service/local/repositories/releases/content/com/erudika/para-cache-hazelcast/${ver}/para-cache-hazelcast-${ver}-shaded.jar)" >> changelog.txt && \
2020
hub release create -F changelog.txt $ver && \
21-
rm changelog.txt
21+
rm changelog.txt
22+
23+
docker build -t erudikaltd/para-cache-hazelcast:${ver} . && docker push erudikaltd/para-cache-hazelcast:${ver}

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@
6161
<dependency>
6262
<groupId>com.erudika</groupId>
6363
<artifactId>para-core</artifactId>
64-
<version>1.38.0</version>
64+
<version>1.42.0</version>
6565
<scope>provided</scope>
6666
</dependency>
6767

6868
<!-- HAZELCAST -->
6969
<dependency>
7070
<groupId>com.hazelcast</groupId>
7171
<artifactId>hazelcast</artifactId>
72-
<version>4.0.3</version>
72+
<version>4.2.2</version>
7373
</dependency>
7474
<dependency>
7575
<groupId>com.hazelcast</groupId>

src/main/java/com/erudika/para/cache/HazelcastUtils.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ public final class HazelcastUtils {
4747

4848
private static HazelcastInstance hcInstance;
4949

50+
static {
51+
// Fix for exceptions from Spring Boot when using a different MongoDB host than localhost.
52+
System.setProperty("spring.autoconfigure.exclude", String.join(",",
53+
System.getProperty("spring.autoconfigure.exclude", ""),
54+
"org.springframework.boot.autoconfigure.hazelcast.HazelcastAutoConfiguration"));
55+
}
56+
5057
private HazelcastUtils() { }
5158

5259
/**

0 commit comments

Comments
 (0)