Skip to content

Commit

Permalink
Delete old stuff, fix java 21
Browse files Browse the repository at this point in the history
  • Loading branch information
salyh committed Apr 28, 2024
1 parent e077ea2 commit f2354f4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 54 deletions.
23 changes: 15 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,6 @@ repositories {

test {
include '**/*Tests.class'

if (BuildParams.runtimeJavaVersion >= JavaVersion.VERSION_18) {
jvmArgs += ["-Djava.security.manager=allow"]
}
}

task integTest(type: RestIntegTestTask) {
Expand All @@ -111,10 +107,6 @@ integTest {
if (System.getProperty("test.debug") != null) {
jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005'
}

if (BuildParams.runtimeJavaVersion >= JavaVersion.VERSION_18) {
jvmArgs += ["-Djava.security.manager=allow"]
}
}

testClusters.integTest {
Expand Down Expand Up @@ -146,4 +138,19 @@ dependencies {
implementation 'com.google.guava:guava:33.1.0-jre'
implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1'
implementation 'org.cryptacular:cryptacular:1.2.6'
}


tasks.withType(Test) {
jvmArgs('--add-opens=java.base/java.io=ALL-UNNAMED')
jvmArgs('--add-opens=java.base/java.util.concurrent=ALL-UNNAMED')
jvmArgs('--add-opens=java.base/java.time=ALL-UNNAMED')
jvmArgs('--add-opens=java.base/java.util.stream=ALL-UNNAMED')
jvmArgs('--add-opens=java.base/sun.nio.fs=ALL-UNNAMED')
jvmArgs('--add-opens=java.base/java.nio.file=ALL-UNNAMED')
jvmArgs('--add-opens=java.base/java.lang=ALL-UNNAMED')
jvmArgs('--add-opens=java.base/java.util=ALL-UNNAMED')
if (JavaVersion.current().compareTo(JavaVersion.VERSION_17) > 0) {
jvmArgs += ["-Djava.security.manager=allow"]
}
}
46 changes: 0 additions & 46 deletions src/main/java/com/eliatra/cloud/tresor/plugin/KeyStore.java

This file was deleted.

0 comments on commit f2354f4

Please sign in to comment.