diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d2d43cf..2fc9b56 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java-version: [ 17 ] + java-version: [ 21 ] fail-fast: false steps: diff --git a/.gitignore b/.gitignore index c8072e0..6d7dddd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Gradle .gradle build +bin local.properties reports secring.gpg diff --git a/README.md b/README.md index cf8b860..b6ebbdf 100644 --- a/README.md +++ b/README.md @@ -36,12 +36,12 @@ Maven: com.opendxl dxldatabusclient - 2.6.0 + 2.7.0 ``` or Gradle: ```groovy -compile 'com.opendxl:dxldatabusclient:2.6.0' +compile 'com.opendxl:dxldatabusclient:2.7.0' ``` ## Bugs and Feedback diff --git a/build.gradle b/build.gradle index ab89814..3c3b797 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { } group 'com.opendxl' -version = '2.6.0' +version = '2.7.0' apply plugin: 'base' apply plugin: 'java' @@ -38,19 +38,18 @@ dependencyCheck { } java { toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) } } jacoco { - toolVersion = "0.8.8" - reportsDir = file("$buildDir/reports/coverage") + toolVersion = "0.8.11" } jacocoTestReport { reports { - xml.enabled false - csv.enabled false - html.destination file("$buildDir/reports/coverage") + xml.required.set(false) + csv.required.set(false) + html.outputLocation.set(file("$buildDir/reports/coverage")) } } @@ -63,33 +62,31 @@ configurations { } dependencies { - implementation ('org.apache.kafka:kafka-clients:3.8.0') { + implementation ('org.apache.kafka:kafka-clients:3.8.1') { exclude group: 'org.scala-lang', module: 'scala-reflect' exclude group: 'org.lz4', module: 'lz4-java' exclude group: 'org.xerial.snappy', module: 'snappy-java' } - implementation ('org.apache.kafka:kafka-streams:3.8.0') { + implementation ('org.apache.kafka:kafka-streams:3.8.1') { exclude group: 'org.scala-lang', module: 'scala-reflect' } implementation group: 'org.xerial.snappy', name: 'snappy-java', version: '1.1.10.5' implementation 'org.scala-lang:scala-reflect:2.13.9' implementation 'org.scala-lang:scala-library:2.13.9' implementation 'org.lz4:lz4-java:1.8.0' - implementation 'org.apache.avro:avro:1.11.3' + implementation 'org.apache.avro:avro:1.12.0' implementation 'com.google.code.gson:gson:2.8.9' implementation 'org.apache.commons:commons-configuration2:2.11.0' implementation 'commons-lang:commons-lang:2.6' implementation 'org.slf4j:slf4j-api:1.7.36' implementation 'net.sf.jopt-simple:jopt-simple:5.0.4' - testImplementation('org.apache.kafka:kafka_2.13:3.8.0') { + testImplementation('org.apache.kafka:kafka_2.13:3.8.1') { exclude group: 'org.scala-lang', module: 'scala-reflect' exclude group: 'org.xerial.snappy', module: 'snappy-java' } testImplementation 'org.scala-lang:scala-reflect:2.13.9' - testImplementation 'org.apache.zookeeper:zookeeper:3.6.4' - testImplementation('io.netty:netty-all:4.1.112.Final') { - force = true - } + testImplementation 'org.apache.zookeeper:zookeeper:3.9.3' + testImplementation enforcedPlatform('io.netty:netty-all:4.1.118.Final') testImplementation 'commons-io:commons-io:2.11.0' testImplementation 'junit:junit:4.13.2' testImplementation 'com.github.stefanbirkner:system-rules:1.19.0' @@ -119,18 +116,16 @@ dependencies { // http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-16942 // http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-16943 // CVE-2020-25649 - implementation 'com.fasterxml.jackson.module:jackson-module-scala_3:2.14.2' - kafkaInMemory ('com.fasterxml.jackson.core:jackson-databind:2.16.1') { - force = true - } + implementation 'com.fasterxml.jackson.module:jackson-module-scala_3:2.15.0' + kafkaInMemory ('com.fasterxml.jackson.core:jackson-databind:2.16.1') // http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2019-12402 - kafkaInMemory ('org.apache.commons:commons-compress:1.27.0') { - force = true - } - implementation ('org.apache.commons:commons-compress:1.27.0') { - force = true - } + kafkaInMemory enforcedPlatform('org.apache.commons:commons-compress:1.27.0') + kafkaInMemory 'org.apache.commons:commons-compress' + + implementation enforcedPlatform('org.apache.commons:commons-compress:1.27.0') + implementation 'org.apache.commons:commons-compress' + } repositories { @@ -149,7 +144,6 @@ jar { // Task for creating a jar with the source files task sourceJar(type: Jar, dependsOn: classes) { - classifier = 'sources' from sourceSets.main.allSource archiveClassifier.set('sources') duplicatesStrategy = DuplicatesStrategy.EXCLUDE // Handle duplicates @@ -165,7 +159,7 @@ publishing { // Task for creating a jar with JavaDoc task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' + archiveClassifier.set('javadoc') from javadoc.destinationDir } @@ -200,9 +194,12 @@ distributions { from(configurations.compileClasspath) { into("lib/3rdparty") } - from(sphinx) { - into('doc') - } + //Since sphinx task is temporarily disabled, this has been commented out + // as the document is not generated. + + // from(sphinx) { + // into('doc') + // } from('sample') { into 'sample' } @@ -276,8 +273,6 @@ task versionFile() { checkstyle { sourceSets = [] toolVersion '8.39' - - } publishing { @@ -306,6 +301,10 @@ publishing { } } + tasks.withType(GenerateModuleMetadata) { + enabled = false + } + from components.java artifact(sourceJar) { @@ -358,5 +357,5 @@ signing {sign publishing.publications.maven} check.dependsOn dependencyCheckAnalyze distZip.dependsOn javadocJar distZip.dependsOn sourceJar -sphinx.dependsOn(versionFile) +check.dependsOn dependencyCheckAnalyze assemble.dependsOn(replaceVersionInREADME) \ No newline at end of file diff --git a/docs/CLI-Example.rst b/docs/CLI-Example.rst index 5f3afc3..0a044ee 100644 --- a/docs/CLI-Example.rst +++ b/docs/CLI-Example.rst @@ -7,7 +7,7 @@ library with no arguments displays help information: :: - $ java -jar dxldatabusclient-2.6.0.jar + $ java -jar dxldatabusclient-2.7.0.jar ERROR: There are not options Option (* = required) Description @@ -50,7 +50,7 @@ few CLI operations. Operations arguments are placed after :: - $ java -jar dxldatabusclient-2.6.0.jar --operation ... + $ java -jar dxldatabusclient-2.7.0.jar --operation ... Operation Arguments ^^^^^^^^^^^^^^^^^^^ @@ -123,7 +123,7 @@ example :: - $ java -jar dxldatabusclient-2.6.0.jar \ + $ java -jar dxldatabusclient-2.7.0.jar \ --operation produce \ --to-topic \ --brokers <0.0.0.0>: \ @@ -230,7 +230,7 @@ example :: - java -jar dxldatabusclient-2.6.0.jar \ + java -jar dxldatabusclient-2.7.0.jar \ --operation consume \ --from-topic \ --brokers \ diff --git a/docs/index.rst b/docs/index.rst index 1380b27..d2f59b6 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -40,14 +40,14 @@ Maven: com.opendxl dxldatabusclient - 2.6.0 + 2.7.0 or Gradle: .. code:: groovy - compile 'com.opendxl:dxldatabusclient:2.6.0' + compile 'com.opendxl:dxldatabusclient:2.7.0' API Documentation ----------------- diff --git a/gradle.properties b/gradle.properties index 17abd57..8826117 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=2.6.0 +version=2.7.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3e9d906..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Thu Aug 22 13:18:26 ART 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip