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

Fix/delete comment code #649

Closed
wants to merge 4 commits into from
Closed

Fix/delete comment code #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8396cf2
Merge pull request #1 from sirixdb/master
Aminmalek Jul 7, 2023
2a97425
Merge pull request #2 from sirixdb/master
Aminmalek Jul 10, 2023
2643d04
Merge branch 'sirixdb:master' into master
Aminmalek Jul 31, 2023
eea2f08
fix:remove commented code
Aminmalek Jul 31, 2023
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
2 changes: 0 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ COPY bundles/sirix-rest-api/src/main/resources/cert.pem ./sirix-data/
COPY bundles/sirix-rest-api/src/main/resources/key.pem ./sirix-data/
COPY bundles/sirix-rest-api/src/main/resources/sirix-docker-conf.json ./

# Replace localhost url with keycloack url in docker compose file
# RUN sed -i 's/localhost/keycloak/g' sirix-conf.json

VOLUME $VERTICLE_HOME
EXPOSE 9443
Expand Down
25 changes: 2 additions & 23 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ subprojects {
withJavadocJar()

if (JavaVersion.current() != targetCompatibility) {
throw new GradleException( JavaVersion.current().toString()+ targetCompatibility.toString())
throw new GradleException(JavaVersion.current().toString() + targetCompatibility.toString())
}
}

Expand Down Expand Up @@ -252,37 +252,16 @@ subprojects {
"--add-opens=java.base/java.io=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.lang.reflect=ALL-UNNAMED",
// "-XX:+UseZGC",
"-XX:+UnlockExperimentalVMOptions",
"-XX:+AlwaysPreTouch",
"-XX:+UseLargePages",
"-XX:+DisableExplicitGC",
"-XX:ReservedCodeCacheSize=1000m",
"-XX:+UnlockDiagnosticVMOptions",
// "-XX:+PrintInlining",
"-XX:EliminateAllocationArraySizeLimit=1024"
/* "-XX:MaxInlineSize=500" */])
])

minHeapSize = '5g'
maxHeapSize = '8g'
}
}

//task jacocoRootReport(type: JacocoReport) {
// description = 'Generates an aggregate report from all subprojects'
// dependsOn = subprojects.test
// sourceDirectories.setFrom files(subprojects.sourceSets.main.allSource.srcDirs)
// classDirectories.setFrom files(subprojects.sourceSets.main.output)
// executionData.setFrom files(subprojects.jacocoTestReport.executionData).filter {
// file -> file.exists()
// }.asList()
// reports {
// html.enabled = true
// xml.enabled = true
// }
//}
//
//coveralls {
// sourceDirs = subprojects.sourceSets.main.allSource.srcDirs.flatten()
// jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/jacocoRootReport.xml"
//}
Loading