diff --git a/build.gradle b/build.gradle index 4159002..1cb1d82 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,5 @@ plugins { - id "checkstyle" id "pmd" id 'maven-publish' id 'signing' @@ -31,14 +30,11 @@ ext { } subprojects { - //apply from: rootProject.file('gradle/ide/idea.gradle') apply from: rootProject.file('gradle/repositories/maven.gradle') apply from: rootProject.file('gradle/compile/java.gradle') apply from: rootProject.file('gradle/test/junit5.gradle') apply from: rootProject.file('gradle/documentation/asciidoc.gradle') - apply from: rootProject.file('gradle/quality/checkstyle.gradle') apply from: rootProject.file('gradle/quality/pmd.gradle') - //apply from: rootProject.file('gradle/quality/spotbugs.gradle') apply from: rootProject.file('gradle/publish/maven.gradle') } apply from: rootProject.file('gradle/publish/sonatype.gradle') diff --git a/gradle/publish/maven.gradle b/gradle/publish/maven.gradle index cb5a714..ce6a26f 100644 --- a/gradle/publish/maven.gradle +++ b/gradle/publish/maven.gradle @@ -3,8 +3,6 @@ publishing { publications { "${project.name}"(MavenPublication) { from components.java - artifact sourcesJar - artifact javadocJar pom { artifactId = project.name name = project.name diff --git a/settings.gradle b/settings.gradle index 701923c..5117e53 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,15 +16,16 @@ pluginManagement { dependencyResolutionManagement { versionCatalogs { libs { - version('gradle', '8.4') - version('groovy', '4.0.15') - version('netty', '4.1.100.Final') - library('cql-common', 'org.xbib', 'cql-common').version('5.0.0') + version('gradle', '8.5') + version('groovy', '4.0.16') + version('netty', '4.1.101.Final') + library('cql-common', 'org.xbib', 'cql-common').version('5.1.1') + library('marc', 'org.xbib', 'marc').version('2.14.1') + library('charactersets', 'org.xbib', 'bibliographic-character-sets').version('2.0.0') library('netty-transport', 'io.netty', 'netty-transport').versionRef('netty') library('netty-handler', 'io.netty', 'netty-handler').versionRef('netty') library('netty-common', 'io.netty', 'netty-common').versionRef('netty') library('netty-buffer', 'io.netty', 'netty-buffer').versionRef('netty') - library('charactersets', 'org.xbib', 'bibliographic-character-sets').version('2.0.0') library('groovy', 'org.apache.groovy', 'groovy').versionRef('groovy') library('groovy-xml', 'org.apache.groovy', 'groovy-xml').versionRef('groovy') library('groovy-json', 'org.apache.groovy', 'groovy-json').versionRef('groovy') @@ -33,7 +34,6 @@ dependencyResolutionManagement { library('groovy-macro', 'org.apache.groovy', 'groovy-macro').versionRef('groovy') library('groovy-templates', 'org.apache.groovy', 'groovy-templates').versionRef('groovy') library('groovy-test', 'org.apache.groovy', 'groovy-test').versionRef('groovy') - library('marc', 'org.xbib', 'marc').version('2.9.21') } testLibs { version('junit', '5.10.0') diff --git a/z3950-common/build.gradle b/z3950-common/build.gradle index 45df091..2a8af6d 100644 --- a/z3950-common/build.gradle +++ b/z3950-common/build.gradle @@ -15,3 +15,7 @@ sourceSets { } } } + +tasks.named('sourcesJar').configure { + dependsOn('generateJflex', 'generateJacc') +}