Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
bdb817c
chore(deps): update dependency jacoco to v0.8.12
renovate[bot] Nov 10, 2024
4efdb3c
chore(deps): update dependency gradle to v8.10.2
renovate[bot] Nov 10, 2024
2190607
Merge pull request #202 from kit-data-manager/renovate/jacoco-0.x
ThomasJejkal Nov 10, 2024
9e076de
Merge pull request #203 from kit-data-manager/renovate/gradle-8.x
ThomasJejkal Nov 10, 2024
945e2bb
chore(deps): update dependency gradle to v8.11
renovate[bot] Nov 11, 2024
00df477
Merge pull request #205 from kit-data-manager/renovate/gradle-8.x
ThomasJejkal Nov 12, 2024
1982310
chore(deps): update plugin io.freefair.maven-publish-java to v8.11
renovate[bot] Nov 16, 2024
9433891
Merge pull request #207 from kit-data-manager/renovate/io.freefair.ma…
ThomasJejkal Nov 16, 2024
5b633a6
chore(deps): update dependency gradle to v8.11.1
renovate[bot] Nov 20, 2024
710ba4e
chore(deps): update dependency commons-io:commons-io to v2.18.0
renovate[bot] Nov 20, 2024
4ba7693
Merge pull request #209 from kit-data-manager/renovate/commons-io-com…
ThomasJejkal Nov 21, 2024
40bf66f
Merge pull request #208 from kit-data-manager/renovate/gradle-8.x
ThomasJejkal Nov 21, 2024
85ace95
chore(deps): update dependency com.networknt:json-schema-validator to…
renovate[bot] Nov 25, 2024
1a7148e
chore(deps): update dependency com.fasterxml.jackson.datatype:jackson…
renovate[bot] Nov 28, 2024
67a920f
chore(deps): update dependency org.junit:junit-bom to v5.11.4
renovate[bot] Dec 16, 2024
2f41844
chore(deps): update dependency gradle to v8.12
renovate[bot] Dec 20, 2024
5e1ab57
Merge pull request #213 from kit-data-manager/renovate/gradle-8.x
ThomasJejkal Dec 23, 2024
036faa0
Merge pull request #212 from kit-data-manager/renovate/org.junit-juni…
ThomasJejkal Dec 23, 2024
5c330df
chore(deps): update plugin net.researchgate.release to v3.1.0
renovate[bot] Dec 23, 2024
1a0e179
chore(deps): update dependency com.networknt:json-schema-validator to…
renovate[bot] Jan 15, 2025
3d1cd30
chore(deps): update dependency com.apicatalog:titanium-json-ld to v1.5.0
renovate[bot] Feb 8, 2025
9febe9c
chore(deps): update dependency com.networknt:json-schema-validator to…
renovate[bot] Feb 20, 2025
d736f9d
chore(deps): update dependency org.junit:junit-bom to v5.12.0
renovate[bot] Feb 21, 2025
36afb76
chore(deps): update plugin io.freefair.maven-publish-java to v8.12.2
renovate[bot] Feb 23, 2025
843c2cd
chore(deps): update dependency gradle to v8.13
renovate[bot] Feb 25, 2025
7ab1557
chore(deps): update dependency org.slf4j:slf4j-jdk14 to v2.0.17
renovate[bot] Feb 25, 2025
d55a36b
Merge pull request #224 from kit-data-manager/renovate/org.slf4j-slf4…
ThomasJejkal Feb 27, 2025
8152976
Merge pull request #223 from kit-data-manager/renovate/org.junit-juni…
ThomasJejkal Feb 27, 2025
12b4196
Merge pull request #222 from kit-data-manager/renovate/com.networknt-…
ThomasJejkal Feb 27, 2025
189a2be
Merge pull request #220 from kit-data-manager/renovate/com.apicatalog…
ThomasJejkal Feb 27, 2025
c062be8
Merge pull request #219 from kit-data-manager/renovate/gradle-8.x
ThomasJejkal Feb 27, 2025
6ea7b53
Merge pull request #218 from kit-data-manager/renovate/io.freefair.ma…
ThomasJejkal Feb 27, 2025
a28d511
fix: adjust junit setup to latest documented example
Pfeil Mar 14, 2025
6b1c0b8
fix: run CI for PRs into development branch
Pfeil Mar 14, 2025
dce6bb7
chore(deps): update dependency org.junit:junit-bom to v5.12.1
renovate[bot] Mar 14, 2025
9333d57
chore(deps): update jacksonversion to v2.18.3
renovate[bot] Mar 14, 2025
2839742
fix: try avoiding double CI runs
Pfeil Mar 14, 2025
3898313
fix: revert part of the last commit
Pfeil Mar 14, 2025
787f17a
chore(deps): update plugin io.freefair.maven-publish-java to v8.13
renovate[bot] Mar 14, 2025
f606c5b
fix: try avoiding double CI runs
Pfeil Mar 14, 2025
9746070
fix: properly place condition in CI job
Pfeil Mar 14, 2025
dc99185
chore(deps): update dependency com.apicatalog:titanium-json-ld to v1.6.0
renovate[bot] Mar 14, 2025
f11398e
Merge pull request #229 from kit-data-manager/renovate/com.apicatalog…
ThomasJejkal Mar 14, 2025
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
4 changes: 3 additions & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@ on:
push:
branches: [ main, development ]
pull_request:
branches: [ main ]
branches: [ main, development ]
workflow_dispatch:

env:
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}

jobs:
# avoid double CI runs on push and PR, from https://github.com/orgs/community/discussions/57827
build:
if: github.event_name != 'push' || github.event.push.head.repo.full_name != github.event.push.base.repo.full_name
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
Expand Down
39 changes: 20 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ plugins {

// Instructions: https://github.com/researchgate/gradle-release
// Available versions: https://plugins.gradle.org/plugin/net.researchgate.release
id 'net.researchgate.release' version '3.0.2'
id 'net.researchgate.release' version '3.1.0'
id "maven-publish"
// Publishing of JAR to Nexus instances (e.g., OSSRH)
// https://github.com/gradle-nexus/publish-plugin
id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
id "io.freefair.maven-publish-java" version "8.10.2"
id "io.freefair.maven-publish-java" version "8.13"
}

group 'edu.kit.datamanager'
Expand All @@ -35,34 +35,33 @@ repositories {
}

ext {
jacksonVersion = '2.18.1'
jacksonVersion = '2.18.3'
}

dependencies {
// JUnit setup for testing
testImplementation 'org.junit.jupiter:junit-jupiter-params'
testImplementation(platform("org.junit:junit-bom:5.11.3"))
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
testImplementation(platform("org.junit:junit-bom:5.12.1"))
testImplementation('org.junit.jupiter:junit-jupiter')
testRuntimeOnly('org.junit.platform:junit-platform-launcher')
// JSON object mapping / (de-)serialization
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}"
// http client
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14'
// common file system operations
implementation group: 'commons-io', name: 'commons-io', version: '2.17.0'
implementation group: 'commons-io', name: 'commons-io', version: '2.18.0'
// read from and write to zip files
implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '2.11.5'
// compare json documents in tests
implementation 'com.github.fslev:json-compare:6.18'
// url validator
implementation group: 'commons-validator', name: 'commons-validator', version: '1.9.0'
// logging
implementation group: 'org.slf4j', name: 'slf4j-jdk14', version: '2.0.16'
implementation group: 'org.slf4j', name: 'slf4j-jdk14', version: '2.0.17'
// JSON-LD, Zenodo mapping
implementation group: 'com.apicatalog', name: 'titanium-json-ld', version: '1.4.1'
implementation group: 'com.apicatalog', name: 'titanium-json-ld', version: '1.6.0'
// metadata validation, profiles based on JSON schema
implementation group: "com.networknt", name: "json-schema-validator", version: "1.5.3"
implementation group: "com.networknt", name: "json-schema-validator", version: "1.5.6"
implementation 'org.glassfish:jakarta.json:2.0.1'
}

Expand Down Expand Up @@ -100,46 +99,48 @@ configurations {
}


task performanceContextEntitiesBenchmark(type: JavaExec) {
tasks.register('performanceContextEntitiesBenchmark', JavaExec) {
description = "Run the context entities benchmarks."
classpath = sourceSets.performanceTest.runtimeClasspath
mainClass = 'edu.kit.datamanager.ro_crate.singlecratebenchmarks.ContextualEntitiesPerformance'
}

task performanceLocalDataEntitiesBenchmark(type: JavaExec) {
tasks.register('performanceLocalDataEntitiesBenchmark', JavaExec) {
description = "Run the local data entities benchmarks."
classpath = sourceSets.performanceTest.runtimeClasspath
mainClass = 'edu.kit.datamanager.ro_crate.singlecratebenchmarks.LocalDataEntitiesPerformance'
}

task performanceRemoteDataEntitiesBenchmark(type: JavaExec) {
tasks.register('performanceRemoteDataEntitiesBenchmark', JavaExec) {
description = "Run the remote data entities benchmarks."
classpath = sourceSets.performanceTest.runtimeClasspath
mainClass = 'edu.kit.datamanager.ro_crate.singlecratebenchmarks.RemoteDataEntitiesPerformance'
}

task performanceMixEntitiesBenchmark(type: JavaExec) {
tasks.register('performanceMixEntitiesBenchmark', JavaExec) {
description = "Run the remote data entities benchmarks."
classpath = sourceSets.performanceTest.runtimeClasspath
mainClass = 'edu.kit.datamanager.ro_crate.singlecratebenchmarks.MixtureOfEntitiesPerformance'
}
task performanceDeletionEntitiesBenchmark(type: JavaExec) {

tasks.register('performanceDeletionEntitiesBenchmark', JavaExec) {
description = "Run the remote data entities benchmarks."
classpath = sourceSets.performanceTest.runtimeClasspath
mainClass = 'edu.kit.datamanager.ro_crate.singlecratebenchmarks.DeletionEntitiesPerformance'
}

task performanceMultipleCratesBenchmark(type: JavaExec) {
tasks.register('performanceMultipleCratesBenchmark', JavaExec) {
description = "Run the remote data entities benchmarks."
classpath = sourceSets.performanceTest.runtimeClasspath
mainClass = 'edu.kit.datamanager.ro_crate.multiplecrates.MultipleCratesBenchmark'
}

task performanceReadWriteMultipleCratesBenchmark(type: JavaExec) {
tasks.register('performanceReadWriteMultipleCratesBenchmark', JavaExec) {
description = "Run the remote data entities benchmarks."
classpath = sourceSets.performanceTest.runtimeClasspath
mainClass = 'edu.kit.datamanager.ro_crate.multiplecrates.MultipleCratesWriteAndRead'
}

test {
useJUnitPlatform()
finalizedBy jacocoTestReport
Expand All @@ -154,7 +155,7 @@ jacocoTestReport {
}

jacoco {
toolVersion = "0.8.11"
toolVersion = "0.8.12"
}

// maxParallelForks(2)
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading