diff --git a/gradle.properties b/gradle.properties index 496f169..8ea12f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,5 @@ group = org.xbib name = archive version = 1.1.0 -gradle.wrapper.version = 7.3.2 +org.gradle.warning.mode = all +gradle.wrapper.version = 7.4.2 diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index c9bba7f..7cdf736 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -21,19 +21,6 @@ jar { } } -task sourcesJar(type: Jar, dependsOn: classes) { - classifier 'sources' - from sourceSets.main.allSource -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier 'javadoc' -} - -artifacts { - archives sourcesJar, javadocJar -} - tasks.withType(JavaCompile) { options.compilerArgs << '-Xlint:all,-fallthrough' } diff --git a/gradle/publishing/publication.gradle b/gradle/publishing/publication.gradle index c35fcb9..76b1b73 100644 --- a/gradle/publishing/publication.gradle +++ b/gradle/publishing/publication.gradle @@ -5,8 +5,6 @@ publishing { publications { mavenJava(MavenPublication) { from components.java - artifact sourcesJar - artifact javadocJar pom { name = project.name description = rootProject.ext.description diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle index cfef972..88c0791 100644 --- a/gradle/test/junit5.gradle +++ b/gradle/test/junit5.gradle @@ -1,12 +1,9 @@ -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}" + testImplementation libs.junit.jupiter.api + testImplementation libs.junit.jupiter.params + testImplementation libs.hamcrest + testRuntimeOnly libs.junit.jupiter.engine } test { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..41d9927 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 ac0b842..92f06b5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/io-archive-zip/src/test/java/org/xbib/io/archive/zip/ZipTest.java b/io-archive-zip/src/test/java/org/xbib/io/archive/zip/ZipTest.java index ec6d436..d672fd6 100644 --- a/io-archive-zip/src/test/java/org/xbib/io/archive/zip/ZipTest.java +++ b/io-archive-zip/src/test/java/org/xbib/io/archive/zip/ZipTest.java @@ -9,7 +9,7 @@ public class ZipTest { @Test public void testZip() throws Exception { InputStream in = getClass().getResourceAsStream("test.zip"); - ZipArchiveInputStream z = new ZipArchiveInputStream(in); + ZipArchiveInputStream z = new ZipArchiveInputStream<>(in); byte[] buffer = new byte[1024]; long total = 0L; while ((z.getNextEntry()) != null) { diff --git a/settings.gradle b/settings.gradle index 3166302..23a81f9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,18 @@ +dependencyResolutionManagement { + versionCatalogs { + libs { + version('gradle', '7.4.2') + version('junit', '5.8.2') + library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') + library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit') + library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit') + library('junit4', 'junit:junit:4.13.2') + library('hamcrest', 'org.hamcrest:hamcrest-library:2.2') + plugin('publish', 'com.gradle.plugin-publish').version('0.18.0') + } + } +} + include 'io-compress-bgzf' include 'io-compress-bzip2' include 'io-compress-lzf' @@ -10,4 +25,4 @@ include 'io-archive-dump' include 'io-archive-jar' include 'io-archive-tar' include 'io-archive-zip' -include 'io-codec' \ No newline at end of file +include 'io-codec'