diff --git a/build.gradle b/build.gradle index 1eeb0fc..afd24b2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,181 +1,34 @@ plugins { - id "com.github.spotbugs" version "2.0.1" - id "org.sonarqube" version '2.8' + id "de.marcphilipp.nexus-publish" version "0.4.0" id "io.codearte.nexus-staging" version "0.21.1" } +wrapper { + gradleVersion = "${project.property('gradle.wrapper.version')}" + distributionType = Wrapper.DistributionType.ALL +} + +ext { + user = 'xbib' + name = 'z3950' + description = 'Z39.50 for Java' + inceptionYear = '2017' + url = 'https://github.com/' + user + '/' + name + scmUrl = 'https://github.com/' + user + '/' + name + scmConnection = 'scm:git:git://github.com/' + user + '/' + name + '.git' + scmDeveloperConnection = 'scm:git:ssh://git@github.com:' + user + '/' + name + '.git' + issueManagementSystem = 'Github' + issueManagementUrl = ext.scmUrl + '/issues' + licenseName = 'The Apache License, Version 2.0' + licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt' +} + subprojects { - apply plugin: 'java' - apply plugin: 'maven' - apply plugin: 'checkstyle' - apply plugin: 'pmd' - apply plugin: "com.github.spotbugs" - - dependencies { - testImplementation "org.junit.jupiter:junit-jupiter-api:${project.property('junit.version')}" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.property('junit.version')}" - testImplementation "org.xbib:bibliographic-character-sets:${project.property('xbib-bibliographic-character-sets.version')}" - } - - compileJava { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - } - - compileTestJava { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - } - - tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:all,-fallthrough" - if (!options.compilerArgs.contains("-processor")) { - options.compilerArgs << '-proc:none' - } - } - - clean { - delete 'out' - } - - test { - useJUnitPlatform() - systemProperty 'java.util.logging.config.file', - project.file('src/test/resources/logging.properties') - failFast = false - testLogging { - events 'STARTED', 'PASSED', 'FAILED', 'SKIPPED' - } - afterSuite { desc, result -> - if (!desc.parent) { - println "\nTest result: ${result.resultType}" - println "Test summary: ${result.testCount} tests, " + - "${result.successfulTestCount} succeeded, " + - "${result.failedTestCount} failed, " + - "${result.skippedTestCount} skipped" - } - } - } - - task sourcesJar(type: Jar, dependsOn: classes) { - classifier 'sources' - from sourceSets.main.allSource - } - - task javadocJar(type: Jar, dependsOn: javadoc) { - classifier 'javadoc' - } - - artifacts { - archives sourcesJar, javadocJar - } - - ext { - user = 'xbib' - projectName = 'z3950' - projectDescription = 'Z39.50 for Java' - scmUrl = 'https://github.com/xbib/z3950' - scmConnection = 'scm:git:git://github.com/xbib/z3950.git' - scmDeveloperConnection = 'scm:git:git://github.com/xbib/z3950.git' - } - - spotbugs { - toolVersion = '3.1.12' - sourceSets = [sourceSets.main] - ignoreFailures = true - effort = "max" - reportLevel = "high" - } - - spotbugsMain.reports { - xml.enabled = false - html.enabled = true - } - - spotbugsTest.reports { - xml.enabled = false - html.enabled = true - } - - tasks.withType(Pmd) { - ignoreFailures = true - reports { - xml.enabled = true - html.enabled = true - } - } - tasks.withType(Checkstyle) { - ignoreFailures = true - exclude '**/PQF*java' - reports { - xml.enabled = true - html.enabled = true - } - } - - sonarqube { - properties { - property "sonar.projectName", "${project.group} ${project.name}" - property "sonar.sourceEncoding", "UTF-8" - property "sonar.tests", "src/test/java" - property "sonar.scm.provider", "git" - property "sonar.junit.reportsPath", "build/test-results/test/" - } - } - - task sonatypeUpload(type: Upload, dependsOn: build) { - group = 'publish' - configuration = configurations.archives - uploadDescriptor = true - repositories { - if (project.hasProperty('ossrhUsername')) { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - repository(url: uri(ossrhReleaseUrl)) { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - snapshotRepository(url: uri(ossrhSnapshotUrl)) { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - pom.project { - groupId project.group - artifactId project.name - version project.version - name project.name - description projectDescription - packaging 'jar' - inceptionYear '2017' - url scmUrl - organization { - name 'xbib' - url 'http://xbib.org' - } - developers { - developer { - id user - name 'Jörg Prante' - email 'joergprante@gmail.com' - url 'https://github.com/jprante' - } - } - scm { - url scmUrl - connection scmConnection - developerConnection scmDeveloperConnection - } - licenses { - license { - name 'The Apache License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - } - } - } - } - } + apply plugin: 'java-library' + apply from: rootProject.file('gradle/ide/idea.gradle') + apply from: rootProject.file('gradle/compile/java.gradle') + apply from: rootProject.file('gradle/test/junit5.gradle') + apply from: rootProject.file('gradle/publishing/publication.gradle') } -nexusStaging { - packageGroup = "org.xbib" -} +apply from: rootProject.file('gradle/publishing/sonatype.gradle') diff --git a/gradle.properties b/gradle.properties index ebca2e6..c78bf71 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,8 @@ group = org.xbib name = z3950 -version = 2.0.1 +version = 2.1.0 -netty.version = 4.1.43.Final -xbib-cql.version = 2.0.2 -xbib-bibliographic-character-sets.version = 1.0.0 - -# test -junit.version = 5.5.2 +gradle.wrapper.version = 6.4.1 +netty.version = 4.1.49.Final +xbib-cql.version = 3.0.0 +xbib-bibliographic-character-sets.version = 1.0.0 \ No newline at end of file diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle new file mode 100644 index 0000000..7b1e601 --- /dev/null +++ b/gradle/compile/java.gradle @@ -0,0 +1,35 @@ + +apply plugin: 'java-library' + +java { + modularity.inferModulePath.set(true) +} + +compileJava { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} + +compileTestJava { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} + +jar { + manifest { + attributes('Implementation-Version': project.version) + } +} + +task sourcesJar(type: Jar, dependsOn: classes) { + classifier 'sources' + from sourceSets.main.allSource +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier 'javadoc' +} + +artifacts { + archives sourcesJar, javadocJar +} diff --git a/gradle/documentation/asciidoc.gradle b/gradle/documentation/asciidoc.gradle new file mode 100644 index 0000000..ae6940e --- /dev/null +++ b/gradle/documentation/asciidoc.gradle @@ -0,0 +1,34 @@ +apply plugin: 'org.xbib.gradle.plugin.asciidoctor' + +configurations { + asciidoclet +} + +dependencies { + asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}" +} + +/* +javadoc { + options.docletpath = configurations.asciidoclet.files.asType(List) + options.doclet = 'org.asciidoctor.Asciidoclet' + //options.overview = "src/docs/asciidoclet/overview.adoc" + options.addStringOption "-base-dir", "${projectDir}" + options.addStringOption "-attribute", + "name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}" + configure(options) { + noTimestamp = true + } +}*/ + +asciidoctor { + attributes 'source-highlighter': 'coderay', + toc: 'left', + doctype: 'book', + icons: 'font', + encoding: 'utf-8', + sectlink: true, + sectanchors: true, + linkattrs: true, + imagesdir: 'img' +} diff --git a/gradle/ide/idea.gradle b/gradle/ide/idea.gradle new file mode 100644 index 0000000..64e2167 --- /dev/null +++ b/gradle/ide/idea.gradle @@ -0,0 +1,13 @@ +apply plugin: 'idea' + +idea { + module { + outputDir file('build/classes/java/main') + testOutputDir file('build/classes/java/test') + } +} + +if (project.convention.findPlugin(JavaPluginConvention)) { + //sourceSets.main.output.classesDirs = file("build/classes/java/main") + //sourceSets.test.output.classesDirs = file("build/classes/java/test") +} diff --git a/gradle/publish.gradle b/gradle/publish.gradle deleted file mode 100644 index e69de29..0000000 diff --git a/gradle/publishing/publication.gradle b/gradle/publishing/publication.gradle new file mode 100644 index 0000000..c35fcb9 --- /dev/null +++ b/gradle/publishing/publication.gradle @@ -0,0 +1,64 @@ + +apply plugin: "de.marcphilipp.nexus-publish" + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + artifact sourcesJar + artifact javadocJar + pom { + name = project.name + description = rootProject.ext.description + url = rootProject.ext.url + inceptionYear = rootProject.ext.inceptionYear + packaging = 'jar' + organization { + name = 'xbib' + url = 'https://xbib.org' + } + developers { + developer { + id = 'jprante' + name = 'Jörg Prante' + email = 'joergprante@gmail.com' + url = 'https://github.com/jprante' + } + } + scm { + url = rootProject.ext.scmUrl + connection = rootProject.ext.scmConnection + developerConnection = rootProject.ext.scmDeveloperConnection + } + issueManagement { + system = rootProject.ext.issueManagementSystem + url = rootProject.ext.issueManagementUrl + } + licenses { + license { + name = rootProject.ext.licenseName + url = rootProject.ext.licenseUrl + distribution = 'repo' + } + } + } + } + } +} + +if (project.hasProperty("signing.keyId")) { + apply plugin: 'signing' + signing { + sign publishing.publications.mavenJava + } +} + +nexusPublishing { + repositories { + sonatype { + username = project.property('ossrhUsername') + password = project.property('ossrhPassword') + packageGroup = "org.xbib" + } + } +} diff --git a/gradle/publishing/sonatype.gradle b/gradle/publishing/sonatype.gradle new file mode 100644 index 0000000..e1813f3 --- /dev/null +++ b/gradle/publishing/sonatype.gradle @@ -0,0 +1,11 @@ + +if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) { + + apply plugin: 'io.codearte.nexus-staging' + + nexusStaging { + username = project.property('ossrhUsername') + password = project.property('ossrhPassword') + packageGroup = "org.xbib" + } +} diff --git a/gradle/sonarqube.gradle b/gradle/sonarqube.gradle deleted file mode 100644 index e69de29..0000000 diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle new file mode 100644 index 0000000..53a2338 --- /dev/null +++ b/gradle/test/junit5.gradle @@ -0,0 +1,29 @@ + +def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.6.2' +def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2' + +dependencies { + testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}" + testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}" + testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}" +} + +test { + useJUnitPlatform() + failFast = true + testLogging { + events 'STARTED', 'PASSED', 'FAILED', 'SKIPPED' + } + afterSuite { desc, result -> + if (!desc.parent) { + println "\nTest result: ${result.resultType}" + println "Test summary: ${result.testCount} tests, " + + "${result.successfulTestCount} succeeded, " + + "${result.failedTestCount} failed, " + + "${result.skippedTestCount} skipped" + } + } + // massive heap for for xmlunit DOM comparer + jvmArgs '-Xmx2048m' +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf..62d4c05 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0824f11..87c7f32 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -#Mon Nov 11 09:47:54 CET 2019 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +#Tue May 19 23:54:45 CEST 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 83f2acf..fbd7c51 100755 --- a/gradlew +++ b/gradlew @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -129,6 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath @@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -175,14 +177,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 24467a1..a9f778a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%* set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% diff --git a/z3950-api/build.gradle b/z3950-api/build.gradle index 337156f..b74f332 100644 --- a/z3950-api/build.gradle +++ b/z3950-api/build.gradle @@ -1,3 +1,3 @@ dependencies { - compile project(':z3950-asn1') + api project(':z3950-asn1') } diff --git a/z3950-api/src/main/java/module-info.java b/z3950-api/src/main/java/module-info.java new file mode 100644 index 0000000..9e13282 --- /dev/null +++ b/z3950-api/src/main/java/module-info.java @@ -0,0 +1,4 @@ +module org.xbib.z3950lib.api { + exports org.xbib.z3950.api; + requires org.xbib.z3950lib.asn; +} diff --git a/z3950-asn1/src/main/java/module-info.java b/z3950-asn1/src/main/java/module-info.java new file mode 100644 index 0000000..9dd51e2 --- /dev/null +++ b/z3950-asn1/src/main/java/module-info.java @@ -0,0 +1,4 @@ +module org.xbib.z3950lib.asn { + exports org.xbib.asn1; + exports org.xbib.asn1.io; +} diff --git a/z3950-client-netty/build.gradle b/z3950-client-netty/build.gradle index db99d60..453077e 100644 --- a/z3950-client-netty/build.gradle +++ b/z3950-client-netty/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile project(':z3950-common') - compile "io.netty:netty-handler:${project.property('netty.version')}" - compile "io.netty:netty-transport:${project.property('netty.version')}" + implementation project(':z3950-common') + implementation "io.netty:netty-handler:${project.property('netty.version')}" + implementation "io.netty:netty-transport:${project.property('netty.version')}" } \ No newline at end of file diff --git a/z3950-client-netty/src/main/java/module-info.java b/z3950-client-netty/src/main/java/module-info.java new file mode 100644 index 0000000..db8a232 --- /dev/null +++ b/z3950-client-netty/src/main/java/module-info.java @@ -0,0 +1,6 @@ +module org.xbib.z3950lib.client.netty { + exports org.xbib.z3950.client.netty; + requires org.xbib.z3950lib.common; + requires io.netty.handler; + requires io.netty.transport; +} diff --git a/z3950-client/build.gradle b/z3950-client/build.gradle index f891098..4057fc2 100644 --- a/z3950-client/build.gradle +++ b/z3950-client/build.gradle @@ -1,3 +1,5 @@ dependencies { - compile project(':z3950-common') + api project(':z3950-common') + testImplementation "org.xbib:bibliographic-character-sets:${project.property('xbib-bibliographic-character-sets.version')}" + } \ No newline at end of file diff --git a/z3950-client/src/main/java/module-info.java b/z3950-client/src/main/java/module-info.java new file mode 100644 index 0000000..25669a1 --- /dev/null +++ b/z3950-client/src/main/java/module-info.java @@ -0,0 +1,7 @@ +module org.xbib.z3950lib.client { + exports org.xbib.z3950.client; + requires org.xbib.z3950lib.common; + requires org.xbib.z3950lib.asn; + requires org.xbib.z3950lib.api; + requires java.logging; +} \ No newline at end of file diff --git a/z3950-client/src/test/resources/logging.properties b/z3950-client/src/test/resources/logging.properties deleted file mode 100644 index 00dad08..0000000 --- a/z3950-client/src/test/resources/logging.properties +++ /dev/null @@ -1,5 +0,0 @@ -handlers = java.util.logging.ConsoleHandler -.level = ALL -java.util.logging.ConsoleHandler.level = ALL -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter -java.util.logging.SimpleFormatter.format = %1$tFT%1$tT.%1$tL%1$tz [%4$-11s] [%3$s] %5$s %6$s%n diff --git a/z3950-common/build.gradle b/z3950-common/build.gradle index c760873..1c0b29d 100644 --- a/z3950-common/build.gradle +++ b/z3950-common/build.gradle @@ -1,9 +1,17 @@ plugins { - id 'org.xbib.gradle.plugin.jflex' version '1.1.0' - id 'org.xbib.gradle.plugin.jacc' version '1.1.3' + id 'org.xbib.gradle.plugin.jflex' version '1.4.0' + id 'org.xbib.gradle.plugin.jacc' version '1.4.0' } dependencies { - compile project(':z3950-api') - compile "org.xbib:cql-common:${project.property('xbib-cql.version')}" + api project(':z3950-api') + implementation "org.xbib:cql-common:${project.property('xbib-cql.version')}" } + +sourceSets { + main { + java { + srcDirs 'build/generated-src' + } + } +} \ No newline at end of file diff --git a/z3950-common/src/main/java/module-info.java b/z3950-common/src/main/java/module-info.java new file mode 100644 index 0000000..375199a --- /dev/null +++ b/z3950-common/src/main/java/module-info.java @@ -0,0 +1,12 @@ +module org.xbib.z3950lib.common { + exports org.xbib.z3950.common; + exports org.xbib.z3950.common.cql; + exports org.xbib.z3950.common.exceptions; + exports org.xbib.z3950.common.operations; + exports org.xbib.z3950.common.pqf; + exports org.xbib.z3950.common.v3; + requires org.xbib.z3950lib.api; + requires org.xbib.z3950lib.asn; + requires org.xbib.cql; + requires java.logging; +} \ No newline at end of file diff --git a/z3950-common/src/test/resources/logging.properties b/z3950-common/src/test/resources/logging.properties deleted file mode 100644 index 00dad08..0000000 --- a/z3950-common/src/test/resources/logging.properties +++ /dev/null @@ -1,5 +0,0 @@ -handlers = java.util.logging.ConsoleHandler -.level = ALL -java.util.logging.ConsoleHandler.level = ALL -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter -java.util.logging.SimpleFormatter.format = %1$tFT%1$tT.%1$tL%1$tz [%4$-11s] [%3$s] %5$s %6$s%n