diff --git a/conformance-tests/allowed-licenses.json b/conformance-tests/allowed-licenses.json index d6a1abb..8dc193d 100644 --- a/conformance-tests/allowed-licenses.json +++ b/conformance-tests/allowed-licenses.json @@ -12,23 +12,23 @@ }, { "moduleLicense": "Apache License, Version 2.0", - "moduleVersion": "2.11.0", + "moduleVersion": "2.16.1", "moduleName": "commons-io:commons-io" }, { "comment": "MIT can be included into Apache 2.0 according https://www.apache.org/legal/resolved.html#category-a (31.1.23)", "moduleLicense": "MIT License", - "moduleVersion": "2.0.4", + "moduleVersion": "2.0.13", "moduleName": "org.slf4j:slf4j-api" }, { "comment": "uses dual license, we use Eclipse Public License - v 1.0 which can be included into Apache 2.0 according to https://www.apache.org/legal/resolved.html#category-b (31.1.23)", - "moduleVersion": "1.4.5", + "moduleVersion": "1.5.6", "moduleName": "ch.qos.logback:logback-core" }, { "comment": "uses dual license, we use Eclipse Public License - v 1.0 which can be included into Apache 2.0 according to https://www.apache.org/legal/resolved.html#category-b (31.1.23)", - "moduleVersion": "1.4.5", + "moduleVersion": "1.5.6", "moduleName": "ch.qos.logback:logback-classic" } ] diff --git a/conformance-tests/build.gradle b/conformance-tests/build.gradle index ae33596..46decd9 100755 --- a/conformance-tests/build.gradle +++ b/conformance-tests/build.gradle @@ -1,51 +1,52 @@ -//############################################################################# -//Global configuration -//############################################################################# - - -plugins { - id 'java-library' - id 'com.github.jk1.dependency-license-report' version '2.0' -} -repositories { - mavenCentral() -} -dependencies { - implementation 'ch.qos.logback:logback-classic:1.4.5' - implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.4' - - implementation group: 'com.beanit', name: 'iec61850bean', version: '1.9.0' - implementation group: 'commons-io', name: 'commons-io', version: '2.11.0' - - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1' - testImplementation 'org.junit.jupiter:junit-jupiter-params:5.3.1' - -} - -jar { - manifest { - attributes( - 'Main-Class': 'org.openmuc.fnn.steuerbox.ScheduleWriterExample' - ) - } - from { - configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } - } -} - -test { - useJUnitPlatform() -} - - -import com.github.jk1.license.render.XmlReportRenderer - -licenseReport { - outputDir = "$projectDir/build/licenses" - configurations = ['runtimeClasspath'] - excludeOwnGroup = true - excludeBoms = false - renderers = [new XmlReportRenderer('third-party-libs.xml', 'Back-End Libraries')] - allowedLicensesFile = new File("$projectDir/allowed-licenses.json") -} \ No newline at end of file +//############################################################################# +//Global configuration +//############################################################################# + + +plugins { + id 'java-library' + id 'com.github.jk1.dependency-license-report' version '2.8' +} +repositories { + mavenCentral() +} +dependencies { + implementation 'ch.qos.logback:logback-classic:1.5.6' + implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.13' + + implementation group: 'com.beanit', name: 'iec61850bean', version: '1.9.0' + implementation group: 'commons-io', name: 'commons-io', version: '2.16.1' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2' + +} + +jar { + manifest { + attributes( + 'Main-Class': 'org.openmuc.fnn.steuerbox.ScheduleWriterExample' + ) + } + from { + configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } + } +} + +test { + useJUnitPlatform() +} + + +import com.github.jk1.license.render.XmlReportRenderer + +licenseReport { + outputDir = "$projectDir/build/licenses" + configurations = ['runtimeClasspath'] + excludeOwnGroup = true + excludeBoms = false + renderers = [new XmlReportRenderer('third-party-libs.xml', 'Back-End Libraries')] + allowedLicensesFile = new File("$projectDir/allowed-licenses.json") +} + diff --git a/conformance-tests/gradle/wrapper/gradle-wrapper.properties b/conformance-tests/gradle/wrapper/gradle-wrapper.properties index f371643..3994438 100644 --- a/conformance-tests/gradle/wrapper/gradle-wrapper.properties +++ b/conformance-tests/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists