Skip to content

Commit e3e03f6

Browse files
committed
Build improvements
1 parent fb31c2f commit e3e03f6

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ MAINTAINER Joris Borgdorff <[email protected]>, Yatharth Ranjan<yatharth.ranjan@k
3232
LABEL description="RADAR-base output data restructuring"
3333

3434
ENV RADAR_OUTPUT_RESTRUCTURE_OPTS="" \
35-
JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom -XX:+UseG1GC -XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=10"
35+
JAVA_OPTS="-XX:+UseG1GC -XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=10"
3636

3737
COPY --from=builder /code/build/third-party/* /usr/lib/
3838
COPY --from=builder /code/build/scripts/* /usr/bin/

build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ dependencies {
9292

9393
val log4jVersion: String by project
9494
runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion")
95+
runtimeOnly("org.apache.logging.log4j:log4j-api:$log4jVersion")
96+
runtimeOnly("org.apache.logging.log4j:log4j-jul:$log4jVersion")
9597

9698
val radarSchemasVersion: String by project
9799
testImplementation("org.radarbase:radar-schemas-commons:$radarSchemasVersion")
@@ -117,6 +119,10 @@ dependencies {
117119

118120
application {
119121
mainClass.set("org.radarbase.output.Application")
122+
applicationDefaultJvmArgs = listOf(
123+
"-Djava.security.egd=file:/dev/./urandom",
124+
"-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager",
125+
)
120126
}
121127

122128
distributions {

gradle.properties

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
kotlin.code.style=official
22

3-
kotlinVersion=1.6.20
4-
dokkaVersion=1.6.10
5-
dockerComposeVersion=0.15.2
3+
kotlinVersion=1.6.21
4+
dokkaVersion=1.6.21
5+
dockerComposeVersion=0.16.4
66
dependencyUpdateVersion=0.42.0
77
nexusPublishVersion=1.1.0
88
jsoupVersion=1.14.3
@@ -13,16 +13,16 @@ snappyVersion=1.1.8.4
1313
jacksonVersion=2.13.2.20220328
1414
jCommanderVersion=1.82
1515
almworksVersion=1.1.2
16-
minioVersion=8.3.8
16+
minioVersion=8.4.0
1717
guavaVersion=31.1-jre
1818
opencsvVersion=5.6
1919
okhttpVersion=4.9.3
20-
jedisVersion=4.2.1
20+
jedisVersion=4.2.3
2121
slf4jVersion=1.7.36
2222
log4jVersion=2.17.2
23-
azureStorageVersion=12.15.0
24-
nettyVersion=4.1.75.Final
23+
azureStorageVersion=12.16.0
24+
nettyVersion=4.1.77.Final
2525

2626
junitVersion=5.8.2
2727
mockitoKotlinVersion=4.0.0
28-
radarSchemasVersion=0.7.8
28+
radarSchemasVersion=0.7.9

0 commit comments

Comments
 (0)