Merge remote-tracking branch 'origin/topic/miurahr/fix-dictzip-outputstream' into...

[dictzip-java/dictzip-java.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index ef78bf1..25d8979 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,6 @@ subprojects {
     apply plugin: 'jacoco'
     apply plugin: 'java'
     apply plugin: 'checkstyle'
-    apply plugin: 'maven'
     apply plugin: 'maven-publish'
 
     [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
@@ -41,10 +40,13 @@ subprojects {
     }
 
     dependencies {
+        implementation "org.jetbrains:annotations:23.0.0"
         testImplementation 'commons-io:commons-io:2.11.0'
-        testImplementation 'org.testng:testng:7.4.0'
+        testImplementation "org.junit.jupiter:junit-jupiter:5.8.2"
+    }
+    test {
+        useJUnitPlatform()
     }
-    test.useTestNG()
 
     java {
         sourceCompatibility = JavaVersion.VERSION_1_8
@@ -67,37 +69,6 @@ subprojects {
 project(':dictzip-lib') {
     apply plugin: 'java-library'
     version = rootProject.version
-    install {
-        repositories.mavenInstaller {
-            pom.project {
-                name = 'dictzip'
-                packaging = 'jar'
-                description = projectDesc
-                url = projectUrl
-                version = project.version
-                licenses {
-                    license {
-                        name = licenseName
-                        url = licenseUrl
-                        distribution = 'repo'
-                    }
-                }
-                scm {
-                    url = githubUrl
-                    connection = "scm:git:${githubUrl}"
-                    developerConnection = "scm:git:${githubUrl}"
-                }
-                developers {
-                    developer {
-                        id = projectOwner
-                        name = developerName
-                        email = developerEmail
-                    }
-                }
-            }
-        }
-    }
-
     publishing {
         publications {
             mavenJava(MavenPublication) {
@@ -186,7 +157,6 @@ project(':dictzip-cli') {
 
     distributions {
         main {
-            baseName = 'dictzip'
             contents {
                 from('build/docs/dictzip.1') {
                     into 'docs/man/man1'